From 8b92c32af3ea6fc0e3ae526996dc28ed0f15740d Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 24 Dec 2025 17:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=A3=E8=AF=9E=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E7=B1=BB=E5=9E=8B=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/model/event/gift/GiveAwayGiftBatchEvent.java | 7 +++++++ .../circle/other/app/listener/gift/GiveGiftsListener.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveAwayGiftBatchEvent.java b/rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveAwayGiftBatchEvent.java index 1f0176b2..b0a8dfc3 100644 --- a/rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveAwayGiftBatchEvent.java +++ b/rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveAwayGiftBatchEvent.java @@ -244,6 +244,13 @@ public class GiveAwayGiftBatchEvent implements Serializable { return Objects.nonNull(giftConfig) && Objects.equals(giftConfig.getGiftTab(), "CP"); } + /** + * 是否是圣诞礼物. + */ + public boolean checkChristmasGift() { + return Objects.nonNull(giftConfig) && Objects.equals(giftConfig.getGiftTab(), "CHRISTMAS"); + } + /** * 是否是专属礼物. 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 826026ca..3cef7b10 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 @@ -524,7 +524,7 @@ public class GiveGiftsListener implements MessageListener { targetAmount = giftValue.getGiftValue().multiply(luckyGiftRatio).setScale(0, RoundingMode.DOWN); acceptAmount = targetAmount; - } else if (event.checkCpGift()){ + } else if (event.checkCpGift() || event.checkChristmasGift()){ // CP礼物 acceptAssistRatio = getAssistCpGiftGoldRatio(acceptRegion.getId()); targetAmount = giftValue.getGiftValue().multiply(acceptAssistRatio.multiply(new BigDecimal("10").max(new BigDecimal("0.7")))).setScale(0, RoundingMode.DOWN);