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/smallLogistics/server/IOrderLogisticsService.java |   66 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index b7c569d..0f77fdc 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -17,7 +17,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+    Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception;
 
 
 
@@ -28,7 +28,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception;
+    ResultUtil grabOrder(Integer orderId, Integer uid, Integer language) throws Exception;
 
 
 
@@ -38,7 +38,7 @@
      * @return
      * @throws Exception
      */
-    Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+    Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
 
 
 
@@ -49,7 +49,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
+    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String pickUpCode, Integer language, Integer uid) throws Exception;
 
 
     /**
@@ -59,7 +59,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode) throws Exception;
+    ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode, Integer language) throws Exception;
 
 
     /**
@@ -69,7 +69,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil makeUpTheDifference(Integer orderId, Double difference) throws Exception;
+    ResultUtil makeUpTheDifference(Integer orderId, Double difference, Integer language) throws Exception;
 
 
 
@@ -79,7 +79,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception;
+    List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception;
 
 
 
@@ -90,7 +90,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+    List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception;
 
 
     /**
@@ -100,7 +100,7 @@
      * @return
      * @throws Exception
      */
-    ResultUtil grabOrder_(Integer orderId, Integer uid) throws Exception;
+    ResultUtil grabOrder_(Integer orderId, Integer uid, Integer language) throws Exception;
 
 
 
@@ -119,5 +119,51 @@
      * @param orderId
      * @throws Exception
      */
-    void sendVerificationCode(Integer orderId) throws Exception;
+    void sendVerificationCode(Integer orderId, Integer language) throws Exception;
+
+
+    /**
+     * 支付完成后的订单处理
+     * @param id            订单=id
+     * @param order_id      工行支付单号
+     * @throws Exception
+     */
+    void payOrderLogisticsCallback(Integer id, String order_id, Integer language) throws Exception;
+    
+    
+    /**
+     * 处理乘客修改终点
+     * @param orderId
+     * @param status
+     */
+    void updateEndAddress(Integer orderId, Integer status);
+    
+    
+    /**
+     * 获取费用明细
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    Map<String, Object> queryMoneyInfo(Integer orderId) throws Exception;
+    
+    /**
+     * 确认费用操作
+     * @param orderId
+     * @param type
+     * @param parkingFee
+     * @param crossingFee
+     * @return
+     * @throws Exception
+     */
+    ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee, Integer uid) throws Exception;
+    
+    
+    /**
+     * 计算已服务的实时里程
+     * @param orderId
+     * @param lon
+     * @param lat
+     */
+    boolean calculateMileage(Integer orderId, String lon, String lat) throws Exception;
 }

--
Gitblit v1.7.1