上级为官方 渠道奖励

This commit is contained in:
wangw 2025-04-11 16:54:00 +08:00
parent 06701e9a34
commit fb9ca4f253
1 changed files with 4 additions and 5 deletions

View File

@ -195,7 +195,7 @@ public class TempOrdersTask {
}, RedisKeys.getLockKey("insert_invite_achievement_lock", user.getUserId()), 30); }, RedisKeys.getLockKey("insert_invite_achievement_lock", user.getUserId()), 30);
} }
if (byUser != null && !byUser.getUserId().equals(1L)) { if (byUser != null) {
ThreadUtil.execAsync(() -> { ThreadUtil.execAsync(() -> {
ThreadUtil.sleep(1000); ThreadUtil.sleep(1000);
activities(user, byUser); activities(user, byUser);
@ -219,6 +219,7 @@ public class TempOrdersTask {
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
userMoneyDetails.setClassify(10); userMoneyDetails.setClassify(10);
userMoneyDetails.setTitle("[渠道用户]用户名称:" + user.getUserName()); userMoneyDetails.setTitle("[渠道用户]用户名称:" + user.getUserName());
userMoneyDetails.setContent("总佣金:" + rateMoney + ",到账佣金:" + rateMoney);
userMoneyDetails.setMoneyType(1); userMoneyDetails.setMoneyType(1);
sysUserMoneyDetailsService.save(userMoneyDetails); sysUserMoneyDetailsService.save(userMoneyDetails);
} }
@ -232,9 +233,6 @@ public class TempOrdersTask {
@Transactional @Transactional
public void activities(UserEntity user, UserEntity sourceUser) { public void activities(UserEntity user, UserEntity sourceUser) {
//分享达标 //分享达标
if (sourceUser == null || sourceUser.getUserId() == 1) {
return;
}
logger.info("活动领取开始: 用户: {}, 邀请用户: {}", user.getUserName(), sourceUser.getUserName()); logger.info("活动领取开始: 用户: {}, 邀请用户: {}", user.getUserName(), sourceUser.getUserName());
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId()); InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
@ -390,7 +388,7 @@ public class TempOrdersTask {
} }
// 查询是否开启分享循环奖励 // 查询是否开启分享循环奖励
int isLoop = Integer.parseInt(commonRepository.findOne(932).getValue()); int isLoop = Integer.parseInt(commonRepository.findOne(932).getValue());
InviteAchievement inviteAchievement = inviteAchievementService.getByUserIdOrSave(sourceUser.getInviterUserId(),sourceUser.getUserId()); InviteAchievement inviteAchievement = inviteAchievementService.getByUserIdOrSave(sourceUser.getInviterUserId(), sourceUser.getUserId());
// 发放奖励 // 发放奖励
int awardCount = inviteAchievement.getGiveAwardCount(); int awardCount = inviteAchievement.getGiveAwardCount();
// 如果未开启循环奖励并且已经发放过奖励则跳过 // 如果未开启循环奖励并且已经发放过奖励则跳过
@ -429,6 +427,7 @@ public class TempOrdersTask {
// 更新邀请达标奖励次数 // 更新邀请达标奖励次数
inviteAchievementService.update(null, new LambdaUpdateWrapper<InviteAchievement>() inviteAchievementService.update(null, new LambdaUpdateWrapper<InviteAchievement>()
.eq(InviteAchievement::getId, inviteAchievement.getId()) .eq(InviteAchievement::getId, inviteAchievement.getId())
.eq(InviteAchievement::getUserId, inviteAchievement.getUserId())
.set(InviteAchievement::getGiveAwardCount, inviteAchievement.getGiveAwardCount() + (awardNum - awardCount))); .set(InviteAchievement::getGiveAwardCount, inviteAchievement.getGiveAwardCount() + (awardNum - awardCount)));
} catch (Exception e) { } catch (Exception e) {
logger.error("分享达标额外奖励发放失败,用户: {}", sourceUser.getUserId(), e); logger.error("分享达标额外奖励发放失败,用户: {}", sourceUser.getUserId(), e);