From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml
index 977fa7a..fe43b98 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml
@@ -57,7 +57,7 @@
d.couponType as dcouponType,
e.couponType as ecouponType,
DATE_FORMAT(a.startTime, '%Y-%m-%d') as startTime,
- DATE_FORMAT(a.endTime, '%Y-%m-%-d') as endTime,
+ DATE_FORMAT(a.endTime, '%Y-%m-%d') as endTime,
a.effective as beffective,
a.effective as ceffective,
a.effective as deffective,
@@ -71,6 +71,6 @@
left join t_sys_coupon_record e on (a.intercityCouponId = e.id)
left join t_user_activity f on (a.userActivityId = f.id)
where a.`enable` = 2 and f.status = 3 and now() between a.startTime and a.endTime and a.money <= #{money}
- and b.companyId = #{companyId} and c.companyId = #{companyId} and d.companyId = #{companyId} and e.companyId = #{companyId}
+ and (b.companyId = #{companyId} and c.companyId = #{companyId} and d.companyId = #{companyId} and e.companyId = #{companyId})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1