Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

 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));
    }

}