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/api/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index f573473..31f644a 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1771,10 +1771,10 @@
Integer type = Integer.valueOf(split[1]);
switch (type) {
case 1:
- orderPrivateCarService.payOrderPrivateCarCallback(id, order_id, 1);
+ orderPrivateCarService.payOrderPrivateCarCallback(id, order_id, 1, out_trade_no);
break;
case 2:
- orderTaxiService.payOrderTaxiCallback(id, order_id, 1, 0);
+ orderTaxiService.payOrderTaxiCallback(id, order_id, 1, 0, out_trade_no);
break;
case 3:
orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1, null);
@@ -1818,10 +1818,10 @@
Integer type = Integer.valueOf(split[1]);
switch (type) {
case 1:
- orderPrivateCarService.payOrderPrivateCarCallback(id, order_id, 2);
+ orderPrivateCarService.payOrderPrivateCarCallback(id, order_id, 2, out_trade_no);
break;
case 2:
- orderTaxiService.payOrderTaxiCallback(id, order_id, 2, 0);
+ orderTaxiService.payOrderTaxiCallback(id, order_id, 2, 0, out_trade_no);
break;
case 3:
orderCrossCityService.payOrderCrossCityCallback(id, order_id, 2, null);
--
Gitblit v1.7.1