From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 cac8617..f52d8b0 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
@@ -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, Integer language) 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,7 @@
* @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) throws Exception;
/**
@@ -153,7 +153,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;
/**
--
Gitblit v1.7.1