Merge branch 'dev_fudai_20250418' into container

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -120,6 +120,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             return true;
         } catch (Exception e) {
+            log.error("error.", e);
             return false;
         }
     }

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

@@ -20,7 +20,7 @@ public class KylinBrands implements Serializable, Cloneable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 品牌ID

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

@@ -20,7 +20,7 @@ public class KylinLuckyBag implements Serializable, Cloneable{
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 福袋ID

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

@@ -18,7 +18,7 @@ public class KylinLuckyBagActivity implements Serializable, Cloneable{
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 福袋活动ID

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

@@ -18,7 +18,7 @@ public class KylinRewardCode implements Serializable, Cloneable{
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 兑换码

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

@@ -19,7 +19,7 @@ public class KylinRewardUser implements Serializable, Cloneable{
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 用户ID

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinRewardCodeMapper.java

@@ -2,6 +2,15 @@ package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.kylin.entity.KylinRewardCode;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 public interface KylinRewardCodeMapper extends BaseMapper<KylinRewardCode> {
+
+    @Select("SELECT * FROM kylin_reward_code WHERE mid = #{mid}")
+    KylinRewardCode selectByMid(@Param("mid") Long mid);
+
+    @Update("update kylin_reward_code set state=#{state} where mid=#{mid}")
+    int updateByMid(@Param("mid") Long mid, @Param("state") int state);
 }

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

@@ -152,32 +152,27 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
      * @return
      */
     private List<KylinRewardUser> getRandomRewardCode(OrderDetailsVo vo, String luckyBagId) {
-        String lockKey = KylinRedisConst.LUCKY_BAG_CODE_LOCK + luckyBagId;
-        try {
-            // 1. 获取分布式锁，防止并发问题
-            boolean locked = redisUtil.lock(lockKey, 1, 30);
-            if (!locked) {
-                log.info("[getRandomRewardCode] 未获取到分布式锁.");
+        final int limitTotal = vo.getOrderTicketVo().getNumber();
+        if (limitTotal <= 0) {
+            log.error("[getRandomRewardCode] 用户订单购买数量错误, orderId: {}.", vo.getOrderTicketVo().getOrderTicketsId());
             return Collections.emptyList();
         }
 
-            final int limitTotal = vo.getOrderTicketVo().getNumber();
-            final KylinOrderTicketVo orderTicketVo = vo.getOrderTicketVo();
-
-            if (limitTotal <= 0) {
-                log.error("[getRandomRewardCode] 用户订单购买数量错误, orderId: {}.", orderTicketVo.getOrderTicketsId());
+        final String lockKey = KylinRedisConst.LUCKY_BAG_CODE_LOCK + luckyBagId;
+        boolean locked = redisUtil.lock(lockKey, 1, 30);
+        if (!locked) {
+            log.info("[getRandomRewardCode] 未获取到分布式锁.");
             return Collections.emptyList();
         }
 
         LambdaQueryWrapper<KylinRewardCode> lambdaQueryWrapper = new QueryWrapper<KylinRewardCode>().lambda()
                 .eq(KylinRewardCode::getLuckyBagId, luckyBagId)
                 .eq(KylinRewardCode::getState, 1)
-//                    .last(true, "ORDER BY RAND() limit " + limitTotal); // 随机搜索
                 .last(true, " limit " + limitTotal);
-            //2. 搜索兑换码
+        //2. 搜索未分配的兑换码
         List<KylinRewardCode> rewardCodes = kylinRewardCodeMapper.selectList(lambdaQueryWrapper);
 
-            if (rewardCodes.isEmpty() || rewardCodes.size() < limitTotal) {
+        if (rewardCodes.size() < limitTotal) {
             log.error("[getRandomRewardCode] 兑换码不足, luckyBagId: {}, need total: {}.", luckyBagId, limitTotal);
             // 报警
             String msg = String.format("福袋ID [%s] 兑换码不足，请及时补充.", luckyBagId);
@@ -186,26 +181,33 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         }
 
         //3. 写入
+        final KylinOrderTicketVo orderTicketVo = vo.getOrderTicketVo();
         List<KylinRewardUser> rewardUsers = new ArrayList<>(limitTotal);
+
+        try {
             for (int i = 0; i < rewardCodes.size(); i++) {
-                KylinRewardCode rewardCode = rewardCodes.get(i);
-                rewardCode.setState(0);
-                int updateResult = kylinRewardCodeMapper.updateById(rewardCode);
-                if (updateResult > 0) {
-                    KylinRewardUser user = buildRewardUser(orderTicketVo.getUserId(),
+                KylinRewardCode lockedRewardCode = rewardCodes.get(i);
+                KylinRewardUser rewardUser = buildRewardUser(orderTicketVo.getUserId(),
                         orderTicketVo.getOrderTicketsId(),
                         luckyBagId,
                         orderTicketVo.getEntitiesVoList().get(i).getOrderTicketEntitiesId(),
-                            rewardCode.getCode());
-                    kylinRewardUserMapper.insert(user);
-                    rewardUsers.add(user);
-                    log.info("[getRandomRewardCode] 兑换码分配成功, luckyBagId: {}, orderId: {}, code: {}.", luckyBagId, orderTicketVo.getOrderTicketsId(), rewardCode.getCode());
-                } else {
-                    log.error("[getRandomRewardCode] 兑换码分配失败, luckyBagId: {}, orderId: {}.", luckyBagId, orderTicketVo.getOrderTicketsId());
+                        lockedRewardCode.getCode());
+                int inserted = kylinRewardUserMapper.insert(rewardUser);
+                if (inserted > 0) {
+                    // 将兑换码状态更新为已领取
+                    int updateResult = kylinRewardCodeMapper.updateByMid(lockedRewardCode.getMid(), 0);
+                    if (updateResult <= 0) {
+                        log.error("[getRandomRewardCode] 修改兑换码状态失败, luckyBagId: {}, orderId: {}, code: {}.",
+                                luckyBagId, orderTicketVo.getOrderTicketsId(), lockedRewardCode.getCode());
                         // 报警
-                    String msg = String.format("福袋ID [%s] 分配兑换码失败：用户ID [%s] 的订单ID [%s] 已分配了 [%s] 个，应分配 [%s] 个。",
-                            luckyBagId, orderTicketVo.getUserId(), orderTicketVo.getOrderTicketsId(), rewardUsers.size(), limitTotal);
+                        String msg = String.format("修改兑换码状态失败：福袋ID: [%s], 用户ID: [%s], 订单ID: [%s], code: [%s]。",
+                                luckyBagId, orderTicketVo.getUserId(), orderTicketVo.getOrderTicketsId(), lockedRewardCode.getCode());
                         iFeishuBotService.sendTextMessage(msg);
+                    } else {
+                        log.info("[getRandomRewardCode] 兑换码分配成功, luckyBagId: {}, orderId: {}, code: {}.",
+                                luckyBagId, orderTicketVo.getOrderTicketsId(), lockedRewardCode.getCode());
+                        rewardUsers.add(rewardUser);
+                    }
                 }
             }
             return rewardUsers;