diff --git a/src/main/java/com/sczx/order/controller/ClientOrderController.java b/src/main/java/com/sczx/order/controller/ClientOrderController.java index 5aad729..be5038f 100644 --- a/src/main/java/com/sczx/order/controller/ClientOrderController.java +++ b/src/main/java/com/sczx/order/controller/ClientOrderController.java @@ -46,14 +46,14 @@ public class ClientOrderController { @ApiOperation(value = "续租车") @PostMapping("/reRentalCarOrder") - public Result reRentalCarOrder(@Valid @RequestBody RentCarOrderReq rentCarOrderReq){ + public Result reRentalCarOrder(@Valid @RequestBody ReRentCarReq rentCarOrderReq){ return Result.ok(orderService.reRentalCarOrder(rentCarOrderReq)); } @ApiOperation(value = "逾期处理") @PostMapping("/overDueRentalCarOrder") - public Result overDueRentalCarOrder(@Valid @RequestBody RentCarOrderReq rentCarOrderReq){ - return Result.ok(orderService.reRentalCarOrder(rentCarOrderReq)); + public Result overDueRentalCarOrder(@Valid @RequestBody ReRentCarReq rentCarOrderReq){ + return Result.ok(orderService.overDueRentalCarOrder(rentCarOrderReq)); } @ApiOperation(value = "申请还车") diff --git a/src/main/java/com/sczx/order/dto/ReRentCarReq.java b/src/main/java/com/sczx/order/dto/ReRentCarReq.java new file mode 100644 index 0000000..5e92ba4 --- /dev/null +++ b/src/main/java/com/sczx/order/dto/ReRentCarReq.java @@ -0,0 +1,28 @@ +package com.sczx.order.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author: 张黎 + * @Date: 2025/07/25/16:58 + * @Description: + */ +@Data +@ApiModel(value = "续租或逾期租车请求参数") +public class ReRentCarReq { + + @NotNull(message = "订单编号不能为空") + @ApiModelProperty(value = "订单编号,租车不需要传,续租和逾期处理需要传") + private String orderNo; + + @ApiModelProperty(value = "客户id") + private Long customerId; + + @ApiModelProperty("是否开通代扣") + private Boolean isAutoDeduct = false; +} diff --git a/src/main/java/com/sczx/order/service/OrderService.java b/src/main/java/com/sczx/order/service/OrderService.java index e78aa47..4871136 100644 --- a/src/main/java/com/sczx/order/service/OrderService.java +++ b/src/main/java/com/sczx/order/service/OrderService.java @@ -21,14 +21,14 @@ public interface OrderService { * @param rentCarOrderReq * @return */ - RentCarOrderResultDTO reRentalCarOrder(RentCarOrderReq rentCarOrderReq); + RentCarOrderResultDTO reRentalCarOrder(ReRentCarReq rentCarOrderReq); /** * 逾期处理 * @param rentCarOrderReq * @return */ - RentCarOrderResultDTO overDueRentalCarOrder(RentCarOrderReq rentCarOrderReq); + RentCarOrderResultDTO overDueRentalCarOrder(ReRentCarReq rentCarOrderReq); /** diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 2236fe9..970fd05 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -200,7 +200,7 @@ public class OrderServiceImpl implements OrderService { } @Override - public RentCarOrderResultDTO reRentalCarOrder(RentCarOrderReq rentCarOrderReq) { + public RentCarOrderResultDTO reRentalCarOrder(ReRentCarReq rentCarOrderReq) { SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId(); @@ -284,7 +284,7 @@ public class OrderServiceImpl implements OrderService { } @Override - public RentCarOrderResultDTO overDueRentalCarOrder(RentCarOrderReq rentCarOrderReq) { + public RentCarOrderResultDTO overDueRentalCarOrder(ReRentCarReq rentCarOrderReq) { SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId();