Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!882

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.ErrorCodeEnum;
 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.pulsar.PulsarClientService;
 import com.qs.mp.common.utils.LogUtil;
@@ -170,6 +171,9 @@ public class UserTicketOrderController extends BaseApiController {
         orderSettleVO.setAppId(appSourceEnum.getAppId());
 
         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);
         if (!CollectionUtils.isEmpty(ticketBoxGoodsListVOS)) {
             TicketBoxGoodsListVO ticketBoxGoodsListVO = ticketBoxGoodsListVOS.get(0);

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserPrizeStorageVO.java

@@ -1,5 +1,9 @@
 package com.qs.mp.user.domain.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.user.domain.UserPrizeStorage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,4 +22,8 @@ public class UserPrizeStorageVO extends UserPrizeStorage {
 
     @ApiModelProperty("是否多sku: 0否,1是")
     private Integer isMoreSku;
+
+    @ApiModelProperty("盲票形式（线上或线下）")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private TicketTypeEnum type;
 }

mp-service/src/main/resources/mapper/user/UserPrizeStorageMapper.xml

@@ -25,9 +25,16 @@
     </sql>
 
     <select id="listByQueryWrapper" resultType="com.qs.mp.user.domain.vo.UserPrizeStorageVO">
-        select t1.*, t2.multi_sku isMoreSku
-        from mp_user_prize_storage t1
-         left join mp_goods t2 on t1.goods_id = t2.goods_id
+        SELECT
+        t1.*,
+        t2.multi_sku isMoreSku ,
+        t5.type
+        FROM
+        mp_user_prize_storage t1
+        LEFT JOIN mp_goods t2 ON t1.goods_id = t2.goods_id
+        LEFT JOIN mp_user_hit_prize t3 on t1.ref_id = t3.id
+        LEFT JOIN mp_ticket t4 on t3.ticket_id = t4.ticket_id
+        LEFT JOIN mp_ticket_box t5 on t4.box_id = t5.box_id
         ${ew.customSqlSegment}
     </select>
 </mapper>