From 76dd910d1c4ea422700b155c6d38d46ce4e20888 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 二月 2024 10:54:37 +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/model/TDriver.java | 6 +++---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 3 ++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 20 +++++++++++++-------
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 8 +++++++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 2 +-
5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 68bfe44..df0a6d2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -402,7 +402,7 @@
settlementRecord.setDriverId(orderLogistics.getDriverId());
settlementRecord.setType(1);
settlementRecord.setPaymentStatus(1);
- settlementRecord.setPayMoney(sum);
+ settlementRecord.setPayMoney(d.doubleValue());
settlementRecord.setInsertTime(new Date());
settlementRecordService.insert(settlementRecord);
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 61dedfe..4f4da7f 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
@@ -11,14 +11,13 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.WoUtil;
import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.EmailUtil;
-import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
-import com.stylefeng.guns.modular.system.util.PushURL;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.stylefeng.guns.modular.system.util.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -711,9 +710,9 @@
tDriver.setPhone(phone);
tDriver.setAccount(phone);
tDriver.setBalance(new BigDecimal(0));
- tDriver.setCommission(new BigDecimal(0));
- tDriver.setCouponBalance(new BigDecimal(0));
- tDriver.setBackgroundBalance(new BigDecimal(0));
+// tDriver.setCommission(new BigDecimal(0));
+// tDriver.setCouponBalance(new BigDecimal(0));
+// tDriver.setBackgroundBalance(new BigDecimal(0));
tDriverService.insert(tDriver);
@@ -767,6 +766,9 @@
tDriverService.updateById(driver);
return SUCCESS_TIP;
}
+
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 操作司机状态
*/
@@ -778,6 +780,10 @@
if (1 == optType){ //解冻
tDriver.setAuthState(2);
}else if (2 == optType){ //冻结
+ String key = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(key);//删除个人信息数据
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
+ redisUtil.remove("DRIVER_" + driverId);//清除存储的token
tDriver.setAuthState(3);
}
tDriver.setRemark(remark);
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
index a3a1184..924d6a6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import org.apache.commons.lang.time.DateUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@@ -210,6 +211,8 @@
return SUCCESS_TIP;
}
+ @Autowired
+ private RedisUtil redisUtil;
/**
* 操作用户
*/
@@ -221,7 +224,10 @@
if (1 == optType.intValue()){ //冻结
tUser.setState(2);
tUser.setRemark(remark);
-
+ String key = redisUtil.getValue("USER_" + tUser.getPhone());
+ redisUtil.remove(key);//删除个人信息数据
+ redisUtil.remove("USER_" + tUser.getPhone());//删除后台冻结相关缓存
+ redisUtil.remove("USER_" + tUserId);//清除存储的token
//增加推送
Map<String,String> map = new HashMap<>();
map.put("uid", tUser.getId().toString());
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index 92f8564..adab99c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -289,7 +289,8 @@
endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
}
Integer uid = ShiroKit.getUser().getId();
- return userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
+ Map<String, Object> map = userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
+ return map;
}
/**
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 31c828a..43af822 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -282,9 +282,9 @@
* 余额
*/
private BigDecimal balance;
- private BigDecimal commission;
- private BigDecimal backgroundBalance;
- private BigDecimal couponBalance;
+// private BigDecimal commission;
+// private BigDecimal backgroundBalance;
+// private BigDecimal couponBalance;
/**
* 活动总收入
--
Gitblit v1.7.1