From 50350c428347d68ea1c8fa4fcc7633e4dc2550bc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:55:04 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 86 +++++++++---------------------------------
1 files changed, 19 insertions(+), 67 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 631f067..d5fc58a 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -5,12 +5,13 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.OrderMapper;
-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.*;
import com.supersavedriving.driver.modular.system.util.GaoDe.MapUtil;
+import com.supersavedriving.driver.modular.system.util.GaoDe.model.District;
import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
@@ -23,13 +24,6 @@
import com.supersavedriving.driver.modular.system.util.zhenglian.model.TradeTerminalInfo;
import com.supersavedriving.driver.modular.system.util.zhenglian.model.ZLUserInfo;
import com.supersavedriving.driver.modular.system.warpper.*;
-import com.supersavedriving.driver.core.util.ToolUtil;
-import com.supersavedriving.driver.modular.system.util.GaoDe.model.District;
-import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
-import com.supersavedriving.driver.modular.system.util.PushUtil;
-import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
-import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
-import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -140,9 +134,6 @@
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
-
- @Autowired
- private TCompanyMapper companyMapper;
@@ -263,13 +254,13 @@
this.insert(order);
driverService.updateById(driver);
if(null != appUser && null != order.getDriverId()){
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
//调三方订单中心创建行程单
CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
request.setOrderNo("DJ" + order.getId());
request.setCustomerId(appUser.getOnconUUID());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
request.setServiceType(5);
String travelItinerary = OrderUtil.createTravelItinerary(request);
order.setTravelId(travelItinerary);
@@ -779,50 +770,13 @@
*/
@Override
public List<HallOrderList> queryOrderHall(Integer uid, Integer pageNum, Integer pageSize) throws Exception {
- Driver driver = driverService.selectById(uid);
- //获取证联数据
- if(null == driver.getCustId() || 0 == driver.getAccOpenFlag()){
- TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
- tradeTerminalInfo.setTerminal("1");
- InetAddress inetAddress = InetAddress.getLocalHost();
- String ip = inetAddress.getHostAddress();
- tradeTerminalInfo.setIp(ip);
- NetworkInterface networkInterface = NetworkInterface.getByInetAddress(inetAddress);
- byte[] mac = networkInterface.getHardwareAddress();
- StringBuilder macAddress = new StringBuilder();
- for (int i = 0; i < mac.length; i++) {
- macAddress.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : ""));
- }
-
- tradeTerminalInfo.setMac(macAddress.toString());
- ZLUserInfo userInfo = ZhengLianUtil.getUserInfo(driver.getEmpId().toString(), tradeTerminalInfo);
- if(null != userInfo){
- driver.setCustId(userInfo.getCustId());
- driver.setAccOpenFlag(userInfo.getAccOpenFlag());
- driverService.updateById(driver);
- }
- }
- //同步到中台
- if(null != driver.getAccOpenFlag() && 1 == driver.getAccOpenFlag() && 0 == driver.getIsSynchronous()){
- AddAccountInfoRequest request = new AddAccountInfoRequest();
- request.setCustId(driver.getCustId());
- request.setAccountNo(driver.getEmpId().toString());
- request.setAccountName(driver.getName());
- request.setMobile(driver.getPhone());
- Integer status = EmployeeUtil.addAccountInfo(request);
- if(0 == status){
- driver.setIsSynchronous(1);
- driverService.updateById(driver);
- }
- }
-
pageNum = (pageNum - 1) * pageSize;
String value = redisUtil.getValue("daijia:DRIVER" + uid);
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
List<HallOrderList> lists = new ArrayList<>();
hallOrderLists.forEach(hallOrderList -> {
if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
- hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+ hallOrderList.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
}
hallOrderList.setCurrentDistance(0D);
if(ToolUtil.isNotEmpty(value)){
@@ -967,15 +921,14 @@
appUser.setCancelCount(0);
appUser.setIsException(1);
appUserService.updateById(appUser);
-
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
if(null == order.getTravelId()){
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
//调三方订单中心创建行程单
CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
request.setOrderNo("DJ" + order.getId());
request.setCustomerId(appUser.getOnconUUID());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
request.setServiceType(5);
String travelItinerary = OrderUtil.createTravelItinerary(request);
order.setTravelId(travelItinerary);
@@ -985,9 +938,8 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
}
@@ -1077,7 +1029,7 @@
orderInfoWarpper.setBalance(null == appUser ? 0D : appUser.getAccountBalance());
orderInfoWarpper.setCurrentDistance(0D);
if(ToolUtil.isEmpty(orderInfoWarpper.getAvatar())){
- orderInfoWarpper.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+ orderInfoWarpper.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
}
String value = redisUtil.getValue("daijia:DRIVER" + uid);
orderInfoWarpper.setPickUpTime(0);
@@ -1228,9 +1180,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1441,9 +1393,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1579,9 +1531,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1625,9 +1577,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1819,9 +1771,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
--
Gitblit v1.7.1