From eadaa679147ecc0d3ce273d2e4fed923e489cbed Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 19 十一月 2025 18:16:31 +0800
Subject: [PATCH] 分账
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 7c806be..dfa6bc6 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1566,13 +1566,13 @@
Integer type = Integer.valueOf(split[1]);
switch (type){
case 1:
- orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 1);
+ orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 1,null);
break;
case 2:
- orderTaxiService.payCancelOrderTaxi(id, order_id, 1);
+ orderTaxiService.payCancelOrderTaxi(id, order_id, 1,null);
break;
case 3:
- orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1);
+ orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1,null);
break;
}
}
@@ -1603,13 +1603,13 @@
Integer type = Integer.valueOf(split[1]);
switch (type){
case 1:
- orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 2);
+ orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 2,null);
break;
case 2:
- orderTaxiService.payCancelOrderTaxi(id, order_id, 2);
+ orderTaxiService.payCancelOrderTaxi(id, order_id, 2,null);
break;
case 3:
- orderCrossCityService.payCancelOrderCrossCity(id, order_id, 2);
+ orderCrossCityService.payCancelOrderCrossCity(id, order_id, 2,null);
break;
}
PrintWriter out = response.getWriter();
@@ -2211,19 +2211,19 @@
String[] s = out_trade_no.split("_");
switch (Integer.valueOf(s[1])){
case 1:
- orderPrivateCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderPrivateCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 2:
- orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 3:
- orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 4:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 5:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 6:
- orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
case 7:
- orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,null);
}
}
// cloudPay(map.get("total_fee"),map.get("transaction_id"),1);
@@ -2251,19 +2251,19 @@
String[] s = out_trade_no.split("_");
switch (Integer.valueOf(s[1])){
case 1:
- orderPrivateCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderPrivateCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 2:
- orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 3:
- orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 4:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 5:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 6:
- orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
case 7:
- orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2);
+ orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 2,null);
}
PrintWriter out = response.getWriter();
--
Gitblit v1.7.1