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/web/src/main/java/com/doumee/api/web/DriverInfoApi.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 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..6ce7b4e 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,11 +17,14 @@
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;
+import com.doumee.core.utils.jpush.JPushUtil;
import com.doumee.service.business.DriverInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -200,9 +203,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 +239,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("瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍");
}
@@ -276,4 +278,35 @@
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));
+ }
+
+ @LoginDriverRequired
+ @ApiOperation("娉ㄥ唽鏋佸厜鎺ㄩ�佸埆鍚�")
+ @PostMapping("/registerJpushAlias")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鍙告満token鍊�", required = true)
+ })
+ public ApiResponse registerJpushAlias(@RequestParam String jpushAlias) {
+ driverInfoService.registerJpushAlias(this.getDriverId(), jpushAlias);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鏋佸厜鎺ㄩ�佹祴璇�")
+ @GetMapping("/testJpush")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "閫氱煡鏍囬", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "content", value = "閫氱煡鍐呭", required = true)
+ })
+ public ApiResponse<Boolean> testJpush(@RequestParam String telephone, @RequestParam String title, @RequestParam String content) {
+ boolean result = JPushUtil.sendByAlias(org.springframework.util.DigestUtils.md5DigestAsHex(telephone.getBytes()), title, content, null);
+ return ApiResponse.success("鎺ㄩ��" + (result ? "鎴愬姛" : "澶辫触"), result);
+ }
+
}
--
Gitblit v1.9.3