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/service/impl/UserActivityServiceImpl.java | 18 ------------------
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 3 ++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml | 27 +++++++++++++++++++--------
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html | 6 +++---
4 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 4f4da7f..78b58a6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -780,10 +780,11 @@
if (1 == optType){ //解冻
tDriver.setAuthState(2);
}else if (2 == optType){ //冻结
- String key = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ String key = redisUtil.getValue(tDriver.getPhone());
redisUtil.remove(key);//删除个人信息数据
redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + driverId);//清除存储的token
+ redisUtil.remove("DEVICE_" + driverId);//清除车载端登录的标识
tDriver.setAuthState(3);
}
tDriver.setRemark(remark);
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>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
index 6e49bfd..0cd525e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -309,26 +309,8 @@
public Map<String, Object> queryUserActivityList(Integer uid, Date start, Date end, String name, Integer status, Integer offset, Integer limit) {
Map<String, Object> map = new HashMap<>();
Integer objectId = userService.selectById(uid).getObjectId();
- boolean a = false;
- if (status!=null&&status==5){
- status = null;
- a = true;
- }
List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(objectId, start, end, name, status, offset, limit);
int i = userActivityMapper.queryUserActivityListCount(objectId, start, end, name, status);
- if (a){
- List<Map<String, Object>> list1 = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : list) {
- long statys = (long) stringObjectMap.get("status");
- System.out.println(statys);
- if (statys==6){
- list1.add(stringObjectMap);
- }
- }
- map.put("rows", list1);
- map.put("total", list1.size());
- return map;
- }
map.put("rows", list);
map.put("total", i);
return map;
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
index 8630871..75bf1be 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
@@ -21,9 +21,9 @@
<option value="1">待审核</option>
<option value="2">已驳回</option>
<option value="4">已暂停</option>
- <option value="3">未开始</option>
- <option value="5">进行中</option>
- <option value="6">已结束</option>
+ <option value="5">未开始</option>
+ <option value="6">进行中</option>
+ <option value="7">已结束</option>
</#SelectCon>
</div>
<div class="col-sm-3">
--
Gitblit v1.7.1