From 5ac328adc442d47b6039ed924e6de1162c90cbe0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 十一月 2025 21:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
index 6805c3f..fe148c4 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
@@ -245,38 +245,38 @@
System.out.println("预留："+srcReserve);
if(integer==3){
- orderCrossCityService.payOrderCrossCityCallback(orderId,"",4,targetOrderId);
+ orderCrossCityService.payOrderCrossCityCallback(orderId,"",4,targetOrderId,null);
}
if(integer==4){
- orderCrossCityService.payCancelOrderCrossCity(orderId,"",4);
+ orderCrossCityService.payCancelOrderCrossCity(orderId,"",4,null);
}
if(integer==5){
- orderLogisticsService.payOrderLogisticsCallback(orderId,",",4);
+ orderLogisticsService.payOrderLogisticsCallback(orderId,",",4,null);
}
if(integer==6){
- orderPrivateCarService.payOrderPrivateCarCallback(orderId,",",4);
+ orderPrivateCarService.payOrderPrivateCarCallback(orderId,",",4,null);
}
if(integer==9){
- orderTaxiService.payOrderTaxiCallback(orderId,"",4,paymentId);
+ orderTaxiService.payOrderTaxiCallback(orderId,"",4,paymentId,null);
}
if(integer==1){
- orderPrivateCarService.payCancelOrderPrivateCar(orderId,",",4);
+ orderPrivateCarService.payCancelOrderPrivateCar(orderId,",",4,null);
}
if(integer==8){
- orderTaxiService.payCancelOrderTaxi(orderId,"",4);
+ orderTaxiService.payCancelOrderTaxi(orderId,"",4,null);
}
if(integer==2){
- orderCrossCityService.payThankYouFeeCallback(orderId,targetOrderId,4);
+ orderCrossCityService.payThankYouFeeCallback(orderId,targetOrderId,4,null);
}
if(integer==10){
- orderLogisticsService.payThankYouFeeCallback(orderId,targetOrderId,4);
+ orderLogisticsService.payThankYouFeeCallback(orderId,targetOrderId,4,null);
}
if(integer==11){
- orderPrivateCarService.payThankYouFeeCallback(orderId,targetOrderId,4);
+ orderPrivateCarService.payThankYouFeeCallback(orderId,targetOrderId,4,null);
}
if(integer==12){
- orderTaxiService.payThankYouFeeCallback(orderId,targetOrderId,4);
+ orderTaxiService.payThankYouFeeCallback(orderId,targetOrderId,4,null);
}
if(integer==13){ //补差价
orderLogisticsService.payOrderLogisticsSpreadCallback(orderId,targetOrderId,4);
--
Gitblit v1.7.1