From bde2cd9be463edb5b7380a63d440edc39b3c8be4 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Fri, 30 Jan 2026 15:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=A4=BC=E7=89=A9=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A8=E6=80=81id=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/business/model/event/gift/GiveAwayGiftBatchEvent.java | 5 +++++ .../other/app/command/gift/BlessingsGiftGiveCmdExe.java | 1 + .../other/app/convertor/material/GiftAppConvertor.java | 1 + .../circle/other/app/listener/gift/GiveGiftsListener.java | 1 + .../circle/other/app/dto/cmd/gift/GiveAwayGiftBatchCmd.java | 5 +++++ .../database/mongo/entity/gift/GiftGiveRunningWater.java | 5 +++++ .../service/gift/impl/GiftGiveRunningWaterServiceImpl.java | 1 + 7 files changed, 19 insertions(+) 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 c2ea005c..bbda3086 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 @@ -83,6 +83,11 @@ public class GiveAwayGiftBatchEvent implements Serializable { */ private Long roomId; + /** + * 动态id + */ + private Long dynamicContentId; + /** * 跟踪id. */ diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/BlessingsGiftGiveCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/BlessingsGiftGiveCmdExe.java index e023f61e..465f6d73 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/BlessingsGiftGiveCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/BlessingsGiftGiveCmdExe.java @@ -128,6 +128,7 @@ public class BlessingsGiftGiveCmdExe { giveAwayGiftBatchEvent.setQuantity(cmd.getQuantity()); giveAwayGiftBatchEvent.setGiftConfig(toGiveGiftConfig(giftConfig)); giveAwayGiftBatchEvent.setRoomId(cmd.getRoomId()); + giveAwayGiftBatchEvent.setDynamicContentId(cmd.getDynamicContentId()); giveAwayGiftBatchEvent.setTrackId(trackId); giveAwayGiftBatchEvent.setSongId(cmd.getSongId()); giveAwayGiftBatchEvent.setCheckBlessingsGift(Boolean.FALSE); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/material/GiftAppConvertor.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/material/GiftAppConvertor.java index 1d860d91..b359391d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/material/GiftAppConvertor.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/material/GiftAppConvertor.java @@ -49,6 +49,7 @@ public interface GiftAppConvertor { .setQuantity(cmd.getQuantity()) .setGiftConfig(toGiveGiftConfig(giftConfig)) .setRoomId(cmd.getRoomId()) + .setDynamicContentId(cmd.getRoomId()) .setTrackId(trackId) .setSongId(cmd.getSongId()) .setBagGift(Boolean.FALSE) 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 3b34e03b..9bf4a702 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 @@ -451,6 +451,7 @@ public class GiveGiftsListener implements MessageListener { .processed(Boolean.FALSE) .trackId(event.getTrackId().toString()) .originId(Objects.nonNull(event.getRoomId()) ? event.getRoomId().toString() : "OTHER") + .dynamicContentId(Objects.nonNull(event.getRoomId()) ? event.getRoomId().toString() : null) .sysOrigin(event.getSysOrigin().name()) .requestPlatform(event.getRequestPlatform()) .userId(event.getSendUserId()) diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/gift/GiveAwayGiftBatchCmd.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/gift/GiveAwayGiftBatchCmd.java index bf389bd3..0d27b2dd 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/gift/GiveAwayGiftBatchCmd.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/gift/GiveAwayGiftBatchCmd.java @@ -59,6 +59,11 @@ public class GiveAwayGiftBatchCmd extends AppExtCommand { */ private Long roomId; + /** + * 动态id. + */ + private Long dynamicContentId; + /** * 已点歌曲唯一标识ID(不是歌曲配置id而是已点歌曲id). */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/gift/GiftGiveRunningWater.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/gift/GiftGiveRunningWater.java index e355d9b3..54acdb52 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/gift/GiftGiveRunningWater.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/entity/gift/GiftGiveRunningWater.java @@ -47,6 +47,11 @@ public class GiftGiveRunningWater implements Serializable { */ private String originId; + /** + * 动态id + */ + private String dynamicContentId; + /** * 来源系统. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/gift/impl/GiftGiveRunningWaterServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/gift/impl/GiftGiveRunningWaterServiceImpl.java index 81897370..12732443 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/gift/impl/GiftGiveRunningWaterServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/gift/impl/GiftGiveRunningWaterServiceImpl.java @@ -89,6 +89,7 @@ public class GiftGiveRunningWaterServiceImpl implements GiftGiveRunningWaterServ .songId(document.getLong("songId")) .trackId(document.getString("trackId")) .originId(document.getString("originId")) + .dynamicContentId(document.getString("dynamicContentId")) .sysOrigin(document.getString("sysOrigin")) .requestPlatform(document.getString("requestPlatform")) .userId(document.getLong("userId"))