From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/service/business/DriverInfoService.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 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 769f3d1..8edff6d 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,6 +12,8 @@
 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;
 
@@ -159,6 +162,15 @@
     DriverInfo getDetail(Integer id);
 
     /**
+     * 绠＄悊绔慨鏀瑰徃鏈烘敞鍐屼俊鎭紙鍚檮浠讹級
+     *
+     * @param id      鍙告満涓婚敭
+     * @param request 淇敼璇锋眰
+     * @return 鏇存柊鍚庣殑鍙告満璇︽儏锛堝惈闄勪欢锛�
+     */
+    DriverInfo updateDriverInfo(DriverVerifyRequest request);
+
+    /**
      * 淇敼鍙告満鐘舵�侊紙鍚敤/绂佺敤锛�
      *
      * @param dto 淇敼鐘舵�佽姹�
@@ -189,6 +201,11 @@
      * @return DriverCenterVO
      */
     com.doumee.dao.vo.DriverCenterVO getDriverCenterInfo(Integer memberId);
+
+    /**
+     * 鍙告満绱缁熻锛堢疮璁′剑閲戙�佸緟缁撶畻浣ｉ噾銆佽鍗曟�绘暟銆侀挶鍖呬綑棰濓級
+     */
+    com.doumee.dao.vo.DriverStatsVO getDriverStats(Integer memberId);
 
     /**
      * 鍙告満鎶㈠崟澶у巺 - 鍒嗛〉鏌ヨ鍙姠璁㈠崟
@@ -250,4 +267,51 @@
      */
     void confirmDeliver(Integer driverId, DriverDeliverDTO dto);
 
+    /**
+     * 鍙告満淇敼瀵嗙爜
+     *
+     * @param driverId    鍙告満涓婚敭
+     * @param newPassword 鏂板瘑鐮�
+     * @param token       褰撳墠token锛堜慨鏀规垚鍔熷悗娓呴櫎锛�
+     */
+    void changePassword(Integer driverId, String oldPassword, String newPassword, String token);
+
+    /**
+     * 鑾峰彇鍙告満杩涜涓鍗曟暟閲�
+     *
+     * @param driverId 鍙告満涓婚敭
+     * @return 杩涜涓鍗曟暟閲�
+     */
+    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);
+
+    /**
+     * 娉ㄥ唽鏋佸厜鎺ㄩ�佸埆鍚�
+     */
+    void registerJpushAlias(Integer driverId, String jpushAlias);
+
 }

--
Gitblit v1.9.3