From 2c1e9bdd588921c16a450b38c37d2188eef7e308 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 7 May 2026 18:26:23 +0800 Subject: [PATCH] =?UTF-8?q?cp=E7=A4=BC=E7=89=A9=2090%=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3bda1f465caa65b06ff8b0b87ee937486217856a) --- .../other/app/listener/gift/GiveGiftsListener.java | 12 ++---------- .../listener/gift/strategy/GiftCountStrategy.java | 2 +- .../listener/gift/strategy/GiftRocketListener.java | 2 +- .../listener/gift/strategy/RankCountStrategy.java | 2 +- .../infra/gateway/user/UserRegionGatewayImpl.java | 2 +- 5 files changed, 6 insertions(+), 14 deletions(-) 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 c9647ff9..d7896d20 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 @@ -121,7 +121,7 @@ public class GiveGiftsListener implements MessageListener { } private void execute(GiveAwayGiftBatchEvent eventBody) { - log.warn("礼物消息：{}", eventBody); + log.info("礼物消息处理: consumeId={}", eventBody.getTrackId()); if (!ValidatorUtils.validateFastPass(eventBody)) { log.warn("[{}]消息数据异常，必填参数为空：{}", TAG, JacksonUtils.toJson(eventBody)); @@ -139,14 +139,6 @@ public class GiveGiftsListener implements MessageListener { private void process(GiveAwayGiftBatchEvent eventBody) { processGiftSend(eventBody); - /*processGameBurstCrystal(eventBody); - try { - processBarrageGame(eventBody); - } catch (Exception e) { - log.error("赠送礼物请求百顺发送特技异常", e); - }*/ - // 发送IM通知 -// sendIM(eventBody); } private void processBarrageGame(GiveAwayGiftBatchEvent eventBody) { @@ -528,7 +520,7 @@ public class GiveGiftsListener implements MessageListener { } else if (event.checkCpGift()){ // CP礼物 acceptAssistRatio = getAssistCpGiftGoldRatio(acceptRegion.getId()); - targetAmount = giftValue.getGiftValue().multiply(acceptAssistRatio.multiply(new BigDecimal("10")).min(new BigDecimal("0.7"))).setScale(0, RoundingMode.DOWN); + targetAmount = giftValue.getGiftValue().multiply(acceptAssistRatio.multiply(new BigDecimal("10")).min(new BigDecimal("0.9"))).setScale(0, RoundingMode.DOWN); acceptAmount = giftValue.getGiftValue().multiply(acceptAssistRatio).setScale(0, RoundingMode.DOWN); } else if (event.checkActivityGift()){ 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 1c2ff602..b8d2b617 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 @@ -717,7 +717,7 @@ public class GiftCountStrategy implements GiftStrategy { } if (isCpGift(giftValue)) { - BigDecimal ratio = new BigDecimal("0.7"); + BigDecimal ratio = new BigDecimal("0.9"); return acceptAmount.multiply(ratio).setScale(0, RoundingMode.DOWN).longValue(); } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftRocketListener.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftRocketListener.java index 7ea648cc..cefbe19a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftRocketListener.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/GiftRocketListener.java @@ -118,7 +118,7 @@ public class GiftRocketListener implements GiftStrategy { } if (isCpGift(giftValue)) { - return new BigDecimal("0.7"); + return new BigDecimal("0.9"); } if (isActivityGift(giftValue)) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java index 8b4a8aa4..67e0c8ce 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/gift/strategy/RankCountStrategy.java @@ -170,7 +170,7 @@ public class RankCountStrategy implements GiftStrategy { } if (isCpGift(giftValue)) { - return new BigDecimal("0.7"); + return new BigDecimal("0.9"); } if (isActivityGift(giftValue)) { diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRegionGatewayImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRegionGatewayImpl.java index 7c64b5e0..61d9c0c8 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRegionGatewayImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/user/UserRegionGatewayImpl.java @@ -530,7 +530,7 @@ public class UserRegionGatewayImpl implements UserRegionGateway { */ @Override public BigDecimal getAssistCpGiftGoldRatio(String regionId) { - BigDecimal defaultRatio = BigDecimal.valueOf(0.07); + BigDecimal defaultRatio = BigDecimal.valueOf(0.09); if (StringUtils.isBlank(regionId)) { return defaultRatio; }