diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/GiveGiftsListener.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/GiveGiftsListener.java index 2253ce3c..f7037ddf 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/GiveGiftsListener.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/GiveGiftsListener.java @@ -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 diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java index d64f62e7..7c8be3a4 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftCountStrategy.java @@ -168,11 +168,6 @@ public class GiftCountStrategy implements GiftStrategy { } } - // 20230406 财富和魅力积分双倍 - List ids = new ArrayList<>(); - List 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) {