发送礼物新增动态id字段

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.
    */

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);

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)

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())

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).
    */

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;
+
   /**
    * 来源系统.
    */

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"))