From d59956a6d7b12d122f7dbdfaecd46688697e6be0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 二月 2024 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
index 55a9e0d..aed94e3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
@@ -22,6 +22,7 @@
<select id="queryUserActivityList" resultType="map">
+ select * from (
select
a.id as id,
a.insertTime as insertTime,
@@ -29,12 +30,17 @@
a.startTime as startTime,
a.endTime as endTime,
a.remark as remark,
- IF(a.`status` != 3, a.`status`, IF(NOW() < a.startTime, 5, if(now() >= a.startTime and now() < a.endTime, 6, 7))) as `status`,
+ IF(a.`status` != 3, a.`status`, IF(NOW() < a.startTime, 5, if(now() >= a.startTime and now() < a.endTime,
+ 6, 7))) as `status`,
(
- (select count(aa.id) from t_user_red_packet_record aa left join t_user_activity_redenvelope bb on (aa.redPacketActivityId = bb.id) where aa.state = 2 and bb.userActivityId = a.id) +
- (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_registered bb on (aa.couponActivityId = bb.id and aa.activityType = 2) where aa.state = 2 and bb.userActivityId = a.id) +
- (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_invite bb on (aa.couponActivityId = bb.id and aa.activityType = 3) where aa.state = 2 and bb.userActivityId = a.id) +
- (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_balance bb on (aa.couponActivityId = bb.id and aa.activityType = 4) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_red_packet_record aa left join t_user_activity_redenvelope bb on
+ (aa.redPacketActivityId = bb.id) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_registered bb on
+ (aa.couponActivityId = bb.id and aa.activityType = 2) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_invite bb on (aa.couponActivityId =
+ bb.id and aa.activityType = 3) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_balance bb on (aa.couponActivityId =
+ bb.id and aa.activityType = 4) where aa.state = 2 and bb.userActivityId = a.id) +
(select count(id) from t_order_private_car where state in (7,8,9) and activityId = a.id) +
(select count(id) from t_order_taxi where state in (7,8,9) and activityId = a.id) +
(select count(id) from t_order_cross_city where state in (6,8,9) and activityId = a.id)
@@ -47,10 +53,15 @@
<if test="null != name and '' != name">
and a.`name` like CONCAT('%', #{name}, '%')
</if>
- <if test="null != status">
- and a.`status` = #{status}
- </if>
+
order by a.insertTime desc
+
+ ) b
+ <where>
+ <if test="null != status">
+ and b.`status` = #{status}
+ </if>
+ </where>
<if test="null != offset and null != limit">
limit #{offset}, #{limit}
</if>
--
Gitblit v1.7.1