From e145bb81724645e5289e3140f87018c19e1eea14 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 二月 2023 23:17:23 +0800
Subject: [PATCH] 新增加司机端接口
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 3bebf26..3a34f15 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -141,10 +141,6 @@
if(!value.equals(code)){
return ResultUtil.error("短信验证码无效");
}
- String token = getToken(phone, code);
- if(ToolUtil.isEmpty(token)){
- return ResultUtil.error("登录异常，请联系管理员。");
- }
Driver driver = this.selectOne(new EntityWrapper<Driver>().eq("phone", phone).ne("status", 3));
if(null == driver){
return ResultUtil.error("请先进行注册");
@@ -158,7 +154,10 @@
if(driver.getApprovalStatus() == 3){
return ResultUtil.error("账号审核不通过，请重新申请。");
}
-
+ String token = getToken(phone, code);
+ if(ToolUtil.isEmpty(token)){
+ return ResultUtil.error("登录异常，请联系管理员。");
+ }
TokenWarpper tokenWarpper = new TokenWarpper();
tokenWarpper.setToken(token);
tokenWarpper.setValidTime(7200L);
@@ -168,6 +167,43 @@
/**
+ * 司机密码登录
+ * @param receiver 国家代码+86
+ * @param phone 手机号
+ * @param password 密码
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil<TokenWarpper> driverPassLogin(String receiver, String phone, String password) throws Exception {
+ Driver driver = this.selectOne(new EntityWrapper<Driver>().eq("phone", phone).ne("status", 3));
+ if(null == driver){
+ return ResultUtil.error("请先进行注册");
+ }
+ if(driver.getStatus() == 2){
+ return ResultUtil.error("账号已被冻结，请联系管理员。");
+ }
+ if(driver.getApprovalStatus() == 1){
+ return ResultUtil.error("账号正在审核中。");
+ }
+ if(driver.getApprovalStatus() == 3){
+ return ResultUtil.error("账号审核不通过，请重新申请。");
+ }
+ if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
+ return ResultUtil.error("账号密码错误。");
+ }
+ String token = getToken(phone, password);
+ if(ToolUtil.isEmpty(token)){
+ return ResultUtil.error("登录异常，请联系管理员。");
+ }
+ TokenWarpper tokenWarpper = new TokenWarpper();
+ tokenWarpper.setToken(token);
+ tokenWarpper.setValidTime(7200L);
+ tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);
+ return ResultUtil.success(tokenWarpper);
+ }
+
+ /**
* 获取身份凭证
* @param phone
* @param password
--
Gitblit v1.7.1