Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java

@@ -4,12 +4,14 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.bnyer.common.core.constant.RedisKeyConstant;
+import com.bnyer.common.core.constant.ServiceNameConstants;
 import com.bnyer.common.core.domain.CreatorProfit;
 import com.bnyer.common.core.domain.InviteLog;
 import com.bnyer.common.core.dto.CreatorProfitAdInsertDto;
 import com.bnyer.common.core.dto.ProfitInOrEndDto;
 import com.bnyer.common.core.enums.GoldEnum;
 import com.bnyer.common.core.utils.StringUtils;
+import com.bnyer.common.core.utils.uuid.IdUtils;
 import com.bnyer.common.redis.service.RedisService;
 import com.bnyer.common.redis.service.RedissonService;
 import com.bnyer.common.rocketmq.constant.RocketMqTopic;
@@ -148,6 +150,8 @@ public class CreatorProfitServiceImpl implements CreatorProfitService {
      */
     private GoldRewardMessage buildGoldRewardMsg(Long userId, int goldNum, String goldCode, String platform, Integer userClientType) {
         GoldRewardMessage message = new GoldRewardMessage();
+        message.setKey(IdUtils.randomUUID());
+        message.setSource(ServiceNameConstants.IMG_SERVICE);
         message.setUserId(userId);
         message.setGoldNum(goldNum);
         message.setGoldCode(goldCode);

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderPayNotifyConsumer.java

@@ -95,6 +95,8 @@ public class VipOrderPayNotifyConsumer extends EnhanceMessageHandler<VipOrderPay
      */
     private GoldRewardMessage buildGoldRewardMsg(Long userId, int goldNum, String goldCode, String platform, Integer userClientType) {
         GoldRewardMessage message = new GoldRewardMessage();
+        message.setKey(IdUtils.randomUUID());
+        message.setSource(ServiceNameConstants.ORDER_SERVICE);
         message.setUserId(userId);
         message.setGoldNum(goldNum);
         message.setGoldCode(goldCode);