增加续租请求模型
This commit is contained in:
@ -46,14 +46,14 @@ public class ClientOrderController {
|
|||||||
|
|
||||||
@ApiOperation(value = "续租车")
|
@ApiOperation(value = "续租车")
|
||||||
@PostMapping("/reRentalCarOrder")
|
@PostMapping("/reRentalCarOrder")
|
||||||
public Result<RentCarOrderResultDTO> reRentalCarOrder(@Valid @RequestBody RentCarOrderReq rentCarOrderReq){
|
public Result<RentCarOrderResultDTO> reRentalCarOrder(@Valid @RequestBody ReRentCarReq rentCarOrderReq){
|
||||||
return Result.ok(orderService.reRentalCarOrder(rentCarOrderReq));
|
return Result.ok(orderService.reRentalCarOrder(rentCarOrderReq));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "逾期处理")
|
@ApiOperation(value = "逾期处理")
|
||||||
@PostMapping("/overDueRentalCarOrder")
|
@PostMapping("/overDueRentalCarOrder")
|
||||||
public Result<RentCarOrderResultDTO> overDueRentalCarOrder(@Valid @RequestBody RentCarOrderReq rentCarOrderReq){
|
public Result<RentCarOrderResultDTO> overDueRentalCarOrder(@Valid @RequestBody ReRentCarReq rentCarOrderReq){
|
||||||
return Result.ok(orderService.reRentalCarOrder(rentCarOrderReq));
|
return Result.ok(orderService.overDueRentalCarOrder(rentCarOrderReq));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "申请还车")
|
@ApiOperation(value = "申请还车")
|
||||||
|
|||||||
28
src/main/java/com/sczx/order/dto/ReRentCarReq.java
Normal file
28
src/main/java/com/sczx/order/dto/ReRentCarReq.java
Normal file
@ -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;
|
||||||
|
}
|
||||||
@ -21,14 +21,14 @@ public interface OrderService {
|
|||||||
* @param rentCarOrderReq
|
* @param rentCarOrderReq
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
RentCarOrderResultDTO reRentalCarOrder(RentCarOrderReq rentCarOrderReq);
|
RentCarOrderResultDTO reRentalCarOrder(ReRentCarReq rentCarOrderReq);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 逾期处理
|
* 逾期处理
|
||||||
* @param rentCarOrderReq
|
* @param rentCarOrderReq
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
RentCarOrderResultDTO overDueRentalCarOrder(RentCarOrderReq rentCarOrderReq);
|
RentCarOrderResultDTO overDueRentalCarOrder(ReRentCarReq rentCarOrderReq);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -200,7 +200,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RentCarOrderResultDTO reRentalCarOrder(RentCarOrderReq rentCarOrderReq) {
|
public RentCarOrderResultDTO reRentalCarOrder(ReRentCarReq rentCarOrderReq) {
|
||||||
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
|
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
|
||||||
|
|
||||||
String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId();
|
String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId();
|
||||||
@ -284,7 +284,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RentCarOrderResultDTO overDueRentalCarOrder(RentCarOrderReq rentCarOrderReq) {
|
public RentCarOrderResultDTO overDueRentalCarOrder(ReRentCarReq rentCarOrderReq) {
|
||||||
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
|
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
|
||||||
|
|
||||||
String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId();
|
String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId();
|
||||||
|
|||||||
Reference in New Issue
Block a user