From 0bc5e07b24c08c41f14b066597d693026ec5fb89 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 24 六月 2023 09:28:40 +0800 Subject: [PATCH] 修改bug --- driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 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 b6d90b1..201a261 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; /** @@ -69,6 +70,14 @@ * @throws Exception */ ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception; + + + /** + * 推送服务中的数据 + * @param orderId + */ + void pushOrderInfo(Long orderId); + /** @@ -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; /** @@ -178,4 +187,35 @@ */ 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