Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelCartController.java

@@ -44,10 +44,11 @@ public class ChannelCartController extends BaseApiController {
   public AjaxResult list(@RequestBody ChannelCart param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     startPage();
-    List<ChannelCartVO> channelCartVOS = channelCartService.listCartVO(
-        new LambdaQueryWrapper<ChannelCart>().eq(ChannelCart::getChannelId, channelId).eq(ChannelCart::getStatus,
-            TicketBoxStatusEnum.PUT_ON)
-            .orderByDesc(ChannelCart::getUpdatedTime));
+//    List<ChannelCartVO> channelCartVOS = channelCartService.listCartVO(
+//        new LambdaQueryWrapper<ChannelCart>().eq(ChannelCart::getChannelId, channelId)
+//            .orderByDesc(ChannelCart::getUpdatedTime));
+    List<ChannelCartVO> channelCartVOS = channelCartService.listCartByChannelId(channelId);
+
     return AjaxResult.success(channelCartVOS);
   }
 

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCart.java

@@ -62,6 +62,5 @@ public class ChannelCart implements Serializable {
   private Date updatedTime;
 
   @TableField(exist = false)
-  @ApiModelProperty(value = "盲票状态")
   private TicketBoxStatusEnum status;
 }

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelCartVO.java

@@ -1,6 +1,8 @@
 package com.qs.mp.channel.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.admin.domain.vo.TicketBoxListVO;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,4 +25,8 @@ public class ChannelCartVO extends TicketBoxListVO {
    */
   @ApiModelProperty("订购数量")
   private Integer orderNum;
+
+
+  @TableField(exist = false)
+  private TicketBoxStatusEnum status;
 }

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelCartMapper.java

@@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ChannelCartMapper extends BaseMapper<ChannelCart> {
   List<ChannelCartVO> listCartVO(@Param(Constants.WRAPPER) Wrapper<ChannelCart> queryWrapper);
+
+  List<ChannelCartVO> listCartByChannelId(Long channelId);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelCartService.java

@@ -26,6 +26,13 @@ public interface IChannelCartService extends IService<ChannelCart> {
    */
   List<ChannelCartVO> listCartVO(Wrapper<ChannelCart> queryWrapper);
 
+  /**
+   * 通过购物车列表
+   * @param channelId
+   * @return
+   */
+  List<ChannelCartVO> listCartByChannelId(Long channelId);
+
   /**
    * 加购，包含减购
    * @param param

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCartServiceImpl.java

@@ -31,6 +31,11 @@ public class ChannelCartServiceImpl extends ServiceImpl<ChannelCartMapper, Chann
     return getBaseMapper().listCartVO(queryWrapper);
   }
 
+  @Override
+  public List<ChannelCartVO> listCartByChannelId(Long channelId) {
+    return getBaseMapper().listCartByChannelId(channelId);
+  }
+
   @Override
   public boolean addToCart(ChannelCartParam param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();

mp-service/src/main/resources/mapper/channel/ChannelCartMapper.xml

@@ -24,4 +24,11 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="listCartByChannelId" resultType="com.qs.mp.channel.domain.vo.ChannelCartVO">
+        select t1.cart_id, t1.order_num, t2.*
+        from mp_channel_cart t1
+        left join mp_ticket_box t2 on t1.box_id = t2.box_id
+        where t1.channel_id = #{channelId} and t2.status = "on"
+        ORDER BY t1.updated_time DESC
+    </select>
 </mapper>