From 06c5eda038f967dc0c0261e16eff0ad1a18e41e7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 05 六月 2024 15:52:58 +0800
Subject: [PATCH] 6.5
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 36d4951..7fe7a37 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -172,7 +172,7 @@
break;
}
// HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
- String sData = aLiSendSms.sendSms(phone, "SMS_147415322", "{\"code\":\"" + authCode + "\"}");
+ String sData = aLiSendSms.sendSms(phone, "SMS_467580138", "{\"code\":\"" + authCode + "\"}");
// JSONObject jsonObject = JSON.parseObject(sData);
// String message = jsonObject.getString("Message");
// if(!"OK".equals(message)){
@@ -551,6 +551,8 @@
}
+ @Autowired
+ private ITSysFaceDistinguishService faceDistinguishService;
/**
* 上下班操作
* @param uid
@@ -581,6 +583,15 @@
}
}).start();
}else{
+ //拿到后台配置的人脸识别配置
+ TSysFaceDistinguish tSysFaceDistinguish = faceDistinguishService.selectOne(null);
+ //如果是关闭就结束
+ if (tSysFaceDistinguish.getIsOpen()!=2){
+ if (driver.getFailCount()>=5){
+ return ResultUtil.error("请进行人脸认证后重试");
+ }
+ }
+
driverWork = new DriverWork();
driverWork.setState(1);
driverWork.setDriverId(uid);
@@ -722,7 +733,7 @@
baseWarpper.setName("出租车");
break;
case 3:
- baseWarpper.setName("直通车");
+ baseWarpper.setName("城际拼车");
break;
case 4:
baseWarpper.setName("同城小件物流");
@@ -732,6 +743,9 @@
break;
case 6:
baseWarpper.setName("包车");
+ break;
+ case 7:
+ baseWarpper.setName("接送机");
break;
}
maps.add(baseWarpper);
@@ -836,11 +850,12 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPhone(Integer uid) throws Exception {
+ public Map<String, Object> queryPhone(Integer uid,String wechat) throws Exception {
Driver driver = this.selectById(uid);
Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
Map<String, Object> map = new HashMap<>();
+ map.put("wechatUrl",wechat);
if(company.getType() == 3){//加盟商
Phone phone = phoneMapper.queryInfo(company.getId(), 2);
map.put("franchisee", null != phone ? phone.getPhone() : "");
@@ -858,6 +873,7 @@
}else{
map.put("platform", "");
}
+
return map;
}
if(company.getType() == 2){//分公司
--
Gitblit v1.7.1