cup 2 年之前
父节点
当前提交
cb47ee6db5

+ 4 - 0
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -21,6 +21,7 @@ import com.qs.mp.common.enums.AppSourceEnum;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.MqTopicType;
 import com.qs.mp.common.enums.MqTopicType;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.pulsar.PulsarClientService;
 import com.qs.mp.common.pulsar.PulsarClientService;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.LogUtil;
@@ -170,6 +171,9 @@ public class UserTicketOrderController extends BaseApiController {
         orderSettleVO.setAppId(appSourceEnum.getAppId());
         orderSettleVO.setAppId(appSourceEnum.getAppId());
 
 
         QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
         QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("t1.is_deleted",0);
+        queryWrapper.eq("t2.is_deleted", 0);
+        queryWrapper.eq("t1.box_id",param.getBoxId());
         List<TicketBoxGoodsListVO> ticketBoxGoodsListVOS = ticketBoxService.listTicketGoodsByQueryWrapper(queryWrapper);
         List<TicketBoxGoodsListVO> ticketBoxGoodsListVOS = ticketBoxService.listTicketGoodsByQueryWrapper(queryWrapper);
         if (!CollectionUtils.isEmpty(ticketBoxGoodsListVOS)) {
         if (!CollectionUtils.isEmpty(ticketBoxGoodsListVOS)) {
             TicketBoxGoodsListVO ticketBoxGoodsListVO = ticketBoxGoodsListVOS.get(0);
             TicketBoxGoodsListVO ticketBoxGoodsListVO = ticketBoxGoodsListVOS.get(0);