From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml
index 085f5cb..c479923 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml
@@ -56,7 +56,6 @@
select
id as id,
money as money,
- expirationTime as expirationTime,
insertTime as insertTime,
companyId as companyId,
state as state,
@@ -93,7 +92,7 @@
from t_user_red_packet_record a
left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
left join t_user_activity c on (b.userActivityId = c.id)
- where a.state = 1
+ where a.state != 0
<if test="null != uid">
and a.userId = #{uid}
</if>
@@ -105,6 +104,6 @@
<select id="queryRemainingAmount" resultType="double">
- select ifnull(sum(remainingAmount), 0) from t_user_red_packet_record where userId = #{uid}
+ select ifnull(sum(remainingAmount), 0) from t_user_red_packet_record where userId = #{uid} and state = 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1