create 方法 中券

receivingStatus = 3 改为 receivingStatus = 2
collectCoupon 方法 注释修改券逻辑

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -47,6 +47,7 @@ public class SweetConstant {
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_TOTAL_PRIZE_NUM = "sweet:integralActivity:totalPrizeNum:activityId:";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_BLACK = "sweet:integralActivity:drawBlack";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_WHITE = "sweet:integralActivity:drawWhite";
+    public static final String REDIS_KEY_SWEET_SEND_COUPON = "sweet:integralActivity:coupon:send:";
     // 答题活动
     public final static String REDIS_KEY_SWEET_ANSWER_PHONE = "sweet:answer:phone:";
     // 城市投票活动

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

@@ -200,6 +200,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 if (prizeType == StatusConst.PRIZE_TYPE2) {// 中奖券 优惠券默认未领取状态
                     //TODO 中券改为已领取
                     receivingStatus = 2;
+                    redisDataUtils.setSendCoupon(drawId,0);
 //                    receivingStatus = 3;
                 }
                 integralActivityDrawVo.setReceivingStatus(receivingStatus);
@@ -346,7 +347,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         String mobile = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_MOBILE))), "");
         String uid = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_SUB))), "");
         //TODO 可以不判断发送状态 增加个redis 来判断是否发送过
-        if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 3) && drawVo.getUserId().equals(uid)) {
+        if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 2 && redisDataUtils.isSendCoupon(drawId)) && drawVo.getUserId().equals(uid)) {
             // 发放券
             LocalDateTime nowTime = LocalDateTime.now();
             LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -371,6 +372,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
             redisDataUtils.updateIntegralActivityDrawInfo(drawId, couponId);
 
             //TODO 注释修改券逻辑
+            redisDataUtils.setSendCoupon(drawId,1);
 //            mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne(
 //                    Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
 //                    new Document("$set", new Document("receivingStatus", 2)

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -558,6 +558,7 @@ public class RedisDataUtils {
             return collect;
         }
     }
+
     public void setIntegralActivityDrawAll(String integralActivityId, List<SweetIntegralActivityDraw> sweetIntegralActivityDraws) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST
                 .concat(integralActivityId);
@@ -576,6 +577,7 @@ public class RedisDataUtils {
             return (LinkedList<IntegralActivityDrawVo>) obj;
         }
     }
+
     public void setIntegralActivityDrawList(String uid, String integralActivityId, List<IntegralActivityDrawVo> integralActivityDrawVos) {
         List<IntegralActivityDrawVo> myList = integralActivityDrawVos.stream().collect(Collectors.toCollection(LinkedList::new));
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
@@ -584,6 +586,7 @@ public class RedisDataUtils {
                 .concat(uid);
         redisUtil.set(redisKey, myList);
     }
+
     public void delIntegralActivityDrawList(String uid, String integralActivityId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
                 .concat(integralActivityId)
@@ -671,6 +674,7 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_BLACK;
         redisUtil.set(redisKey, uidS);
     }
+
     public List<String> getIntegralActivityDrawBlack() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_BLACK;
         Object obj = redisUtil.get(redisKey);
@@ -680,10 +684,12 @@ public class RedisDataUtils {
             return (List<String>) obj;
         }
     }
+
     public void setIntegralActivityDrawWhite(List<String> uidS) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_WHITE;
         redisUtil.set(redisKey, uidS);
     }
+
     public List<String> getIntegralActivityDrawWhite() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_WHITE;
         Object obj = redisUtil.get(redisKey);
@@ -782,4 +788,14 @@ public class RedisDataUtils {
                 .concat(integralActivityId);
         redisUtil.decr(redisKey, num);
     }
+
+    public void setSendCoupon(String drawId,int value) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_SEND_COUPON.concat(drawId);
+        redisUtil.set(redisKey, 0);
+    }
+
+    public boolean isSendCoupon(String drawId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_SEND_COUPON.concat(drawId);
+        return redisUtil.hasKey(redisKey);
+    }
 }