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/api/OrderController.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 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 ae32efa..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
@@ -1514,13 +1514,13 @@
Integer type = Integer.valueOf(split[1]);
switch (type){
case 1:
- orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 1);
+ orderPrivateCarService.payCancelOrderPrivateCar(id, order_id, 1,out_trade_no);
break;
case 2:
- orderTaxiService.payCancelOrderTaxi(id, order_id, 1);
+ orderTaxiService.payCancelOrderTaxi(id, order_id, 1,out_trade_no);
break;
case 3:
- orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1);
+ orderCrossCityService.payCancelOrderCrossCity(id, order_id, 1,out_trade_no);
break;
}
@@ -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();
@@ -1654,19 +1654,19 @@
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);
+ orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1,null,out_trade_no);
break;
case 4:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1,out_trade_no);
break;
case 5:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1,out_trade_no);
break;
}
@@ -1740,19 +1740,19 @@
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);
+ orderCrossCityService.payOrderCrossCityCallback(id, order_id, 1,null,out_trade_no);
break;
case 4:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1,out_trade_no);
break;
case 5:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 1,out_trade_no);
break;
}
@@ -1786,19 +1786,19 @@
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);
+ orderCrossCityService.payOrderCrossCityCallback(id, order_id, 2,null,out_trade_no);
break;
case 4:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 2);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 2,out_trade_no);
break;
case 5:
- orderLogisticsService.payOrderLogisticsCallback(id, order_id, 2);
+ orderLogisticsService.payOrderLogisticsCallback(id, order_id, 2,out_trade_no);
break;
}
PrintWriter out = response.getWriter();
@@ -2159,19 +2159,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,out_trade_no);
case 2:
- orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderTaxiService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
case 3:
- orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCrossCityService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
case 4:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
case 5:
- orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderLogisticsService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
case 6:
- orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCharteredCarService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
case 7:
- orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1);
+ orderCallService.payThankYouFeeCallback(Integer.valueOf(s[0]), order_id, 1,out_trade_no);
}
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