sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单车辆图片拆分成3个字段

Browse Source
This commit is contained in:
zhangli
2025-08-13 23:30:14 +08:00
parent 9bff10f13c
commit c1013dea17
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/sczx/order/common/enums/OrderCarImgTypeEnum.java
View File

@ -13,7 +13,6 @@ import lombok.Getter;
public enum OrderCarImgTypeEnum { public enum OrderCarImgTypeEnum {
RENT("RENT", "租车"), RENT("RENT", "租车"),
RETURN("RETURN", "还车"), RETURN("RETURN", "还车"),
CONFIRM_RETURN("CONFIRM_RETURN", "确认还车"),
CAR_DAMAGE("CAR_DAMAGE", "车损"), CAR_DAMAGE("CAR_DAMAGE", "车损"),
; ;
private final String code; private final String code;

10
src/main/java/com/sczx/order/dto/OrderDetailDTO.java
View File

@ -156,6 +156,12 @@ public class OrderDetailDTO {
@ApiModelProperty("预计到期间隔天数") @ApiModelProperty("预计到期间隔天数")
private Integer expectedDays; private Integer expectedDays;
@ApiModelProperty("订单车辆图片") @ApiModelProperty("订单车辆图片-租车")
private List<OrderCarImgDTO> orderCarImgList; private List<OrderCarImgDTO> orderCarImgRentList;
@ApiModelProperty("订单车辆图片-还车")
private List<OrderCarImgDTO> orderCarImgReturnList;
@ApiModelProperty("订单车辆图片-车损")
private List<OrderCarImgDTO> orderCarImgDamageList;
} }

9
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -435,8 +435,13 @@ public class OrderServiceImpl implements OrderService {
//查询订单车辆图片 //查询订单车辆图片
List<OrderCarImgPO> orderCarImgPOList = orderCarImgRepo.list(new LambdaQueryWrapper<OrderCarImgPO>().eq(OrderCarImgPO::getOrderId, orderDetailDTO.getOrderId())); List<OrderCarImgPO> orderCarImgPOList = orderCarImgRepo.list(new LambdaQueryWrapper<OrderCarImgPO>().eq(OrderCarImgPO::getOrderId, orderDetailDTO.getOrderId()));
if(!CollectionUtils.isEmpty(orderCarImgPOList)){ if(!CollectionUtils.isEmpty(orderCarImgPOList)){
List<OrderCarImgDTO> orderCarImgList = OrderCarImgConvert.INSTANCE.posToDtos(orderCarImgPOList);
orderDetailDTO.setOrderCarImgList(OrderCarImgConvert.INSTANCE.posToDtos(orderCarImgPOList)); List<OrderCarImgDTO> orderCarImgRentList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.RENT.getCode())).collect(Collectors.toList());
orderDetailDTO.setOrderCarImgRentList(orderCarImgRentList);
List<OrderCarImgDTO> orderCarImgReturnList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.RETURN.getCode())).collect(Collectors.toList());
orderDetailDTO.setOrderCarImgReturnList(orderCarImgReturnList);
List<OrderCarImgDTO> orderCarImgDamageList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.CAR_DAMAGE.getCode())).collect(Collectors.toList());
orderDetailDTO.setOrderCarImgDamageList(orderCarImgDamageList);
} }
else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){ else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
//如果是租车中，需要判断是否逾期了 //如果是租车中，需要判断是否逾期了