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

@@ -8,6 +8,7 @@ import com.qs.mp.channel.domain.vo.ChannelCartVO;
 import com.qs.mp.channel.service.IChannelCartService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.domain.param.BatchLongIdsParam;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -44,7 +45,8 @@ public class ChannelCartController extends BaseApiController {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     startPage();
     List<ChannelCartVO> channelCartVOS = channelCartService.listCartVO(
-        new LambdaQueryWrapper<ChannelCart>().eq(ChannelCart::getChannelId, channelId)
+        new LambdaQueryWrapper<ChannelCart>().eq(ChannelCart::getChannelId, channelId).eq(ChannelCart::getStatus,
+            TicketBoxStatusEnum.PUT_ON)
             .orderByDesc(ChannelCart::getUpdatedTime));
     return AjaxResult.success(channelCartVOS);
   }

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

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
+import com.qs.mp.common.enums.TicketTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -57,5 +61,7 @@ public class ChannelCart implements Serializable {
   @Version
   private Date updatedTime;
 
-
+  @NotNull(message = "盲票状态")
+  @ApiModelProperty(value = "盲票状态")
+  private TicketBoxStatusEnum status;
 }