From 129bbe17a4bad51b54e5e9b1fa4f4470e52ec924 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Fri, 30 Jan 2026 18:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=A4=BC=E7=89=A9=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eurl=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamic/query/DynamicDetailsQryExe.java | 1 + .../dynamic/query/DynamicGiftQryExe.java | 1 + .../gift/strategy/GiftCountStrategy.java | 18 ++++++++++++------ .../dynamic/DynamicGiftListCO.java | 5 +++++ .../rds/entity/dynamic/DynamicGift.java | 6 ++++++ .../service/dynamic/DynamicGiftService.java | 3 ++- .../dynamic/impl/DynamicGiftServiceImpl.java | 4 +++- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicDetailsQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicDetailsQryExe.java index 774db3d8..62cb3553 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicDetailsQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicDetailsQryExe.java @@ -116,6 +116,7 @@ public class DynamicDetailsQryExe { result.setUserAvatar(baseInfo.getUserAvatar()); result.setUserSex(baseInfo.getUserSex()); result.setUserNickname(baseInfo.getUserNickname()); + result.setUserProfile(userProfileAppConvertor.convertToSimpleProfile(baseInfo)); } private void processTag(DynamicContent dynamic, DynamicListCO result) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicGiftQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicGiftQryExe.java index 8a374387..18976e6d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicGiftQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/dynamic/query/DynamicGiftQryExe.java @@ -63,6 +63,7 @@ public class DynamicGiftQryExe { listCO.setDynamicId(gift.getDynamicContentId()); listCO.setGiftId(gift.getGiftId()); listCO.setGiftQuantity(gift.getGiftQuantity()); + listCO.setGiftUrl(gift.getGiftUrl()); listCO.setGiftUnitPrice(gift.getGiftUnitPrice()); listCO.setUpdateTime(gift.getUpdateTime()); 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 79274037..c7b9639f 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 @@ -50,6 +50,8 @@ import com.red.circle.other.infra.database.rds.entity.user.user.CpBlessRecord; import com.red.circle.other.infra.database.rds.entity.user.user.CpRelationship; import com.red.circle.other.infra.database.rds.entity.user.user.CpValue; import com.red.circle.other.infra.database.rds.entity.user.user.FriendshipCard; +import com.red.circle.other.infra.database.rds.service.dynamic.DynamicContentService; +import com.red.circle.other.infra.database.rds.service.dynamic.DynamicGiftService; import com.red.circle.other.infra.database.rds.service.game.GameRoomPkIntegralRecordService; import com.red.circle.other.infra.database.rds.service.game.GameRoomPkRecordService; import com.red.circle.other.infra.database.rds.service.live.RoomContributionBalanceService; @@ -131,8 +133,8 @@ public class GiftCountStrategy implements GiftStrategy { private final TaskMqMessage taskMqMessage; private final SpinsUserTaskProgressService spinsUserTaskProgressService; private final RedisService redisService; - private final com.red.circle.other.infra.database.rds.service.dynamic.DynamicContentService dynamicContentService; - private final com.red.circle.other.infra.database.rds.service.dynamic.DynamicGiftService dynamicGiftService; + private final DynamicContentService dynamicContentService; + private final DynamicGiftService dynamicGiftService; private static final List inRegionCodes = List.of("IN", "PK", "BD"); private final UserRegionCacheService userRegionCacheService; @@ -737,6 +739,13 @@ public class GiftCountStrategy implements GiftStrategy { // 获取礼物信息 GiftValue giftValue = runningWater.getGiftValue(); + + // 获取礼物URL + String giftUrl = null; + GiftConfigDTO cache = cacheGiftConfigManagerService.getById(runningWater.getGiftId()); + if (cache != null) { + giftUrl = cache.getGiftPhoto(); + } // 保存或更新动态礼物 dynamicGiftService.saveOrUpdate( @@ -744,13 +753,10 @@ public class GiftCountStrategy implements GiftStrategy { runningWater.getGiftId(), runningWater.getUserId(), giftValue.getQuantity(), + giftUrl, giftValue.getUnitPrice() ); - log.info("动态礼物保存成功, dynamicContentId={}, giftId={}, userId={}, quantity={}", - runningWater.getDynamicContentId(), runningWater.getGiftId(), - runningWater.getUserId(), giftValue.getQuantity()); - } catch (Exception e) { log.error("处理动态礼物失败", e); } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/dynamic/DynamicGiftListCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/dynamic/DynamicGiftListCO.java index 606c55be..8c78821b 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/dynamic/DynamicGiftListCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/dynamic/DynamicGiftListCO.java @@ -47,6 +47,11 @@ public class DynamicGiftListCO extends ClientObject { */ private Integer giftQuantity; + /** + * 礼物URL. + */ + private String giftUrl; + /** * 单个礼物价值. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/dynamic/DynamicGift.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/dynamic/DynamicGift.java index 85b94236..764bde72 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/dynamic/DynamicGift.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/dynamic/DynamicGift.java @@ -49,6 +49,12 @@ public class DynamicGift implements Serializable { @TableField("gift_quantity") private Integer giftQuantity; + /** + * 礼物URL. + */ + @TableField("gift_url") + private String giftUrl; + /** * 单个礼物价值. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicGiftService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicGiftService.java index 2be110f5..cca2d4a6 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicGiftService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/DynamicGiftService.java @@ -21,10 +21,11 @@ public interface DynamicGiftService extends BaseService { * @param giftId 礼物ID * @param createUser 送礼用户 * @param quantity 数量 + * @param giftUrl 礼物URL * @param unitPrice 单价 */ void saveOrUpdate(Long dynamicContentId, Long giftId, Long createUser, - Integer quantity, BigDecimal unitPrice); + Integer quantity, String giftUrl, BigDecimal unitPrice); /** * 分页查询动态礼物列表（按更新时间倒序）. diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicGiftServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicGiftServiceImpl.java index 4318a3e1..87e8fd0c 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicGiftServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/dynamic/impl/DynamicGiftServiceImpl.java @@ -26,7 +26,7 @@ public class DynamicGiftServiceImpl extends BaseServiceImpl