Merge remote-tracking branch 'origin/bug_chang_draw' into pre

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

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

@@ -48,6 +48,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-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html

@@ -95,6 +95,10 @@
                     field: 'nickname',
                     title: '用户昵称'
                 },
+                {
+                    field: 'mobile',
+                    title: '用户账号'
+                },
                 {
                     field: 'receivingName',
                     title: '收货人姓名'

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

@@ -198,6 +198,9 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                     receivingStatus = 2;
                 }
                 if (prizeType == StatusConst.PRIZE_TYPE2) {// 中奖券 优惠券默认未领取状态
+                    //TODO 中券改为已领取
+                    /*receivingStatus = 2;
+                    redisDataUtils.setSendCoupon(drawId,0);*/
                     receivingStatus = 3;
                 }
                 integralActivityDrawVo.setReceivingStatus(receivingStatus);
@@ -209,6 +212,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 // mongo
                 mongoTemplate.insert(integralActivityDrawVo, IntegralActivityDrawVo.class.getSimpleName());
 
+
                 // mysql 抽奖记录
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
@@ -256,6 +260,12 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
             Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
             query.with(pageable);
             List<IntegralActivityDrawVo> integralActivityDrawVos = mongoTemplate.find(query, IntegralActivityDrawVo.class, IntegralActivityDrawVo.class.getSimpleName());
+            // mongo
+            for (IntegralActivityDrawVo drawVo : integralActivityDrawVos) {
+                IntegralActivityDrawVo drawInfo = redisDataUtils.getIntegralActivityDrawInfo(drawVo.getDrawId());
+                drawVo.setReceivingStatus(drawInfo.getReceivingStatus());
+                drawVo.setRelationId(drawInfo.getRelationId());
+            }
             sweetIntegralActivityDrawPagedResult.setList(integralActivityDrawVos).setTotal(count, pageSize).setPageSize(pageSize).setCurrentPage(pageNum);
             if (null == integralActivityDrawList) {
                 redisDataUtils.setIntegralActivityDrawList(currentUid, integralActivityId, integralActivityDrawVos);
@@ -342,7 +352,10 @@ 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.getReceivingStatus() == 3) && drawVo.getUserId().equals(uid)) {
+        //TODO 可以不判断发送状态 增加个redis 来判断是否发送过
+//        if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 2 && redisDataUtils.isSendCoupon(drawId)) && drawVo.getUserId().equals(uid)) {
+        // TODO: 2021/12/24 jxl 是否有必要判断中奖类型 和 券id是否在配置中
+        if (null != drawVo && drawVo.getReceivingStatus() != 2 && drawVo.getUserId().equals(uid)) {
             // 发放券
             LocalDateTime nowTime = LocalDateTime.now();
             LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -366,13 +379,15 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
             // 更新缓存
             redisDataUtils.updateIntegralActivityDrawInfo(drawId, couponId);
 
-            mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
-                    new Document("$set", new Document("receivingStatus", 2)
-                            .append("relationId", couponId)
-                            .append("updatedAt", LocalDateTime.now())
-                    )
-            );
+            //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)
+//                            .append("relationId", couponId)
+//                            .append("updatedAt", LocalDateTime.now())
+//                    )
+//            );
 
             redisDataUtils.delIntegralActivityDrawList(uid, drawVo.getIntegralActivityId());
         }
@@ -473,6 +488,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
             return false;
         }
     }*/
+
     /**
      * 抽奖方法 计算中哪个奖池的奖品
      */

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

 package com.liquidnet.service.sweet.utils;
 
 import com.liquidnet.service.sweet.dto.*;
+import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
 import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
@@ -24,6 +25,7 @@ public class ObjectUtil {
 
     private static final ArrayList<SweetCItyVoteStatVo> sweetCItyVoteStatVoList = new ArrayList<>();
     private static final ArrayList<IntegralActivityVo> sweetIntegralActivityVoList = new ArrayList<>();
+    private static final ArrayList<IntegralActivityDrawVo> sweetIntegralActivityDrawVoList = new ArrayList<>();
 
     public static ArrayList<SweetManualAppletDto> getSweetManualAppletDtoList() {
         return (ArrayList<SweetManualAppletDto>) sweetManualAppletDtoList.clone();
@@ -69,4 +71,8 @@ public class ObjectUtil {
     public static ArrayList<IntegralActivityVo> getSweetIntegralActivityVoList() {
         return (ArrayList<IntegralActivityVo>) sweetIntegralActivityVoList.clone();
     }
+
+    public static ArrayList<IntegralActivityDrawVo> getSweetIntegralActivityDrawVoList() {
+        return (ArrayList<IntegralActivityDrawVo>) sweetIntegralActivityDrawVoList.clone();
+    }
 }

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

@@ -789,6 +789,16 @@ public class RedisDataUtils {
         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);
+    }
+
     public List<SweetQrCode> getQrCodeTypeNum(int type) {
         String redisKey = SweetConstant.REDIS_KEY_QRCODE_LIST.concat(type + "");
         Object obj = redisUtil.get(redisKey);