From 1c930a8b1ab9abdb851a486b2da55bcda34cd082 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 四月 2026 09:20:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/DriverInfoService.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/DriverInfoService.java b/server/services/src/main/java/com/doumee/service/business/DriverInfoService.java
index 24182d3..c274cc4 100644
--- a/server/services/src/main/java/com/doumee/service/business/DriverInfoService.java
+++ b/server/services/src/main/java/com/doumee/service/business/DriverInfoService.java
@@ -6,6 +6,7 @@
import com.doumee.dao.dto.DriverGrabOrderDTO;
import com.doumee.dao.business.model.DriverInfo;
import com.doumee.dao.dto.DriverLoginRequest;
+import com.doumee.dao.dto.DriverPickupDTO;
import com.doumee.dao.dto.DriverRegisterRequest;
import com.doumee.dao.dto.DriverVerifyRequest;
import com.doumee.dao.vo.AccountResponse;
@@ -215,4 +216,29 @@
*/
com.doumee.dao.vo.DriverOrderDetailVO driverOrderDetail(Integer driverId, Integer orderId);
+ /**
+ * 鍙告満鍙栨秷璁㈠崟锛堝凡鎺ュ崟status=2鏃跺彇娑堬紝閲婃斁鍥炴姠鍗曞ぇ鍘咃級
+ *
+ * @param driverId 鍙告満涓婚敭
+ * @param orderId 璁㈠崟涓婚敭
+ * @param reason 鍙栨秷鍘熷洜
+ */
+ void cancelOrder(Integer driverId, Integer orderId, String reason);
+
+ /**
+ * 鍙告満鎶㈠崟锛岃鍗曠姸鎬佷粠宸插瘎瀛�(2)鍙樹负宸叉帴鍗�(3)
+ *
+ * @param driverId 鍙告満涓婚敭
+ * @param orderId 璁㈠崟涓婚敭
+ */
+ void grabOrder(Integer driverId, Integer orderId);
+
+ /**
+ * 鍙告満瀹屾垚鍙栦欢锛岃鍗曠姸鎬佷粠宸叉帴鍗�(3)鍙樹负娲鹃�佷腑(4)
+ *
+ * @param driverId 鍙告満涓婚敭
+ * @param dto 鍙栦欢璇锋眰鍙傛暟
+ */
+ void confirmPickup(Integer driverId, DriverPickupDTO dto);
+
}
--
Gitblit v1.9.3