From 3ae40be3383cb79c2abc28a1d51e8aaab1cec1a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 19:12:39 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 2680120..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,6 +1149,11 @@
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
+ if (userRedPacketRecord.getIsGrant() == 1){
+ // 后台发放的红包
+ grantVO.setRemark("指定发放");
+ }
+
UserActivityRedenvelope userActivityRedenvelope =
userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
if (userActivityRedenvelope!=null){
@@ -1320,6 +1327,7 @@
;
// 红包领取记录wrapper
between3 = new EntityWrapper<UserRedPacketRecord>()
+ .ne("state",0)
;
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1343,6 +1351,7 @@
.between("insertTime", start, end);
// 红包领取记录wrapper
between3 = new EntityWrapper<UserRedPacketRecord>()
+ .ne("state",0)
.between("insertTime", start, end);
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
--
Gitblit v1.7.1