From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 85 +++++++++++++++---------------------------
1 files changed, 31 insertions(+), 54 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 736466e..d40981b 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
@@ -97,6 +97,8 @@
@Autowired
private ICompanyCityService companyCityService;
+ @Autowired
+ private IOpenCityService openCityService;
@Autowired
private GDFalconUtil gdFalconUtil;
@@ -129,9 +131,6 @@
private CarServiceMapper carServiceMapper;
@Autowired
- private PushUtil pushUtil;
-
- @Autowired
private IOrderLogisticsService orderLogisticsService;
@Value("${pushMinistryOfTransport}")
@@ -139,15 +138,13 @@
private String salt = "SA;d5#";
-
-
- @Autowired
+ @Resource
private OrderPrivateCarMapper orderPrivateCarMapper;
- @Autowired
+ @Resource
private OrderCrossCityMapper orderCrossCityMapper;
- @Autowired
+ @Resource
private OrderTaxiMapper orderTaxiMapper;
@Autowired
@@ -510,14 +507,10 @@
*/
@Override
public Map<String, Object> queryPhone(String code) throws Exception {
- Company query = companyCityService.query(code);
Map<String, Object> map = new HashMap<>();
- if(null == query){
- map.put("phone", "");
- }else{
- Phone phone = phoneMapper.queryInfo(query.getId(), 2);
- map.put("phone", null != phone ? phone.getPhone() : "");
- }
+ OpenCity openCity = openCityService.openCity1(code);
+ Phone phone = phoneMapper.queryInfo(openCity.getId(), 2, 2);
+ map.put("phone", null != phone ? phone.getPhone() : "");
return map;
}
@@ -570,9 +563,9 @@
loginWarpper.setRongYunToken(token1.getToken());
//创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(phone);
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
+// String tid = gdFalconUtil.createTerminal(phone);
+// loginWarpper.setServerId(gdFalconUtil.getServerId());
+// loginWarpper.setTerminalId(tid);
return ResultUtil.success(loginWarpper);
}
@@ -959,47 +952,31 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPhone(Integer uid) throws Exception {
+ public Map<String, Object> queryPhone(Integer uid, String code) 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));
+ OpenCity openCity = openCityService.openCity1(code);
+ Company company = companyMapper.selectById(driver.getCompanyId());
Map<String, Object> map = new HashMap<>();
if(company.getType() == 3){//加盟商
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
+ map.put("branch", "");
+ Phone phone = phoneMapper.queryInfo(openCity.getId(), 2, 2);
map.put("franchisee", null != phone ? phone.getPhone() : "");
- company = companyMapper.selectById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("branch", null != phone ? phone.getPhone() : "");
- }else{
- map.put("branch", "");
- }
- company = companyMapper.selectById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("platform", null != phone ? phone.getPhone() : "");
- }else{
- map.put("platform", "");
- }
+ phone = phoneMapper.queryInfo(openCity.getId(), 2, 1);
+ map.put("platform",null != phone ? phone.getPhone() : "");
return map;
}
if(company.getType() == 2){//分公司
map.put("franchisee", "");
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
+ Phone phone = phoneMapper.queryInfo(openCity.getId(), 2, 2);
map.put("branch", null != phone ? phone.getPhone() : "");
- company = companyMapper.selectById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("platform",null != phone ? phone.getPhone() : "");
- }else{
- map.put("platform", "");
- }
+ phone = phoneMapper.queryInfo(openCity.getId(), 2, 1);
+ map.put("platform",null != phone ? phone.getPhone() : "");
return map;
}
if(company.getType() == 1){//平台
map.put("franchisee", "");
map.put("branch", "");
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
+ Phone phone = phoneMapper.queryInfo(company.getId(), 2, 1);
map.put("platform", null != phone ? phone.getPhone() : "");
return map;
}
@@ -1358,9 +1335,9 @@
loginWarpper.setAppid(UUIDUtil.getRandomCode());
//创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(driver.getPhone());
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
+// String tid = gdFalconUtil.createTerminal(driver.getPhone());
+// loginWarpper.setServerId(gdFalconUtil.getServerId());
+// loginWarpper.setTerminalId(tid);
return ResultUtil.success(loginWarpper);
}
@@ -1454,9 +1431,9 @@
loginWarpper.setAppid(UUIDUtil.getRandomCode());
//创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(driver.getPhone());
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
+// String tid = gdFalconUtil.createTerminal(driver.getPhone());
+// loginWarpper.setServerId(gdFalconUtil.getServerId());
+// loginWarpper.setTerminalId(tid);
return ResultUtil.success(loginWarpper);
}
@@ -1540,9 +1517,9 @@
loginWarpper.setAppid(UUIDUtil.getRandomCode());
//创建高德猎鹰的终端数据
- String tid = gdFalconUtil.createTerminal(driver.getPhone());
- loginWarpper.setServerId(gdFalconUtil.getServerId());
- loginWarpper.setTerminalId(tid);
+// String tid = gdFalconUtil.createTerminal(driver.getPhone());
+// loginWarpper.setServerId(gdFalconUtil.getServerId());
+// loginWarpper.setTerminalId(tid);
return ResultUtil.success(loginWarpper);
}
--
Gitblit v1.7.1