From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 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 675c875..5802869 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 endLonLat, 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 endLonLat, 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 endLonLat, 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, Integer bankCardId, 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, Integer bankCardId, Integer orderId, Integer type, Integer language)throws Exception;
 
 
 
@@ -95,10 +95,9 @@
      * 支付完成后的订单处理
      * @param id            订单=id
      * @param order_id      工行支付单号
-     * @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 language) throws Exception;
 
 
 
@@ -106,10 +105,9 @@
      * 差价支付完成后的回调处理
      * @param id            订单=id
      * @param order_id      工行支付单号
-     * @param type          1=微信，2=支付宝
      * @throws Exception
      */
-    void payOrderLogisticsSpreadCallback(Integer id, String order_id, Integer type) throws Exception;
+    void payOrderLogisticsSpreadCallback(Integer id, String order_id, Integer language) throws Exception;
 
 
 
@@ -131,7 +129,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception;
 
 
 
@@ -140,7 +138,7 @@
      * @param uid
      * @return
      */
-    List<Map<String, Object>> queryMyTravelRecord(Integer uid);
+    List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid);
 
 
 
@@ -155,7 +153,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryInvoiceOrder(Integer type, Date startTime, Date endTime, Double startMoney,
+    List<Map<String, Object>> queryInvoiceOrder(Integer language, Integer type, Date startTime, Date endTime, Double startMoney,
                                                 Double endMoney, Integer uid, Integer orderType) throws Exception;
 
 
@@ -203,7 +201,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+    Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
 
 
     /**
@@ -212,5 +210,5 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
 }

--
Gitblit v1.7.1