From 58162242562d3cdafc55e1a6619aa86acb96efb7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 九月 2023 09:21:42 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 2fd68d8..09b6696 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -143,6 +143,9 @@
private String salt = "SA;d5#";
+ @Autowired
+ private SMSUtil smsUtil;
+
@Override
public Integer getAppOpenInfo(Integer type) {
@@ -162,6 +165,21 @@
*/
@Override
public ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception {
+ if(type == 3){
+ Driver driver1 = driverMapper.queryByPhone(phone);
+ if(null != driver1){
+ if(driver1.getAuthState() == 1){
+ return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is currently under review" : "The driver is currently under review");
+ }
+ if(driver1.getAuthState() == 2){
+ return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver already exists" : "Les Driver already exists");
+ }
+ if(driver1.getAuthState() == 3){
+ return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "The driver's account has been frozen" : "Le compte du conducteur a été froid");
+ }
+ }
+ }
+
Random random = new Random();
StringBuffer sb = new StringBuffer();
for(int i = 0; i < 4; i++){
@@ -183,7 +201,7 @@
sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
break;
}
- SMSUtil.sendTwilioMessage("+" + phone, sms);
+ smsUtil.sendCellulantMessage(phone, sms);
System.out.println(sms);
return ResultUtil.success();
}
@@ -201,7 +219,7 @@
//发送验证码短信
redisUtil.setStrValue(email, authCode, 5 * 60);//设置五分钟过期
- String path = templatePath + "index.html";
+ String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
document.getElementById("english").remove();
@@ -307,7 +325,7 @@
driverMapper.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path = templatePath + "index.html";
+ String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
document.getElementById("english").remove();
@@ -424,7 +442,6 @@
return ResultUtil.success(loginWarpper);
}
-
driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
LoginWarpper loginWarpper = new LoginWarpper();
@@ -479,7 +496,7 @@
Driver driver = this.selectById(uid);
driver.setLastName(registeredWarpper.getLastName());
driver.setFirstName(registeredWarpper.getFirstName());
- driver.setSex(registeredWarpper.getSex());
+// driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
driver.setBirthday(registeredWarpper.getBirthday());
@@ -513,11 +530,11 @@
driver.setPlaceOfPractice(language == 1 ? city1.getChineseName() : language == 2 ? city1.getEnglishName() : city1.getFrenchName());
Calendar calendar = Calendar.getInstance();
- calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
+// calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
- driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
+// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl());
driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2());
driver.setEmail(registeredWarpper.getEmail());
@@ -545,7 +562,7 @@
}
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -624,7 +641,7 @@
driverMapper.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -770,24 +787,24 @@
int size = this.queryMyActivity(uid, new Date(), language).size();
map.put("activity", size);
//获取司机待支付的现金支付订单推送司机支付
- new Thread(new Runnable() {
- @Override
- public void run() {
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
- .eq("driverPay", 1).eq("isDelete", 1));
- if(orderPrivateCars.size() > 0){
- OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
- pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
- return;
- }
- List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
- .eq("isDelete", 1).eq("driverPay", 1));
- if(orderLogistics.size() > 0){
- OrderLogistics orderLogistics1 = orderLogistics.get(0);
- pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
- }
- }
- }).start();
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
+// .eq("driverPay", 1).eq("isDelete", 1));
+// if(orderPrivateCars.size() > 0){
+// OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
+// pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
+// return;
+// }
+// List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
+// .eq("isDelete", 1).eq("driverPay", 1));
+// if(orderLogistics.size() > 0){
+// OrderLogistics orderLogistics1 = orderLogistics.get(0);
+// pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
+// }
+// }
+// }).start();
return map;
}
@@ -1091,7 +1108,7 @@
driver.setPassword(ShiroKit.md5(password, salt));
this.updateById(driver);
if(ToolUtil.isNotEmpty(driver.getEmail())){
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if(1 == language){
document1.getElementById("english").remove();
@@ -1388,7 +1405,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1469,7 +1486,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1551,7 +1568,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1633,7 +1650,7 @@
driverActivityHistoryMapper.insert(driverActivityHistory);
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1737,7 +1754,7 @@
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -1821,7 +1838,7 @@
incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());
if(ToolUtil.isNotEmpty(driver.getEmail())) {
- String path1 = templatePath + "index.html";
+ String path1 = templatePath + "driver/index.html";
Document document1 = Jsoup.parse(new File(path1), "UTF-8");
if (1 == language) {
document1.getElementById("english").remove();
@@ -2322,6 +2339,7 @@
* @param id
*/
private void singlePointLogin(Integer id){
+ pushUtil.pushOffline(id, 2);
//开始验证当前账号是否在别处登录
String value = redisUtil.getValue("DRIVER_" + id);
if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线（如果是车载端不需要下线）
@@ -2332,6 +2350,7 @@
redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + id);//清除存储的token
}
+
}
@Override
--
Gitblit v1.7.1