From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
index 19bc56a..fbc7bac 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
@@ -16,7 +16,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
+    List<Map<String, Object>> queryOrderList(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -25,7 +25,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid) throws Exception;
+    List<Map<String, Object>> queryOrderList1(Integer state, Integer type, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -37,7 +37,7 @@
      * @return
      * @throws Exception
      */
-    List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
+    List<OrderListWarpper> queryMyAllOrder(Integer state, Integer pageNum, Integer size, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -47,7 +47,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat) throws Exception;
+    Map<String, Object> queryPushOrder(Integer orderId, Integer orderType, String lon, String lat, Integer language) throws Exception;
 
 
     /**
@@ -58,7 +58,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil grabOrder(Integer orderId, Integer orderType, Integer uid) throws Exception;
+    ResultUtil grabOrder(Integer orderId, Integer orderType, Integer uid, Integer language) throws Exception;
 
 
 
@@ -80,7 +80,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryOrderInfo(Integer orderId, Integer orderType) throws Exception;
+    Map<String, Object> queryOrderInfo(Integer language, Integer orderId, Integer orderType) throws Exception;
 
 
     /**
@@ -101,7 +101,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,String phone) throws Exception;
+    ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,String phone, String pickUpCode, Integer language) throws Exception;
 
 
     /**
@@ -115,7 +115,8 @@
      * @return
      * @throws Exception
      */
-    ResultUtil confirmFees(Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception;
+    ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type,
+                           Double travelFee, Double parkingFee, Double crossingFee, Integer uid) throws Exception;
 
 
     /**
@@ -153,7 +154,7 @@
      * @param orderType
      * @return
      */
-    Map<String, Object> queryToBePaidPage(Integer orderId, Integer orderType) throws Exception;
+    Map<String, Object> queryToBePaidPage(Integer language, Integer orderId, Integer orderType) throws Exception;
 
 
     /**
@@ -219,7 +220,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil completeOrder(Integer orderId, Integer orderType) throws Exception;
+    ResultUtil completeOrder(Integer orderId, Integer orderType, Integer language) throws Exception;
 
 
     /**
@@ -230,4 +231,26 @@
      * @throws Exception
      */
     Map<String, Object> queryMoneyInfo(Integer orderId, Integer orderType) throws Exception;
+
+
+    /**
+     * 司机支付订单
+     * @param uid
+     * @param orderId
+     * @param orderType
+     * @return
+     * @throws Exception
+     */
+    ResultUtil payOrder(Integer uid, Integer orderId, Integer orderType, Integer payType, Integer bankCardId, Integer language) throws Exception;
+    
+    
+    /**
+     * 使用google获取司机的最新位置信息
+     */
+    void getDriverNowPosition();
+    
+    /**
+     * 结束google订单状态
+     */
+    void overGoogleOrder();
 }

--
Gitblit v1.7.1