From 4228cb0f9ff33e4baa4be0ac904eb927f8d84a19 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:28:27 +0800
Subject: [PATCH] 提交代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
index 7254f10..6c0994e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.supersavedriving.driver.modular.system.dao.MonthOrderMapper;
+import com.supersavedriving.driver.modular.system.dao.TCompanyMapper;
import com.supersavedriving.driver.modular.system.model.*;
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.ALiSendSms;
@@ -16,9 +17,14 @@
import com.supersavedriving.driver.modular.system.util.MiniPay.MiniAppPay;
import com.supersavedriving.driver.modular.system.util.juhe.OCRUtil;
import com.supersavedriving.driver.modular.system.util.qianyuntong.SMSUtil;
+import com.supersavedriving.driver.modular.system.util.qianyuntong.UserUtil;
+import com.supersavedriving.driver.modular.system.util.qianyuntong.model.QYTUserInfo;
import com.supersavedriving.driver.modular.system.util.qianyuntong.model.SendSmsRequest;
import com.supersavedriving.driver.modular.system.util.separateAccounts.StrUtil;
import com.supersavedriving.driver.modular.system.util.separateAccounts.TransferUtil;
+import com.supersavedriving.driver.modular.system.util.zhenglian.TokenUtil;
+import com.supersavedriving.driver.modular.system.util.zhenglian.model.TokenRequest;
+import com.supersavedriving.driver.modular.system.util.zhenglian.model.TradeTerminalInfo;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
@@ -105,6 +111,9 @@
@Value("${qyt.admin_url}")
private String adminUrl;
+
+ @Autowired
+ private TCompanyMapper companyMapper;
@@ -221,7 +230,7 @@
return ResponseWarpper.success(ResultUtil.error("账号已冻结"));
}
}
- String numberRandom = UUIDUtil.getNumberRandom(4);
+ String numberRandom = UUIDUtil.getNumberRandom(5);
SendSmsRequest request = new SendSmsRequest();
request.setDestAddress(phone);
request.setTemplateId("TPL202410290001");
@@ -1076,6 +1085,13 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
+ Driver driver1 = driverService.selectById(uid);
+ TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
+ if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
+ return new ResponseWarpper(500, "账号未注册");
+ }
+
ResultUtil resultUtil = driverService.updatePassword(uid, oldPass, newPass);
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
@@ -1101,6 +1117,12 @@
Integer uid = driverService.getUserByRequest();
if(null == uid){
return ResponseWarpper.tokenErr();
+ }
+ Driver driver1 = driverService.selectById(uid);
+ TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
+ if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
+ return new ResponseWarpper(500, "账号未注册");
}
ResultUtil resultUtil = driverService.recoverPassword(uid, password);
return ResponseWarpper.success(resultUtil);
@@ -1185,8 +1207,8 @@
name = UUIDUtil.getRandomCode() + name.substring(name.lastIndexOf("."));
File file1 = FileUtil.writeFromStream(inputStream, new File(filePath + name));
HttpRequest post = HttpUtil.createPost(adminUrl + "/upload/image");
- HttpRequest form = post.form("file", file1);
- HttpResponse execute = form.execute();
+ post.form("file", file1);
+ HttpResponse execute = post.execute();
int status = execute.getStatus();
if(200 != status){
throw new RuntimeException("上传图片异常");
@@ -1398,4 +1420,48 @@
e.printStackTrace();
}
}
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/getZLToken")
+ @ApiOperation(value = "获取证联token(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "当前设备IP地址", name = "ip", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "当前设备mac地址", name = "mac", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "01 证联收银台支付\n" +
+ "\t 04 HOME 页\n" +
+ "\t 06 申请免密签约\n" +
+ "\t 07 商户收银台支付\n" +
+ "\t 08 开户（绑卡）\n" +
+ "\t 09 开通支付账户\n" +
+ "\t 10 打开付款码", name = "type", required = true, dataType = "String"),
+ })
+ public ResponseWarpper<String> getZLToken(String ip, String mac, String type, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserByRequest();
+ if(null == uid){
+ return ResponseWarpper.tokenErr();
+ }
+ Driver driver = driverService.selectById(uid);
+ TokenRequest tokenRequest = new TokenRequest();
+ tokenRequest.setAppUserId(driver.getEmpId().toString());
+ tokenRequest.setUserName(driver.getName());
+ tokenRequest.setCertNo(driver.getIdcard());
+ tokenRequest.setPhone(driver.getPhone());
+ TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
+ tradeTerminalInfo.setIp(ip);
+ tradeTerminalInfo.setTerminal("1");
+ tradeTerminalInfo.setMac(mac);
+ tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
+ tokenRequest.setType(type);
+ String token = TokenUtil.getToken(tokenRequest);
+ return ResponseWarpper.success(token);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1