中奖弹幕接口增加盲豆数量

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -20,10 +20,7 @@ import com.qs.mp.admin.service.ITicketPackageService;
 import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
-import com.qs.mp.common.enums.ErrorCodeEnum;
-import com.qs.mp.common.enums.TicketBoxStatusEnum;
-import com.qs.mp.common.enums.TicketPkgStatusEnum;
-import com.qs.mp.common.enums.TicketStatusEnum;
+import com.qs.mp.common.enums.*;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.security.handle.HostHolder;
@@ -263,6 +260,11 @@ public class UserTicketController extends BaseApiController {
       List<TicketHitPrizeBarrageVO> ticketHitPrizeBarrageVOList = userHitPrizeService.hitPrizeBarrageByUserId(userId);
       if (CollectionUtils.isNotEmpty(ticketHitPrizeBarrageVOList)) {
         for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {
+          // 类型为盲豆则拼接数量
+          if(TicketPrizeTypeEnum.COIN.getValue().equals(ticketHitPrizeBarrageVOList.get(i).getPrizeType())){
+            ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "个");
+          }
+
           if (i % 2 == 0) {
             listOne.add(ticketHitPrizeBarrageVOList.get(i));
           }else {
@@ -275,6 +277,10 @@ public class UserTicketController extends BaseApiController {
     List<TicketHitPrizeBarrageVO> ticketHitPrizeBarrageVOList = userHitPrizeService.hitPrizeBarrage(userId);
 
     for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {
+      // 类型为盲豆则拼接数量
+      if(TicketPrizeTypeEnum.COIN.getValue().equals(ticketHitPrizeBarrageVOList.get(i).getPrizeType())){
+        ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "个");
+      }
       if (i % 2 == 0) {
         listOne.add(ticketHitPrizeBarrageVOList.get(i));
       }else {

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

@@ -1,12 +1,14 @@
 package com.qs.mp.user.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,5 +30,11 @@ public class TicketHitPrizeBarrageVO {
     @ApiModelProperty("奖品信息")
     private String prizeInfo;
 
+    @ApiModelProperty("数量")
+    private Integer value;
+
+    @ApiModelProperty("奖品类型")
+    private String prizeType;
+
 
 }

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

@@ -24,7 +24,10 @@
             resultType="com.qs.mp.user.domain.vo.TicketHitPrizeBarrageVO">
         SELECT su.nick_name nickName,
                 su.avatar avatar,
-                mtap.title prizeInfo
+                mtap.title prizeInfo,
+                mtap.value value,
+                mtap.prize_type prizeType
+
         FROM mp_user_hit_prize muhp
                  LEFT JOIN mp_ticket_awards_prize mtap ON muhp.prize_id = mtap.prize_id
                  LEFT JOIN sys_user su ON muhp.user_id = su.user_id
@@ -38,7 +41,10 @@
     <select id="selectTicketHitPrizeBarrageByUserId" resultType="com.qs.mp.user.domain.vo.TicketHitPrizeBarrageVO">
         SELECT su.nick_name nickName,
                 su.avatar avatar,
-                mtap.title prizeInfo
+                mtap.title prizeInfo,
+                mtap.value value,
+                mtap.prize_type prizeType
+
         FROM mp_user_hit_prize muhp
                  LEFT JOIN mp_ticket_awards_prize mtap ON muhp.prize_id = mtap.prize_id
                  LEFT JOIN sys_user su ON muhp.user_id = su.user_id