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/web/src/main/java/com/doumee/api/web/DriverInfoApi.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 6f03647..b2ffbf2 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
@@ -17,6 +17,7 @@
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.vo.DriverActiveOrderCountVO;
import com.doumee.dao.vo.DriverCancelLimitVO;
import com.doumee.dao.vo.DriverCenterVO;
@@ -200,9 +201,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("鍙栨秷鎴愬姛");
}
@@ -237,9 +237,10 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse changePassword(@RequestParam String newPassword) {
+ public ApiResponse changePassword(@RequestParam String oldPassword,
+ @RequestParam String newPassword) {
String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
- driverInfoService.changePassword(this.getDriverId(), newPassword, token);
+ driverInfoService.changePassword(this.getDriverId(), oldPassword, newPassword, token);
return ApiResponse.success("瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍");
}
@@ -276,4 +277,13 @@
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