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 8ef13492..2253ce3c 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 @@ -527,7 +527,7 @@ public class GiveGiftsListener implements MessageListener { } else if (event.checkCpGift() || event.checkActivityGift()){ // 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.7"))).setScale(0, RoundingMode.DOWN); acceptAmount = giftValue.getGiftValue().multiply(acceptAssistRatio).setScale(0, RoundingMode.DOWN); } else { @@ -812,7 +812,9 @@ public class GiveGiftsListener implements MessageListener { return gameLuckyGiftCommon.getLuckyGiftTargetRatio(event.getSysOrigin().name()); } if (event.checkCpGift() || event.checkActivityGift()) { - return getAssistCpGiftGoldRatio("").multiply(new BigDecimal("10").min(new BigDecimal("0.7"))); + 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")); } return BigDecimal.valueOf(1L);