From d88c3d720aaf224693e4dcdddfb15d1e85b10bf4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 04 十一月 2025 18:47:51 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java
index 07f59d5..b3bb3cb 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java
@@ -74,20 +74,22 @@
orderCrossCityService.updateById(orderCrossCity1);
//中台修改订单状态
- ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
- request1.setOrderId(orderCrossCity1.getTravelId());
- request1.setStatus(orderCrossCity1.getState());
- if (null != orderCrossCity1.getDriverId()) {
- Driver driver2 = driverService.selectById(orderCrossCity1.getDriverId());
- Company company = iCompanyService.selectById(driver2.getCompanyId());
- request1.setDriverId(driver2.getEmpId().toString());
- request1.setSupplierShopId(company.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderCrossCity1.getTravelId())){
+ ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
+ request1.setOrderId(orderCrossCity1.getTravelId());
+ request1.setStatus(orderCrossCity1.getState());
+ if (null != orderCrossCity1.getDriverId()) {
+ Driver driver2 = driverService.selectById(orderCrossCity1.getDriverId());
+ Company company = iCompanyService.selectById(driver2.getCompanyId());
+ request1.setDriverId(driver2.getEmpId().toString());
+ request1.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderCrossCity1.getPromotion() && null != orderCrossCity1.getPromotionDriverId()) {
+ Driver driver2 = driverService.selectById(orderCrossCity1.getPromotionDriverId());
+ request1.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request1);
}
- if (2 == orderCrossCity1.getPromotion() && null != orderCrossCity1.getPromotionDriverId()) {
- Driver driver2 = driverService.selectById(orderCrossCity1.getPromotionDriverId());
- request1.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request1);
//未支付的情况取消订单
if(null == orderCrossCity1.getPayType() && ToolUtil.isNotEmpty(orderCrossCity1.getTravelId())){
--
Gitblit v1.7.1