From ddf44678f31cf259e8e2cbe229cb0050a1c47c7a Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Fri, 7 Nov 2025 17:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A5=96=E5=8A=B1=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circle/common/business/enums/SendPropsOrigin.java | 5 +++++ .../activity/award/WeeklyRewardsSentManager.java | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rc-common-business/common-business-dto/src/main/java/com/red/circle/common/business/enums/SendPropsOrigin.java b/rc-common-business/common-business-dto/src/main/java/com/red/circle/common/business/enums/SendPropsOrigin.java index 68f61a78..deb183a2 100644 --- a/rc-common-business/common-business-dto/src/main/java/com/red/circle/common/business/enums/SendPropsOrigin.java +++ b/rc-common-business/common-business-dto/src/main/java/com/red/circle/common/business/enums/SendPropsOrigin.java @@ -67,6 +67,11 @@ public enum SendPropsOrigin { */ WEEK_USER_CONSUME("King and Queen"), + /** + * 打榜活动 + */ + RANKING_ACTIVITY("Ranking Activity"), + /** * 宠物奖励. */ diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java index 200aade5..b389a89d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java @@ -263,7 +263,7 @@ public class WeeklyRewardsSentManager { ActivityConfigRewardsDTO reward = rewardsDTOList.get(i); // 发送奖励 - sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId()); + sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId(), SendPropsOrigin.RANKING_ACTIVITY); log.info("活动奖励发放成功 - 排名: {}, 用户ID: {}, 奖励组ID: {}", i + 1, user.getUserId(), reward.getResourceGroupId()); @@ -364,7 +364,7 @@ public class WeeklyRewardsSentManager { ActivityConfigRewardsDTO reward = kingRewardList.get(i); // 发送奖励 - sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId()); + sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId(), SendPropsOrigin.WEEK_USER_CONSUME); // 更新奖励状态 // sysActivityConfigClient.updateButOneRewardsStatusTrue(activityId, reward.getRewardId()); @@ -402,7 +402,7 @@ public class WeeklyRewardsSentManager { ActivityConfigRewardsDTO reward = queenRewardList.get(i); // 发送奖励 - sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId()); + sendRewardToUser(sysOriginPlatformEnum, activityId, user.getUserId(), reward.getResourceGroupId(), SendPropsOrigin.WEEK_USER_CONSUME); // 更新奖励状态 // sysActivityConfigClient.updateButTwoRewardsStatusTrue(activityId, reward.getRewardId()); @@ -419,10 +419,10 @@ public class WeeklyRewardsSentManager { * 向用户发送奖励 */ private void sendRewardToUser(SysOriginPlatformEnum sysOriginPlatformEnum, Long activityId, - Long userId, Long resourceGroupId) { + Long userId, Long resourceGroupId, SendPropsOrigin sendPropsOrigin) { propsActivityClient.sendActivityReward(new SendActivityRewardCmd() .setTrackId(activityId) - .setOrigin(SendPropsOrigin.ACTIVITY_REWARD) + .setOrigin(sendPropsOrigin) .setSysOrigin(sysOriginPlatformEnum) .setSourceGroupId(resourceGroupId) .setAcceptUserId(userId)