From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index 45fa5e5..3d4afd8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -35,7 +35,8 @@
      * @throws Exception
      */
     ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat,
-                                                String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid) throws Exception;
+                                                String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String name,
+                                                String phone, Integer orderSource, Integer driverId, Integer type, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -53,7 +54,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil<BaseWarpper> queryCancleAmount(Integer id) throws Exception;
+    ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception;
 
 
 
@@ -65,7 +66,7 @@
      * @param uid
      * @throws Exception
      */
-    ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception;
+    ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception;
 
 
     /**
@@ -74,7 +75,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer cancleId, Integer type) throws Exception;
+    ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer bankCardId, Integer cancleId, Integer type, Integer language) throws Exception;
 
 
     String getOrderNum() throws Exception;
@@ -103,7 +104,7 @@
      * @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;
 
 
 
@@ -115,7 +116,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type)throws Exception;
+    ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer redDeduction, Integer type, Integer language)throws Exception;
 
 
 
@@ -138,7 +139,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil shareRedEnvelope(Integer orderId) throws Exception;
+    ResultUtil shareRedEnvelope(Integer orderId, Integer language) throws Exception;
 
 
 
@@ -147,10 +148,9 @@
      * 取消订单支付后的处理
      * @param id            订单=id
      * @param order_id      工行支付单号
-     * @param type          1=微信，2=支付宝
      * @throws Exception
      */
-    void payCancelOrderPrivateCar(Integer id, String order_id, Integer type) throws Exception;
+    void payCancelOrderPrivateCar(Integer id, String order_id, Integer language) throws Exception;
 
 
 
@@ -158,10 +158,9 @@
      * 支付完成后的订单处理
      * @param id            订单=id
      * @param order_id      工行支付单号
-     * @param type          1=微信，2=支付宝
      * @throws Exception
      */
-    void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception;
+    void payOrderPrivateCarCallback(Integer id, String order_id, Integer language) throws Exception;
 
 
 
@@ -185,7 +184,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
 
 
 
@@ -200,7 +199,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) throws Exception;
 
 
@@ -210,7 +209,7 @@
      * @param orderId
      * @return
      */
-    Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+    Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
 
 
 
@@ -220,7 +219,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryMyTravelRecord(Integer uid) throws Exception;
+    List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception;
 
 
 
@@ -248,5 +247,15 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryRedEnvelope(Integer uid) throws Exception;
+    List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception;
+    
+    
+    /**
+     * 修改目的地
+     * @param orderId
+     * @param endLon
+     * @param endLat
+     * @param endAddress
+     */
+    void updateEndAddress(Integer orderId, String endLon, String endLat, String endAddress);
 }

--
Gitblit v1.7.1