Merge branch 'dev_fudai_20250418' into container

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

@@ -120,4 +120,12 @@ public class KylinRedisConst {
     public static final String ORDER_AR_CODE = "kylin:ar:order:";//$key + $orderId
 
 
+    /**
+     *  福袋相关
+     */
+    // 福袋活动
+    public static final String LUCKY_BAG_ACTIVITY = "kylin:luckybag:activity";
+    public static final String LUCKY_BAG = "kylin:luckybag";
+
+    public static final String LUCKY_BAG_CODE_LOCK = "kylin:luckybag:code:lock:";
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinLuckyBagVo.java

@@ -2,10 +2,13 @@ package com.liquidnet.service.kylin.dto.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 
 @Data
@@ -20,6 +23,7 @@ public class KylinLuckyBagVo implements Serializable {
 
     @Data
     @ApiModel(value = "福袋活动VO")
+    @AllArgsConstructor
     public static class LuckyBagActivityVo {
 
         @ApiModelProperty(value = "活动ID")
@@ -52,6 +56,21 @@ public class KylinLuckyBagVo implements Serializable {
         private int status;
 
         @ApiModelProperty(value = "兑换码")
-        private List<String> rewardCodeList;
+        private Set<String> rewardCodeList;
+    }
+
+    public static KylinLuckyBagVo of(List<LuckyBagVo> luckyBagVoList,
+                                     List<LuckyBagActivityVo> luckyBagActivityVoList){
+        KylinLuckyBagVo kylinLuckyBagVo = new KylinLuckyBagVo();
+        kylinLuckyBagVo.setLuckyBagVoList(luckyBagVoList);
+        kylinLuckyBagVo.setLuckyBagActivityVoList(luckyBagActivityVoList);
+        return kylinLuckyBagVo;
+    }
+
+    public static KylinLuckyBagVo ofEmpty(){
+        KylinLuckyBagVo kylinLuckyBagVo = new KylinLuckyBagVo();
+        kylinLuckyBagVo.setLuckyBagVoList(Collections.emptyList());
+        kylinLuckyBagVo.setLuckyBagActivityVoList(Collections.emptyList());
+        return kylinLuckyBagVo;
     }
 }

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-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinLuckyBagService.java

@@ -2,8 +2,6 @@ package com.liquidnet.service.kylin.service;
 
 import com.liquidnet.service.kylin.dto.vo.KylinLuckyBagVo;
 
-import java.util.List;
-
 public interface IKylinLuckyBagService {
-    List<KylinLuckyBagVo> getLuckyBagBenefitsByOrderId(String orderId);
+    KylinLuckyBagVo getLuckyBagByOrderId(String orderId);
 }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/RedisKeyExpireConst.java

@@ -37,4 +37,10 @@ public class RedisKeyExpireConst {
 
     // sweet:user:service:openId 过期时间30天
     public static final long SWEET_USER_SERVICE_OPENID_EXPIRE = 30 * 24 * 60 * 60;
+
+    // kylin:luckybag:activity 过期时间30天
+    public static final long KYLIN_LUCKY_BAG_ACTIVITY_EXPIRE = 30 * 24 * 60 * 60;
+
+    // kylin:luckybag 过期时间30天
+    public static final long KYLIN_LUCKY_BAG_EXPIRE = 30 * 24 * 60 * 60;
 }

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

@@ -40,44 +40,33 @@ public class KylinLuckyBag implements Serializable, Cloneable{
     /**
      * 所属品牌ID
      */
-    private String brand_id;
+    private String brandId;
 
     /**
      * 所属演出ID
      */
-    private String performances_id;
+    private String performanceId;
 
 
     /**
      * 所属场次ID
      */
-    private String ticket_times_id;
+    private String ticketTimesId;
 
     /**
      * 所属票种ID
      */
-    private String tickets_id;
-
-
-    /**
-     * 上线开始时间
-     */
-    private String onlineStartTime;
+    private String ticketsId;
 
     /**
-     * 上线结束时间
+     * 状态: 1-可用, 0-不可用
      */
-    private String onlineEndTime;
+    private Integer state;
 
     /**
      * 福袋发放时间
      */
-    private String send_time;
-
-    /**
-     * 状态: 1-可用, 0-不可用
-     */
-    private Integer state;
+    private String sendTime;
 
     /**
      * 创建时间

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

@@ -39,24 +39,22 @@ public class KylinLuckyBagActivity implements Serializable, Cloneable{
     /**
      * 跳转地址
      */
-    private String target_url;
-
+    private String targetUrl;
 
     /**
-     * 上线开始时间
+     * 所属演出ID
      */
-    private String onlineStartTime;
+    private String performanceId;
 
     /**
-     * 上线结束时间
+     * 状态: 1-可用, 0-不可用
      */
-    private String onlineEndTime;
-
+    private Integer state;
 
     /**
-     * 状态: 1-可用, 0-不可用
+     * 排序（越大越靠前）
      */
-    private Integer state;
+    private Integer sort;
 
     /**
      * 创建时间

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinUserReward.java → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRewardUser.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinUserReward implements Serializable, Cloneable{
+public class KylinRewardUser implements Serializable, Cloneable{
 
     private static final long serialVersionUID = 1L;
 
@@ -47,7 +47,7 @@ public class KylinUserReward implements Serializable, Cloneable{
     private String code;
 
     /**
-     * 状态 0不可用 1可用 2删除
+     * 状态 0不可用 1可用
      */
     private Integer state;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinUserRewardMapper.java → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinRewardUserMapper.java

 package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.kylin.entity.KylinUserReward;
+import com.liquidnet.service.kylin.entity.KylinRewardUser;
 
-public interface KylinUserRewardMapper extends BaseMapper<KylinUserReward> {
+public interface KylinRewardUserMapper extends BaseMapper<KylinRewardUser> {
 }

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

 package com.liquidnet.service.kylin.controller;
 
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.KylinLuckyBagVo;
 import com.liquidnet.service.kylin.service.IKylinLuckyBagService;
@@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Api(tags = "前端-获取福袋相关")
 @RestController
 @RequestMapping("/luckyBag")
@@ -27,39 +24,7 @@ public class KylinLuckyBagController {
 
     @GetMapping("")
     @ApiOperation("获取福袋权益列表")
-    public ResponseDto<KylinLuckyBagVo> getLuckyBagBenefitsByOrderId(@RequestParam(value = "orderId") String orderId) {
-
-        String jsonObj = "{\n" +
-                "    \"luckyBagVoList\": [\n" +
-                "        {\n" +
-                "            \"luckyBagId\": \"bag001\",\n" +
-                "            \"name\": \"蛋仔派对专属皮肤\",\n" +
-                "            \"introduction\": \"1. 每个观演人对应发放一张兑换券/n 2. 兑换券为虚拟商品，一旦丢失或泄露，可能被他人使用，请妥善保管/n 3. 兑换码有效期至[具体日期]，请及时使用。\",\n" +
-                "            \"status\": 1,\n" +
-                "            \"rewardCodeList\": [\n" +
-                "                \"CODE123\",\n" +
-                "                \"CODE456\"\n" +
-                "            ]\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"luckyBagId\": \"bag002\",\n" +
-                "            \"name\": \"蛋仔派对新地图\",\n" +
-                "            \"introduction\": \"未解锁的福袋，快来领取吧！\",\n" +
-                "            \"status\": 0,\n" +
-                "            \"rewardCodeList\": []\n" +
-                "        }\n" +
-                "    ],\n" +
-                "    \"luckyBagActivityVoList\": [\n" +
-                "        {\n" +
-                "            \"luckyBagActivityId\": \"activity002\",\n" +
-                "            \"name\": \"本单权益\",\n" +
-                "            \"detail\": \"福袋活动详情\",\n" +
-                "            \"targetUrl\": \"https://baidu.com\"\n" +
-                "        }\n" +
-                "    ]\n" +
-                "}";
-        return ResponseDto.success(JsonUtils.fromJson(jsonObj, KylinLuckyBagVo.class));
-
-//        return ResponseDto.success(benefitsService.getLuckyBagBenefitsByOrderId(orderId));
+    public ResponseDto<KylinLuckyBagVo> getLuckyBagByOrderId(@RequestParam(value = "orderId") String orderId) {
+        return ResponseDto.success(benefitsService.getLuckyBagByOrderId(orderId));
     }
 }

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/utils/DataUtils.java

 package com.liquidnet.service.kylin.utils;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
-import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.constant.RedisKeyExpireConst;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
@@ -26,9 +27,10 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
-import com.liquidnet.service.kylin.dto.vo.returns.NoticeKylinPerformanceVo;
-import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
-import com.liquidnet.service.kylin.entity.KylinRecommendActive;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.KylinLuckyBagActivityMapper;
+import com.liquidnet.service.kylin.mapper.KylinLuckyBagMapper;
+import com.liquidnet.service.kylin.mapper.KylinRewardUserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -56,6 +58,12 @@ public class DataUtils {
     private RedisUtil redisUtil;
     @Autowired
     GoblinRedisUtils goblinRedisUtils;
+    @Autowired
+    private KylinLuckyBagActivityMapper kylinLuckyBagActivityMapper;
+    @Autowired
+    private KylinLuckyBagMapper kylinLuckyBagMapper;
+    @Autowired
+    private KylinRewardUserMapper kylinRewardUserMapper;
 
 
     /**
@@ -1603,4 +1611,83 @@ public class DataUtils {
                 KylinTicketPartnerVo.class,
                 KylinTicketPartnerVo.class.getSimpleName());
     }
+
+
+    /**
+     * 获取福袋活动列表
+     * @return
+     */
+    public List<KylinLuckyBagActivity> getKylinLuckyBagActivityList(){
+        String redisKey = KylinRedisConst.LUCKY_BAG_ACTIVITY;
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            // 从数据库查询 状态为可用的
+            LambdaQueryWrapper<KylinLuckyBagActivity> lambdaQueryWrapper = new QueryWrapper<KylinLuckyBagActivity>()
+                    .lambda()
+                    .eq(KylinLuckyBagActivity::getState, 1)
+                    .orderByDesc(KylinLuckyBagActivity::getSort);
+            List<KylinLuckyBagActivity> bagActivities = kylinLuckyBagActivityMapper.selectList(lambdaQueryWrapper);
+            setKylinLuckyBagActivityList(bagActivities);
+            return bagActivities;
+        }else {
+            return (List<KylinLuckyBagActivity>)obj;
+        }
+    }
+
+    public void setKylinLuckyBagActivityList(List<KylinLuckyBagActivity> activities){
+        String redisKey = KylinRedisConst.LUCKY_BAG_ACTIVITY;
+        redisUtil.set(redisKey, activities, RedisKeyExpireConst.KYLIN_LUCKY_BAG_ACTIVITY_EXPIRE);
+    }
+
+    public void delKylinLuckyBagActivityList(){
+        String redisKey = KylinRedisConst.LUCKY_BAG_ACTIVITY;
+        redisUtil.del(redisKey);
+    }
+
+
+    /**
+     * 获取福袋列表
+     * @return
+     */
+    public List<KylinLuckyBag> getKylinLuckyBagList(){
+        String redisKey = KylinRedisConst.LUCKY_BAG;
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            // 从数据库查询 状态为可用的
+            LambdaQueryWrapper<KylinLuckyBag> lambdaQueryWrapper = new QueryWrapper<KylinLuckyBag>()
+                    .lambda()
+                    .eq(KylinLuckyBag::getState, 1);
+            List<KylinLuckyBag> bagActivities = kylinLuckyBagMapper.selectList(lambdaQueryWrapper);
+            setKylinLuckyBagList(bagActivities);
+            return bagActivities;
+        }else {
+            return (List<KylinLuckyBag>)obj;
+        }
+    }
+
+    public void setKylinLuckyBagList(List<KylinLuckyBag> activities){
+        String redisKey = KylinRedisConst.LUCKY_BAG;
+        redisUtil.set(redisKey, activities, RedisKeyExpireConst.KYLIN_LUCKY_BAG_EXPIRE);
+    }
+
+    public void delKylinLuckyBagList(){
+        String redisKey = KylinRedisConst.LUCKY_BAG;
+        redisUtil.del(redisKey);
+    }
+
+    /**
+     * 获取用户领取兑换码
+     *
+     * @param orderId
+     * @param uid
+     * @return
+     */
+    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);
+    }
 }