70%计算修复2

This commit is contained in:
tianfeng 2026-01-08 18:27:39 +08:00
parent 0d8a44a6e0
commit 7ae13bbd43
2 changed files with 2 additions and 11 deletions

View File

@ -746,7 +746,7 @@ public class GiveGiftsListener implements MessageListener {
private static String getGiftType(GiveAwayGiftBatchEvent event, GiveGiftConfig giftConfig) {
// 周星周王后或排行榜礼物使用特殊礼物类型
if (event.checkWeekStar() || event.checkWeekKingQueen() || isRankingGift(giftConfig.getSpecial())) {
return giftConfig.getSpecial();
return giftConfig.getSpecial() + "," + giftConfig.getGiftTab();
}
// 普通礼物使用默认礼物Tab

View File

@ -168,11 +168,6 @@ public class GiftCountStrategy implements GiftStrategy {
}
}
// 20230406 财富和魅力积分双倍
List<Long> ids = new ArrayList<>();
List<Long> activityDoubleGiftIds = activityConfigService.listProcessingGiftIds(ids);
boolean isDoubleLevelExpActivity = activityDoubleGiftIds.contains(runningWater.getGiftId());
boolean isHighPriceGift = checkHighPriceGift(runningWater);
@ -180,12 +175,8 @@ public class GiftCountStrategy implements GiftStrategy {
runningWater.getAcceptUsers().forEach(accept -> {
BigDecimal charmGiftValue = isDoubleLevelExpActivity
? giftValueCount.multiply(new BigDecimal(2)).setScale(0, RoundingMode.DOWN)
: giftValueCount;
// 记录魅力等级
consumptionLevelService.incrConsumptionDiamond(accept.getAcceptUserId(), charmGiftValue);
consumptionLevelService.incrConsumptionDiamond(accept.getAcceptUserId(), giftValueCount);
// 保存高价值礼物公共礼物墙
if (isHighPriceGift) {