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/smallLogistics/server/IOrderLogisticsService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index 83a21b8..1287cae 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -115,7 +115,7 @@
* @param type 1=微信，2=支付宝
* @throws Exception
*/
- void payOrderLogisticsCallback(Integer id, String order_id, Integer type) throws Exception;
+ void payOrderLogisticsCallback(Integer id, String order_id, Integer type,String outTradeNo) throws Exception;
@@ -265,5 +265,5 @@
* @param order_id
* @throws Exception
*/
- void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+ void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType,String out_trade_no) throws Exception;
}
--
Gitblit v1.7.1