From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 439ca99..d1b1bc0 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;
/**
@@ -43,7 +44,7 @@
* @param id
* @throws Exception
*/
- ResultUtil pushOrderPrivateCar(Integer id) throws Exception;
+ ResultUtil pushOrderPrivateCar(Integer uid, Integer id, Integer language) throws Exception;
@@ -65,7 +66,7 @@
* @param uid
* @throws Exception
*/
- ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception;
+ ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, 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, String accountNumber, Integer cancleId, Integer type, Integer language) throws Exception;
String getOrderNum() 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, String accountNumber, Integer orderId, Integer couponId, 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;
@@ -161,7 +162,7 @@
* @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 type, Integer language) throws Exception;
--
Gitblit v1.7.1