From 3a63b2067e1d8ab623e901aa40adddd4c9e2e11f Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 4 Jun 2026 18:46:55 +0800 Subject: [PATCH] =?UTF-8?q?cp=E7=A4=BC=E7=89=A9=E7=9B=AE=E6=A0=87=E5=80=BC?= =?UTF-8?q?100%=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circle/other/app/listener/gift/GiveGiftsListener.java | 6 +----- .../other/app/listener/gift/strategy/GiftCountStrategy.java | 2 +- .../app/listener/gift/strategy/GiftRocketListener.java | 2 +- .../other/app/listener/gift/strategy/RankCountStrategy.java | 2 +- .../other/infra/gateway/user/UserRegionGatewayImpl.java | 2 +- 5 files changed, 5 insertions(+), 9 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 d7896d20..87d99e5a 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 @@ -520,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.9"))).setScale(0, RoundingMode.DOWN); + targetAmount = giftValue.getGiftValue().multiply(acceptAssistRatio.multiply(new BigDecimal("10")).min(new BigDecimal("1"))).setScale(0, RoundingMode.DOWN); acceptAmount = giftValue.getGiftValue().multiply(acceptAssistRatio).setScale(0, RoundingMode.DOWN); } else if (event.checkActivityGift()){ @@ -816,13 +816,9 @@ public class GiveGiftsListener implements MessageListener { return gameLuckyGiftCommon.getLuckyGiftTargetRatio(event.getSysOrigin().name()); } if (event.checkCpGift()) { - BigDecimal multiply = getAssistCpGiftGoldRatio("").multiply(new BigDecimal("10")); - BigDecimal min = multiply.min(new BigDecimal("0.7")); return getAssistCpGiftGoldRatio("").multiply(new BigDecimal("10")).min(new BigDecimal("0.7")); } if (event.checkActivityGift()) { - BigDecimal multiply = getAssistCpGiftGoldRatio("").multiply(new BigDecimal("10")); - BigDecimal min = multiply.min(new BigDecimal("0.9")); return getAssistCpGiftGoldRatio("").multiply(new BigDecimal("10")).min(new BigDecimal("0.9")); } 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 b8d2b617..7be13045 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.9"); + BigDecimal ratio = new BigDecimal("1"); 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 cefbe19a..47e0d69e 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.9"); + return new BigDecimal("1"); } 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 67e0c8ce..150fa143 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.9"); + return new BigDecimal("1"); } 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 61d9c0c8..9cb6029e 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.09); + BigDecimal defaultRatio = BigDecimal.valueOf(0.1); if (StringUtils.isBlank(regionId)) { return defaultRatio; }