From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java b/server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java
index 7fbe5b2..77ec3a9 100644
--- a/server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java
@@ -12,10 +12,15 @@
import com.doumee.dao.dto.DriverGrabOrderDTO;
import com.doumee.dao.dto.DriverLoginRequest;
import com.doumee.dao.dto.DriverDeliverDTO;
+import com.doumee.dao.dto.DriverOrderPageDTO;
import com.doumee.dao.dto.DriverPickupDTO;
import com.doumee.dao.dto.DriverRegisterRequest;
import com.doumee.dao.dto.DriverVerifyRequest;
import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.dto.CancelOrderDTO;
+import com.doumee.dao.dto.ChangePasswordDTO;
+import com.doumee.dao.vo.DriverActiveOrderCountVO;
+import com.doumee.dao.vo.DriverCancelLimitVO;
import com.doumee.dao.vo.DriverCenterVO;
import com.doumee.dao.vo.DriverGrabOrderVO;
import com.doumee.dao.vo.DriverOrderDetailVO;
@@ -30,14 +35,13 @@
import javax.validation.Valid;
import java.util.List;
-import java.util.Map;
/**
* 鍙告満楠岃瘉鐮佺櫥褰曟帴鍙�
* @author rk
* @date 2026/04/08
*/
-@Api(tags = "鍙告満楠岃瘉鐮佺櫥褰�")
+@Api(tags = "鍙告満涓氬姟鎺ュ彛")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/driverInfo")
@@ -158,7 +162,7 @@
@LoginDriverRequired
@Trace
@ApiOperation(value = "鍙告満鎶㈠崟", notes = "瀵瑰凡瀵勫瓨(status=2)鐨勫紓鍦板瘎瀛樿鍗曞彂璧锋姠鍗�")
- @PostMapping("/grabOrder")
+ @GetMapping("/grabOrder")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "orderId", value = "璁㈠崟涓婚敭", required = true)
@@ -198,9 +202,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse cancelOrder(@RequestParam Integer orderId,
- @RequestParam(required = false) String reason) {
- driverInfoService.cancelOrder(this.getDriverId(), orderId, reason);
+ public ApiResponse cancelOrder(@RequestBody @Valid CancelOrderDTO dto) {
+ driverInfoService.cancelOrder(this.getDriverId(), dto.getOrderId(), dto.getCancelReason());
return ApiResponse.success("鍙栨秷鎴愬姛");
}
@@ -235,9 +238,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse changePassword(@RequestParam String newPassword) {
+ public ApiResponse changePassword(@RequestBody @Valid ChangePasswordDTO dto) {
String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
- driverInfoService.changePassword(this.getDriverId(), newPassword, token);
+ driverInfoService.changePassword(this.getDriverId(), dto.getOldPassword(), dto.getNewPassword(), token);
return ApiResponse.success("瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍");
}
@@ -248,8 +251,39 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<Map<String, Integer>> activeOrderCount() {
+ public ApiResponse<DriverActiveOrderCountVO> activeOrderCount() {
return ApiResponse.success("鎿嶄綔鎴愬姛", driverInfoService.getActiveOrderCount(this.getDriverId()));
}
+ @LoginDriverRequired
+ @Trace
+ @ApiOperation(value = "鍙告満璁㈠崟鍒嗛〉", notes = "鏌ヨ鍙告満鐨勫叏閮�/寰呭彇浠�/閰嶉�佷腑/宸插畬鎴愯鍗�")
+ @PostMapping("/orderPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<DriverGrabOrderVO>> orderPage(@RequestBody PageWrap<DriverOrderPageDTO> pageWrap) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", driverInfoService.driverOrderPage(this.getDriverId(), pageWrap));
+ }
+
+ @LoginDriverRequired
+ @Trace
+ @ApiOperation(value = "浠婃棩鍙彇娑堟鏁�", notes = "杩斿洖鍙告満浠婃棩鍙栨秷娆℃暟涓婇檺銆佸凡鍙栨秷娆℃暟銆佸墿浣欏彲鍙栨秷娆℃暟")
+ @GetMapping("/cancelLimit")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<DriverCancelLimitVO> cancelLimit() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", driverInfoService.getTodayCancelLimit(this.getDriverId()));
+ }
+
+ @ApiOperation("鏍￠獙鍙告満token鏄惁鏈夋晥")
+ @GetMapping("/checkToken")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鍙告満token", required = true)
+ })
+ public ApiResponse<Boolean> checkToken(@RequestParam String token) {
+ return ApiResponse.success(driverInfoService.checkDriverToken(token));
+ }
+
}
--
Gitblit v1.9.3