From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index 91e1751..ebfebaa 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -30,7 +30,7 @@
* @return
* @throws Exception
*/
- ResultUtil queryLogisticsUnitPrice(Integer type, String startLonLat, String endAddress, Integer uid) throws Exception;
+ ResultUtil queryLogisticsUnitPrice(Integer type, String startLonLat, String endAddress, Integer uid, Integer language) throws Exception;
/**
@@ -41,7 +41,7 @@
* @return
* @throws Exception
*/
- ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endAddress) throws Exception;
+ ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endAddress, Integer language) throws Exception;
/**
@@ -65,7 +65,7 @@
* @throws Exception
*/
ResultUtil smallLogistics(Integer type, Integer cargoType, Integer cargoNumber, String remark, String placementLon, String placementLat, String startLon, String startLat, String startAddress,
- String recipient, String recipientPhone, String endAddress, Integer urgent, Double tipMoney, Date travelTime, Integer orderSource, Integer uid) throws Exception;
+ String recipient, String recipientPhone, String endAddress, Integer urgent, Double tipMoney, Date travelTime, Integer orderSource, Integer uid, Integer language) throws Exception;
@@ -77,7 +77,7 @@
* @return
* @throws Exception
*/
- ResultUtil payLogisticsOrder(Integer payType, Integer orderId, Integer type)throws Exception;
+ ResultUtil payLogisticsOrder(Integer payType, String accountNumber, Integer orderId, Integer type, Integer language)throws Exception;
/**
@@ -87,7 +87,7 @@
* @return
* @throws Exception
*/
- ResultUtil payLogisticsOrder_(Integer payType, Integer orderId, Integer type)throws Exception;
+ ResultUtil payLogisticsOrder_(Integer payType, String accountNumber, Integer orderId, Integer type, Integer language)throws Exception;
@@ -98,7 +98,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, Integer language) throws Exception;
@@ -168,7 +168,7 @@
* @param uid
* @throws Exception
*/
- ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception;
+ ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception;
/**
--
Gitblit v1.7.1