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 | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 a5fac8d..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();
}
@@ -426,7 +444,9 @@
driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
- return ResultUtil.error(language == 1 ? "账号已存在" : language == 2 ? "Account already exists" : "Le compte existe déjà");
+ LoginWarpper loginWarpper = new LoginWarpper();
+ loginWarpper.setId(driver1.getId());
+ return ResultUtil.success(loginWarpper);
}
Driver driver = new Driver();
driver.setAccount(phone);
@@ -2319,6 +2339,7 @@
* @param id
*/
private void singlePointLogin(Integer id){
+ pushUtil.pushOffline(id, 2);
//开始验证当前账号是否在别处登录
String value = redisUtil.getValue("DRIVER_" + id);
if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线（如果是车载端不需要下线）
@@ -2329,6 +2350,7 @@
redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + id);//清除存储的token
}
+
}
@Override
--
Gitblit v1.7.1