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
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index bf878f9..84a660c 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.user.core.util.ToolUtil;
import com.supersavedriving.user.modular.system.dao.OrderMapper;
-import com.supersavedriving.user.modular.system.dao.TCompanyMapper;
import com.supersavedriving.user.modular.system.model.*;
import com.supersavedriving.user.modular.system.service.*;
import com.supersavedriving.user.modular.system.util.*;
@@ -20,7 +19,6 @@
import com.supersavedriving.user.modular.system.util.qianyuntong.OrderUtil;
import com.supersavedriving.user.modular.system.util.qianyuntong.model.*;
import com.supersavedriving.user.modular.system.warpper.*;
-import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,9 +38,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -112,12 +108,6 @@
private IRevenueService revenueService;
@Autowired
- private IAgentService agentService;
-
- @Autowired
- private IPlatformRechargeRecordService platformRechargeRecordService;
-
- @Autowired
private IDivisionRecordService divisionRecordService;
@Autowired
@@ -139,9 +129,6 @@
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
-
- @Autowired
- private TCompanyMapper companyMapper;
@@ -539,14 +526,14 @@
boolean insert = this.insert(order);
if(null != order.getDriverId()){
Driver driver = driverService.selectById(order.getDriverId());
- TCompany company = companyMapper.selectById(order.getDriverId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
//调三方订单中心创建行程单
CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
request.setOrderNo("DJ" + order.getId());
request.setCustomerId(appUser.getOnconUUID());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- request.setServiceType(2);
+ request.setSupplierShopId(branchOffice.getEnterCode());
+ request.setServiceType(5);
String travelItinerary = OrderUtil.createTravelItinerary(request);
order.setTravelId(travelItinerary);
this.insertOrUpdate(order);
@@ -766,12 +753,10 @@
@Override
public void run() {
Order order1 = OrderServiceImpl.this.selectById(order.getId());
- if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+ if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
driver1.setServerStatus(1);
driverService.updateById(driver1);
- }
-
- if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
+ }else if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
driver1.setServerStatus(1);
driverService.updateById(driver1);
}
@@ -875,9 +860,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
@@ -1199,6 +1184,7 @@
if(null == order.getIsCreated() || 0 == order.getIsCreated()){
//调用中台创建订单及拉起支付接口
TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
+ tradeOrderCreateData.setOrderId(order.getTravelId());
tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"0\"}");
tradeOrderCreateData.setCharge(new BigDecimal(payMoney).setScale(2, RoundingMode.HALF_EVEN));
@@ -1209,7 +1195,7 @@
tradeOrderCreateData.setOrderDesc("完成订单");
tradeOrderCreateData.setRetUrl(path);
tradeOrderCreateData.setClientIp(ip);
- tradeOrderCreateData.setServiceType(3);
+ tradeOrderCreateData.setServiceType(5);
List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
@@ -1265,13 +1251,15 @@
request.setOrderNo("DJ" + order1.getId());
request.setDriverId(driver.getEmpId().toString());
ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
- TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
- if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
- GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
- getPaymentInfoDataRequest1.setPartnerPayId(order1.getTravelId());
- GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
- orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
- break;
+ if(!travelItineraryList.getList().isEmpty()){
+ TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
+ if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
+ GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
+ getPaymentInfoDataRequest1.setPartnerPayId(order1.getTravelId());
+ GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
+ orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
+ break;
+ }
}
Thread.sleep(wait);
num++;
@@ -1575,9 +1563,9 @@
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(order.getTravelId());
request.setStatus(getState(order.getState()));
- TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
+ BranchOffice branchOffice = branchOfficeService.selectById(order.getBranchOfficeId());
request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
+ request.setSupplierShopId(branchOffice.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
}
--
Gitblit v1.7.1