From ef04ce57881e6a338b10d596c5eb76b2220598bf Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 31 八月 2023 11:16:49 +0800 Subject: [PATCH] 更新版本 --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 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 77e1a5a..6d16d14 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 @@ -10,6 +10,7 @@ import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper; import java.util.List; +import java.util.Map; /** * 订单 @@ -25,7 +26,7 @@ * @return * @throws Exception */ - Long queryDriverServerOrder(Integer uid) throws Exception; + Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception; /** @@ -37,7 +38,7 @@ */ ResultUtil driverAddOrder(Integer uid, AddOrderWarpper addOrderWarpper) throws Exception; - + Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city, Integer branchOfficeId) throws Exception; /** * 获取大厅订单列表 * @param uid @@ -72,6 +73,14 @@ /** + * 推送服务中的数据 + * @param orderId + */ + void pushOrderInfo(Long orderId); + + + + /** * 获取订单详情 * @param orderId * @return @@ -100,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; /** @@ -152,7 +161,7 @@ * @return * @throws Exception */ - ResultUtil setOrderStatus(Integer uid, Long orderId, Integer state) throws Exception; + ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception; /** @@ -196,4 +205,18 @@ * @throws Exception */ List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception; + + + /** + * 主动完成线下收款 + */ + void completeCollection(); + + + + 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