From 6128d3c607f424ce03be7ffe80b2a5306e4d234b Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 11 Feb 2026 15:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=81=93=E5=85=B7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=8E=9F=E9=81=93=E5=85=B7=E4=BD=A9=E6=88=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/impl/LotteryPrizeGrantServiceImpl.java   |  6 ++++--
 .../props/impl/PropsBackpackClientServiceImpl.java    | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/impl/LotteryPrizeGrantServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/impl/LotteryPrizeGrantServiceImpl.java
index a2621b71..8faee8db 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/impl/LotteryPrizeGrantServiceImpl.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/activity/impl/LotteryPrizeGrantServiceImpl.java
@@ -196,7 +196,7 @@ public class LotteryPrizeGrantServiceImpl implements LotteryPrizeGrantService {
     propsBackpackClient.giveProps(cmd);
     
     // 发送通知
-//    propsBackpackClient.givePropsNotify(userId, "PROPS", days, prize.getPropsId());
+    propsBackpackClient.givePropsNotify(userId, "PROPS", days, prize.getPropsId());
     
     log.info("Props granted, userId: {}, propsId: {}, days: {}, recordNo: {}", 
         userId, prize.getPropsId(), days, recordNo);
@@ -227,7 +227,7 @@ public class LotteryPrizeGrantServiceImpl implements LotteryPrizeGrantService {
     propsBackpackClient.giveProps(cmd);
     
     // 发送通知
-//    propsBackpackClient.givePropsNotify(userId, type, days, prize.getPropsId());
+    propsBackpackClient.givePropsNotify(userId, type, days, prize.getPropsId());
     
     log.info("Backpack props granted, userId: {}, type: {}, propsId: {}, days: {}, recordNo: {}", 
         userId, type, prize.getPropsId(), days, recordNo);
@@ -256,6 +256,8 @@ public class LotteryPrizeGrantServiceImpl implements LotteryPrizeGrantService {
         .setDays(days)
         .setBadgeType(SysBadgeConfigTypeEnum.ACTIVITY)
     );
+
+    propsBackpackClient.givePropsNotify(userId, prize.getPrizeType(), days, prize.getPropsId());
   }
 
   /**
diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java
index 5df76550..c73192fc 100644
--- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java
+++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsBackpackClientServiceImpl.java
@@ -102,13 +102,15 @@ public class PropsBackpackClientServiceImpl implements PropsBackpackClientServic
 
     Timestamp timestamp = getTimestamp(cmd, oldpropsBackpack);
 
+    boolean useProps = getUseProps(cmd, oldpropsBackpack);
+
     propsBackpackService.addPropsBackpack(
         new PropsBackpack()
             .setUserId(cmd.getAcceptUserId())
             .setPropsId(cmd.getPropsId())
             .setType(cmd.getType())
             .setExpireTime(timestamp)
-            .setUseProps(cmd.getUseProps())
+            .setUseProps(useProps)
             .setAllowGive(cmd.getAllowGive())
     );
 
@@ -125,6 +127,13 @@ public class PropsBackpackClientServiceImpl implements PropsBackpackClientServic
     userProfileGateway.removeCacheAll(cmd.getAcceptUserId());
   }
 
+  private static Boolean getUseProps(GivePropsBackpackCmd cmd, PropsBackpack oldpropsBackpack) {
+    if (oldpropsBackpack == null) {
+        return cmd.getUseProps();
+    }
+    return oldpropsBackpack.getPropsId().equals(cmd.getPropsId()) ? oldpropsBackpack.getUseProps() : cmd.getUseProps();
+  }
+
   @NotNull
   private static Timestamp getTimestamp(GivePropsBackpackCmd cmd, PropsBackpack oldpropsBackpack) {
     Timestamp timestamp = null;