Browse Source

幸运数字接口增加奖项名称返回

cup 2 years ago
parent
commit
86f736ee40

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
 import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters;
 import com.qs.mp.admin.domain.*;
+import com.qs.mp.admin.domain.dto.TicketDrawNumDTO;
 import com.qs.mp.admin.domain.param.TicketBoxParam;
 import com.qs.mp.admin.domain.param.TicketParam;
 import com.qs.mp.admin.domain.vo.*;
@@ -17,10 +18,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.DistributedLocker;
 import com.qs.mp.common.enums.*;
 import com.qs.mp.common.exception.ServiceException;
-import com.qs.mp.common.utils.AESUtil;
-import com.qs.mp.common.utils.DateUtils;
-import com.qs.mp.common.utils.LogUtil;
-import com.qs.mp.common.utils.StringUtils;
+import com.qs.mp.common.utils.*;
 import com.qs.mp.framework.redis.RedisLockKey;
 import com.qs.mp.framework.security.handle.HostHolder;
 import com.qs.mp.user.domain.UserHitPrize;
@@ -249,6 +247,16 @@ public class UserTicketController extends BaseApiController {
     ticketVO.setStatus(ticket.getStatus().getValue());
     ticketVO.setPicUrl(ticketBox.getPicUrl());
 
+    // 设置奖项名
+    if (Objects.nonNull(ticket.getPlainLuckyNum())) {
+      List<TicketDrawNumDTO> drawNumDTOList = JSONObject.parseArray(ticket.getDrawNum(), TicketDrawNumDTO.class);
+      for (TicketDrawNumDTO ticketDrawNumDTO : drawNumDTOList) {
+        if (ticketDrawNumDTO.getNum() == ticket.getPlainLuckyNum()) {
+          ticketVO.setAwardsName(ticketDrawNumDTO.getName());
+        }
+      }
+    }
+
     if (ticketPackage.getIsPre() == 1) {
       // 预付票设置售价为0
       ticketVO.setSalePrice(0);

+ 3 - 0
mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketVO.java

@@ -67,6 +67,9 @@ public class TicketVO {
   @ApiModelProperty("明文幸运数字")
   private Integer plainLuckyNum;
 
+  @ApiModelProperty("奖项名称")
+  private String awardsName;
+
   /**
    * 盲票状态(未付款、已激活、已兑奖、付款中)
    */