From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java |   86 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 2 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 65888c8..14109cb 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
@@ -1,11 +1,13 @@
 package com.supersavedriving.driver.modular.system.service;
 
 import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.warpper.*;
 import com.supersavedriving.driver.modular.system.model.Order;
 import com.supersavedriving.driver.modular.system.util.ResultUtil;
+import com.supersavedriving.driver.modular.system.warpper.*;
 import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
-import com.supersavedriving.driver.modular.system.warpper.BaseWarpper;
 import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
+import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
 
 import java.util.List;
 
@@ -69,6 +71,86 @@
     ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception;
 
 
+    /**
+     * 获取订单详情
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception;
 
-    queryOrderInfo(Long orderId) throws Exception;
+
+
+
+
+    /**
+     * 司机走订单流程
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    ResultUtil driverProcessOperations(Integer uid, ProcessOperationsWarpper processOperationsWarpper) throws Exception;
+
+
+    /**
+     * 司机转单操作
+     * @param uid
+     * @param orderId
+     * @param cause
+     * @return
+     * @throws Exception
+     */
+    ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception;
+
+
+    /**
+     * 修改终点地址
+     * @param uid
+     * @param orderEndAddressWarpper
+     * @return
+     * @throws Exception
+     */
+    ResultUtil setOrderEndAddress(Integer uid, OrderEndAddressWarpper orderEndAddressWarpper) throws Exception;
+
+
+    /**
+     * 取消转单操作
+     * @param uid
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    ResultUtil cancelTransferOrder(Integer uid, Long orderId) throws Exception;
+
+
+    /**
+     * 司机取消订单
+     * @param uid
+     * @param orderId
+     * @param cause
+     * @return
+     * @throws Exception
+     */
+    ResultUtil driverCancelOrder(Integer uid, Long orderId, String cause) throws Exception;
+
+
+    /**
+     * 获取订单费用明细
+     * @param uid
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
+
+
+    /**
+     * 修改订单状态
+     * @param uid
+     * @param orderId
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    ResultUtil setOrderStatus(Integer uid, Long orderId, Integer state) throws Exception;
 }

--
Gitblit v1.7.1