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/controller/general/TDriverController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 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);
--
Gitblit v1.7.1