From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 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 3a4c98f..989966a 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;
@@ -80,6 +79,9 @@
@Value("${spring.mail.template-path}")
private String templatePath;
+
+ @Autowired
+ private RedisUtil redisUtil;
@@ -596,18 +598,19 @@
try {
String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
- document.getElementById("chinese").attr("style", "display: none;");
- document.getElementById("french").attr("style", "display: none;");
- document.getElementById("invite1").attr("style", "display: none;");
- document.getElementById("user1").attr("style", "display: none;");
- document.getElementById("settle1").attr("style", "display: none;");
- document.getElementById("pass1").attr("style", "display: none;");
- document.getElementById("email1").attr("style", "display: none;");
- document.getElementById("bill1").attr("style", "display: none;");
- document.getElementById("reward1").attr("style", "display: none;");
- document.getElementById("rewardToday1").attr("style", "display: none;");
- document.getElementById("carAudit1").attr("style", "display: none;");
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite1").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("email1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("carAudit1").remove();
+ document.getElementsByTag("title").get(0).text(1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified");
Element driver_audit1_user = document.getElementById("driver_audit1_user");
driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
Element driver_audit1_content = document.getElementById("driver_audit1_content");
@@ -616,7 +619,7 @@
}else{
driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
}
- EmailUtil.send(tDriver.getEmail(), "Notice of driver registration application", document.html());
+ EmailUtil.send(tDriver.getEmail(), 1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified", document.html());
}catch (Exception e){
e.printStackTrace();
}
@@ -709,6 +712,11 @@
}
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));
+
tDriverService.insert(tDriver);
//添加经营业务
@@ -761,6 +769,7 @@
tDriverService.updateById(driver);
return SUCCESS_TIP;
}
+
/**
* 操作司机状态
*/
@@ -772,6 +781,10 @@
if (1 == optType){ //解冻
tDriver.setAuthState(2);
}else if (2 == optType){ //冻结
+ String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(token);//删除个人信息数据
+ redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
+ redisUtil.remove("DRIVER_" + driverId);//清除存储的token
tDriver.setAuthState(3);
}
tDriver.setRemark(remark);
--
Gitblit v1.7.1