From dd45d210e2cbc60321fd3ed0c2ef5a0ba533faf5 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 12 四月 2026 15:13:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/YueKeDuo
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
index a74f8ef..f3d6b28 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AppOrderController.java
@@ -236,10 +236,10 @@
orderLogisticsService.payOrderLogisticsCallback(orderId,",",4);
}
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);
--
Gitblit v1.7.1