From 56d6af7c8b64c8b477296c591364559c2d8b9a0c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 18:58:55 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 641980f..8941aea 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -16,6 +16,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.EditStaffNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.StaffNodeInfo;
import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
@@ -152,25 +153,23 @@
sb.append((int) (random.nextDouble() * 10));
}
String authCode = sb.toString();
- String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!";
-
- //发送验证码短信
- redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
- String templateCode = "";
- switch (type) {
- case 1:
- templateCode = "SMS_154775435";//身份验证
- break;
- case 2:
- templateCode = "SMS_154775434";//登录确认
- break;
- case 3:
- templateCode = "SMS_154775432";//用户注册
- break;
- case 4:
- templateCode = "SMS_154775431";//修改密码
- break;
- }
+// //发送验证码短信
+// redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
+// String templateCode = "";
+// switch (type) {
+// case 1:
+// templateCode = "SMS_154775435";//身份验证
+// break;
+// case 2:
+// templateCode = "SMS_154775434";//登录确认
+// break;
+// case 3:
+// templateCode = "SMS_154775432";//用户注册
+// break;
+// case 4:
+// templateCode = "SMS_154775431";//修改密码
+// break;
+// }
// String sData = aLiSendSms.sendSms(phone, "SMS_229715276", "{\"code\":\"" + authCode + "\"}");
// JSONObject jsonObject = JSON.parseObject(sData);
// String message = jsonObject.getString("Message");
@@ -178,7 +177,16 @@
// return ResultUtil.error("");
// }
// System.out.println(sms);
- SMSUtil.sendVerifyCode(phone);
+ SendSmsRequest request = new SendSmsRequest();
+ request.setDestAddress(phone);
+ request.setTemplateId("TPL202410290001");
+ Map<String, String> templateParams = new HashMap<>();
+ templateParams.put("code", authCode);
+ request.setTemplateParams(templateParams);
+ request.setCode("code");
+ request.setSpId("T8d5hdfg");
+ SMSUtil.sendSms(request);
+ redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
return ResultUtil.success();
}
@@ -465,11 +473,12 @@
if (null == driver) {
return ResultUtil.error("账号未注册");
}
+ Company company = companyMapper.selectById(driver.getCompanyId());
//查询中台员工数据
GetStaffNodeRequest request = new GetStaffNodeRequest();
request.setEmpId(driver.getEmpId());
- request.setEntercode(driver.getEntercode());
- request.setMobile(driver.getPhone());
+ request.setEntercode(company.getEnterCode());
+ request.setMobile(company.getPrincipalPhone());
StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
if (null == staffNode || staffNode.getIsValid().equals("0")) {
return ResultUtil.error("账号未注册");
@@ -781,6 +790,7 @@
return ResultUtil.error("验证码无效");
}
Driver driver1 = this.selectById(uid);
+ Company company = companyMapper.selectById(driver1.getCompanyId());
GetStaffNodeRequest request = new GetStaffNodeRequest();
request.setEmpId(driver1.getEmpId());
request.setEntercode(driver1.getEntercode());
@@ -791,8 +801,8 @@
}
EditStaffNodeRequest editStaffNodeRequest = new EditStaffNodeRequest();
editStaffNodeRequest.setEmpId(staffNode.getEmpId());
- editStaffNodeRequest.setMobile(staffNode.getMphone());
- editStaffNodeRequest.setEntercode(staffNode.getEnterNum());
+ editStaffNodeRequest.setMobile(company.getPrincipalPhone());
+ editStaffNodeRequest.setEntercode(company.getEnterCode());
editStaffNodeRequest.setEnterId(staffNode.getEnterId());
editStaffNodeRequest.setEmpName(staffNode.getEmpName());
editStaffNodeRequest.setEmpNickname(staffNode.getEmpNickname());
@@ -1571,7 +1581,9 @@
//开始清除redis中无效的数据
Driver driver = driverMapper.selectById(id);
String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
- redisTemplate.delete(key);//删除个人信息数据
+ if(ToolUtil.isNotEmpty(key)){
+ redisTemplate.delete(key);//删除个人信息数据
+ }
redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
redisTemplate.delete("DRIVER_" + id);//清除存储的token
}
--
Gitblit v1.7.1