diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java index b652b5f0..1cd2c6e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java @@ -49,6 +49,7 @@ public class ConsumeController { @Operation(summary = "赠送主播礼物") @Log(title = "赠送主播礼物", businessType = BusinessType.OTHER, isSaveDb = true) public R giveGift(@RequestBody GiveGiftReq query){ + query.setFromUserId(LoginHelper.getUserId()); GiftConsumerResp resp = consumerManager.sendGift(query); return R.ok(); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGiftReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGiftReq.java index c0330794..ecdcbb95 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGiftReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGiftReq.java @@ -13,6 +13,9 @@ public class GiveGiftReq { @Schema(description = "类型 1 个人详情页 2.IM页面 3视频页") private Integer type; + @Schema(hidden = true) + private Long fromUserId; + @Schema(description = "接收方用户ID") private Long toUserId; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java index 9da5c18b..a5c14f72 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java @@ -56,7 +56,7 @@ public class UserGiftServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public GiftConsumerResp giveGift(GiveGiftReq query) { - Long fromUserId = LoginHelper.getUserId(); + Long fromUserId = query.getFromUserId(); Gift gift = giftService.getById(query.getGiftId()); if(gift == null){ throw new ServiceException("礼物不存在"); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java index 0f7dad0f..b31eeb2d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java @@ -57,6 +57,7 @@ public class GiftMessageHandler extends AbstractMessageHandle implements IMessag } GiveGiftReq giveGiftReq = new GiveGiftReq(); giveGiftReq.setType(3); + giveGiftReq.setFromUserId(fdCtxData.getUserId()); giveGiftReq.setToUserId(fdCtxData.getTarUserId()); giveGiftReq.setGiftId(giftId); giveGiftReq.setGiftCount(giftCount);