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/TaskUtil.java | 45 ++++++++++++----------
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ApplicationRunnerUtil.java | 28 +++++++------
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 28 +++++++------
3 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 0f1ac3b..7d18b5e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1488,20 +1488,22 @@
orderCrossCityMapper.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())){
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())){
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index d0c9c5f..c4d2dd9 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.account.controller.AppOrderController;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
@@ -205,18 +206,20 @@
OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest);
//中台修改订单状态
- ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
- request1.setOrderId(orderPrivateCar.getTravelId());
- request1.setStatus(9);
- if (null != orderPrivateCar.getDriverId()) {
- request1.setDriverId(driver.getEmpId().toString());
- request1.setSupplierShopId(company.getEnterCode());
+ if(ToolUtil.isNotEmpty(orderPrivateCar.getTravelId())){
+ ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
+ request1.setOrderId(orderPrivateCar.getTravelId());
+ request1.setStatus(9);
+ if (null != orderPrivateCar.getDriverId()) {
+ request1.setDriverId(driver.getEmpId().toString());
+ request1.setSupplierShopId(company.getEnterCode());
+ }
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request1.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(request1);
}
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request1.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request1);
String payId = payInfo.getData().getPayId();
//copy原始订单后生成追缴单
@@ -276,16 +279,18 @@
orderPrivateCar1.setIsCreated(0);
orderPrivateCarService.updateById(orderPrivateCar1);
//修改订单状态为待支付
- ModifyTravelItineraryRequest modifyTravelItineraryRequest = new ModifyTravelItineraryRequest();
- modifyTravelItineraryRequest.setOrderId(orderPrivateCar1.getTravelId());
- modifyTravelItineraryRequest.setStatus(orderPrivateCar1.getState());
- modifyTravelItineraryRequest.setDriverId(driver1.getEmpId().toString());
- modifyTravelItineraryRequest.setSupplierShopId(company1.getEnterCode());
- if (2 == orderPrivateCar1.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
- modifyTravelItineraryRequest.setPromoterId(driver2.getEmpId().toString());
+ if(ToolUtil.isNotEmpty(orderPrivateCar1.getTravelId())){
+ ModifyTravelItineraryRequest modifyTravelItineraryRequest = new ModifyTravelItineraryRequest();
+ modifyTravelItineraryRequest.setOrderId(orderPrivateCar1.getTravelId());
+ modifyTravelItineraryRequest.setStatus(orderPrivateCar1.getState());
+ modifyTravelItineraryRequest.setDriverId(driver1.getEmpId().toString());
+ modifyTravelItineraryRequest.setSupplierShopId(company1.getEnterCode());
+ if (2 == orderPrivateCar1.getPromotion()) {
+ Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
+ modifyTravelItineraryRequest.setPromoterId(driver2.getEmpId().toString());
+ }
+ OrderUtil.modifyTravelItinerary(modifyTravelItineraryRequest);
}
- OrderUtil.modifyTravelItinerary(modifyTravelItineraryRequest);
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1