From 5430ccbd452a660bb55ba58d7d5e13ac8c6e7170 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 五月 2023 15:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 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 a205622..9cf7a88 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,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.HallOrderList;
+import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import java.util.List;
+import java.util.Map;
/**
* 订单
@@ -21,7 +26,7 @@
* @return
* @throws Exception
*/
- Long queryDriverServerOrder(Integer uid) throws Exception;
+ Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception;
/**
@@ -148,5 +153,54 @@
* @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;
+
+
+ /**
+ * 获取司机的订单列表
+ * @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();
}
--
Gitblit v1.7.1