未领取前端接口

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityDrawVo.java

@@ -65,7 +65,7 @@ public class IntegralActivityDrawVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "adam收货人详细地址")
     private String receivingAddress;
 
-    @ApiModelProperty(value = "发放状态 1未发放 2已发放")
+    @ApiModelProperty(value = "发放状态 1未发放 2已发放 3未领取")
     private Integer receivingStatus;
 
     @ApiModelProperty(value = "创建时间")

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetActivityDrawListDao.java

@@ -104,7 +104,7 @@ public class SweetActivityDrawListDao implements Serializable {
     private String receivingAddressAll;
 
     /**
-     * 发放状态 1未发放 2已发放
+     * 发放状态 1未发放 2已发放 3未领取
      */
     private Integer receivingStatus;
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityDraw.java

@@ -114,7 +114,7 @@ public class SweetIntegralActivityDraw implements Serializable, Cloneable {
     private String receivingAddress;
 
     /**
-     * 发放状态 1未发放 2已发放
+     * 发放状态 1未发放 2已发放 3未领取
      */
     private Integer receivingStatus;
 

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql

@@ -93,7 +93,7 @@ CREATE TABLE `sweet_integral_activity_draw`
     `receiving_city`         varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人城市',
     `receiving_county`       varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人区县',
     `receiving_address`      varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人详细地址',
-    `receiving_status`       smallint        NOT NULL DEFAULT 1 COMMENT '发放状态 1未发放 2已发放',
+    `receiving_status`       smallint        NOT NULL DEFAULT 1 COMMENT '发放状态 1未发放 2已发放 3未领取',
     `created_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -197,6 +197,9 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                             JsonUtils.toJson(integralParamIn));
                     receivingStatus = 2;
                 }
+                if (prizeType == StatusConst.PRIZE_TYPE2) {// 中奖券 优惠券默认未领取状态
+                    receivingStatus = 3;
+                }
                 integralActivityDrawVo.setReceivingStatus(receivingStatus);
                 // redis
                 redisDataUtils.setIntegralActivityDraw(integralActivityDrawVo);
@@ -339,7 +342,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         Map tokenClaims = CurrentUtil.getTokenClaims();
         String mobile = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_MOBILE))), "");
         String uid = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_SUB))), "");
-        if (null != drawVo && drawVo.getReceivingStatus() == 1 && drawVo.getUserId().equals(uid)) {
+        if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 3) && drawVo.getUserId().equals(uid)) {
             // 发放券
             LocalDateTime nowTime = LocalDateTime.now();
             LinkedList<String> sqls = CollectionUtil.linkedListString();