福袋功能- 修复获取兑换码bug

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IFeishuBotService.java

+package com.liquidnet.service.kylin.service;
+
+public interface IFeishuBotService {
+
+    void sendTextMessage(String text);
+
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinLuckyBag.java

@@ -58,16 +58,10 @@ public class KylinLuckyBag implements Serializable, Cloneable{
      */
     private String ticketsId;
 
-
-    /**
-     * 上线开始时间
-     */
-    private String onlineStartTime;
-
     /**
-     * 上线结束时间
+     * 状态: 1-可用, 0-不可用
      */
-    private String onlineEndTime;
+    private Integer state;
 
     /**
      * 福袋发放时间
@@ -79,11 +73,6 @@ public class KylinLuckyBag implements Serializable, Cloneable{
      */
     private Integer sendTotal;
 
-    /**
-     * 状态: 1-可用, 0-不可用
-     */
-    private Integer state;
-
     /**
      * 发放状态： 0：未解锁  1：已解锁
      */

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/FeishuBotServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.service.IFeishuBotService;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class FeishuBotServiceImpl implements IFeishuBotService {
+
+
+    @Override
+    public void sendTextMessage(String text) {
+        HashMap<String, Object> textMap = new HashMap<>();
+        textMap.put("text", text);
+
+        Map<String, Object> bodyMap = new HashMap<>();
+        bodyMap.put("msg_type", "text");
+        bodyMap.put("content", textMap);
+
+        HttpUtil.postJson("https://open.feishu.cn/open-apis/bot/v2/hook/6315d096-5947-4bbb-9c34-90808dd91555",
+                JsonUtils.toJson(bodyMap));
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLuckyBagServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.entity.KylinRewardUser;
 import com.liquidnet.service.kylin.mapper.KylinBrandsMapper;
 import com.liquidnet.service.kylin.mapper.KylinLuckyBagMapper;
 import com.liquidnet.service.kylin.mapper.KylinRewardCodeMapper;
+import com.liquidnet.service.kylin.service.IFeishuBotService;
 import com.liquidnet.service.kylin.service.IKylinLuckyBagService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.kylin.utils.DataUtils;
@@ -35,6 +36,8 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
 
     @Autowired
     IKylinOrderTicketsService orderTicketsService;
+    @Autowired
+    private IFeishuBotService iFeishuBotService;
 
     @Autowired
     private KylinLuckyBagMapper kylinLuckyBagMapper;
@@ -99,15 +102,15 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
             luckyBagVo.setLuckyBagId(l.getLuckyBagId());
             luckyBagVo.setName(l.getName());
             luckyBagVo.setIntroduction(l.getIntroduction());
-            if (l.getSendState() == 0) {
-                luckyBagVo.setStatus(0);
-                luckyBagVo.setRewardCodeList(Collections.emptySet());
-            } else if (l.getSendState() == 1) {
+            if (l.getSendState() == 1) {
                 // 查询数据库获取兑换码
-                List<KylinRewardUser> kylinRewardUserList = dataUtils.getKylinRewardUserList(orderId, uid);
+                List<KylinRewardUser> kylinRewardUserList = dataUtils.getKylinRewardUserList(orderId, uid, l.getLuckyBagId());
                 Set<String> codeSet = kylinRewardUserList.stream().map(KylinRewardUser::getCode).collect(Collectors.toSet());
-                luckyBagVo.setStatus(1);
+                luckyBagVo.setStatus(codeSet.isEmpty() ? 0 : 1);
                 luckyBagVo.setRewardCodeList(codeSet);
+            } else{
+                luckyBagVo.setStatus(0);
+                luckyBagVo.setRewardCodeList(Collections.emptySet());
             }
             activityVos.add(luckyBagVo);
         });

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -1682,10 +1682,11 @@ public class DataUtils {
      * @param uid
      * @return
      */
-    public List<KylinRewardUser> getKylinRewardUserList(String orderId, String uid) {
+    public List<KylinRewardUser> getKylinRewardUserList(String orderId, String uid, String luckyBagId) {
         LambdaQueryWrapper<KylinRewardUser> lambdaQueryWrapper = new QueryWrapper<KylinRewardUser>().lambda()
                 .eq(KylinRewardUser::getUid, uid)
                 .eq(KylinRewardUser::getOrderId, orderId)
+                .eq(KylinRewardUser::getLuckyBagId, luckyBagId)
                 .eq(KylinRewardUser::getState, 1);
         return kylinRewardUserMapper.selectList(lambdaQueryWrapper);
     }