From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 16 八月 2023 09:28:15 +0800 Subject: [PATCH] update --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 152 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 65888c8..6b4be09 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,13 +1,16 @@ 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; +import java.util.Map; /** * 订单 @@ -23,7 +26,7 @@ * @return * @throws Exception */ - Long queryDriverServerOrder(Integer uid) throws Exception; + Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception; /** @@ -35,7 +38,7 @@ */ ResultUtil driverAddOrder(Integer uid, AddOrderWarpper addOrderWarpper) throws Exception; - + Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city) throws Exception; /** * 获取大厅订单列表 * @param uid @@ -69,6 +72,151 @@ ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception; + /** + * 推送服务中的数据 + * @param orderId + */ + void pushOrderInfo(Long orderId); - queryOrderInfo(Long orderId) throws Exception; + + + /** + * 获取订单详情 + * @param orderId + * @return + * @throws Exception + */ + OrderInfoWarpper queryOrderInfo(Integer uid, 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,String phone) 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 payType, Integer state) throws Exception; + + + /** + * 获取司机的订单列表 + * @param driverId + * @param state + * @param pageNum + * @param pageSize + * @return + * @throws Exception + */ + List<DriverOrderListWarpper> queryDriverOrderList(Integer driverId, Integer state, Integer pageNum, Integer pageSize) throws Exception; + + + /** + * 司机邀请列表 + * @param driverId + * @param time + * @param pageNum + * @param pageSize + * @return + * @throws Exception + */ + List<InviteListWarpper> queryInviteList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception; + + + /** + * 获取业绩汇总数据 + * @param driverId + * @return + * @throws Exception + */ + PerformanceSummaryWarpper queryPerformanceSummary(Integer driverId, Integer type, String time, Integer dayType) throws Exception; + + + /** + * 获取我的业绩 + * @param driverId + * @param time + * @return + * @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