From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/DriverInfoService.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 9dc237e..74fccd3 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
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.dto.DriverActiveOrderDTO;
import com.doumee.dao.dto.DriverGrabOrderDTO;
+import com.doumee.dao.dto.DriverOrderPageDTO;
import com.doumee.dao.business.model.DriverInfo;
import com.doumee.dao.dto.DriverLoginRequest;
import com.doumee.dao.dto.DriverDeliverDTO;
@@ -11,9 +12,10 @@
import com.doumee.dao.dto.DriverRegisterRequest;
import com.doumee.dao.dto.DriverVerifyRequest;
import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.DriverActiveOrderCountVO;
+import com.doumee.dao.vo.DriverGrabOrderVO;
import java.util.List;
-import java.util.Map;
/**
* 鍙告満娉ㄥ唽淇℃伅Service瀹氫箟
@@ -263,14 +265,39 @@
* @param newPassword 鏂板瘑鐮�
* @param token 褰撳墠token锛堜慨鏀规垚鍔熷悗娓呴櫎锛�
*/
- void changePassword(Integer driverId, String newPassword, String token);
+ void changePassword(Integer driverId, String oldPassword, String newPassword, String token);
/**
* 鑾峰彇鍙告満杩涜涓鍗曟暟閲�
*
* @param driverId 鍙告満涓婚敭
- * @return [宸叉姠鍗曟暟閲�, 娲鹃�佷腑鏁伴噺]
+ * @return 杩涜涓鍗曟暟閲�
*/
- Map<String, Integer> getActiveOrderCount(Integer driverId);
+ DriverActiveOrderCountVO getActiveOrderCount(Integer driverId);
+
+ /**
+ * 鍙告満璁㈠崟鍒嗛〉鏌ヨ
+ *
+ * @param driverId 鍙告満涓婚敭
+ * @param pageWrap 鍒嗛〉鍙傛暟锛坢odel.status: null=鍏ㄩ儴, 3=寰呭彇浠�, 4=閰嶉�佷腑, 7=宸插畬鎴愶級
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageData<DriverGrabOrderVO> driverOrderPage(Integer driverId, PageWrap<DriverOrderPageDTO> pageWrap);
+
+ /**
+ * 鏌ヨ鍙告満浠婃棩鍙彇娑堟鏁�
+ *
+ * @param driverId 鍙告満涓婚敭
+ * @return DriverCancelLimitVO
+ */
+ com.doumee.dao.vo.DriverCancelLimitVO getTodayCancelLimit(Integer driverId);
+
+ /**
+ * 鏍￠獙鍙告満token鏄惁鏈夋晥
+ *
+ * @param token 鍙告満token
+ * @return true=鏈夋晥 false=鏃犳晥
+ */
+ boolean checkDriverToken(String token);
}
--
Gitblit v1.9.3