From aa241a47c90ed776062adf0b8daccf288a21836f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:55:54 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
index 79bd20c..d4be5c0 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
@@ -38,7 +38,7 @@
*/
ResultUtil driverAddOrder(Integer uid, AddOrderWarpper addOrderWarpper) throws Exception;
-
+ Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city);
/**
* 获取大厅订单列表
* @param uid
@@ -73,6 +73,14 @@
/**
+ * 推送服务中的数据
+ * @param orderId
+ */
+ void pushOrderInfo(Long orderId);
+
+
+
+ /**
* 获取订单详情
* @param orderId
* @return
@@ -101,7 +109,7 @@
* @return
* @throws Exception
*/
- ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception;
+ ResultUtil transferOrder(Integer uid, Long orderId, String cause,String phone) throws Exception;
/**
@@ -205,5 +213,10 @@
void completeCollection();
- ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType);
+
+
+
+ void saveRevenue(Order order) throws Exception;
}
--
Gitblit v1.7.1