From 18682d02e25400290d98d1c1f223c9724c7a98ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 15:10:53 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 2a82173..1c19f1f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -901,6 +901,8 @@
return useMoneyVO;
}
+ @Autowired
+ private ISysRedPacketRecordService sysRedPacketRecordService;
/**
* 发放补贴统计
*/
@@ -1147,10 +1149,11 @@
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- if (userRedPacketRecord.getRedPacketActivityId() == null){
+ if (userRedPacketRecord.getIsGrant() == 1){
// 后台发放的红包
- grantVO.setRemark("后台指定派发");
+ grantVO.setRemark("指定发放");
}
+
UserActivityRedenvelope userActivityRedenvelope =
userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
if (userActivityRedenvelope!=null){
--
Gitblit v1.7.1