From 153041bc16cb742d2832acd4af80cc22de1b1dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Mon, 1 Apr 2024 10:28:06 +0800
Subject: [PATCH] 123

---
 .../com/ruoyi/web/controller/cai/app/ConsumeController.java    | 1 +
 .../src/main/java/com/ruoyi/cai/dto/app/query/GiveGiftReq.java | 3 +++
 .../java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java   | 2 +-
 .../com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java   | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

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<Void> 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<UserGiftMapper, UserGift> 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);