订单返回值增加图片类型
This commit is contained in:
19
src/main/java/com/sczx/order/convert/OrderCarImgConvert.java
Normal file
19
src/main/java/com/sczx/order/convert/OrderCarImgConvert.java
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
package com.sczx.order.convert;
|
||||||
|
|
||||||
|
import com.sczx.order.dto.OrderCarImgDTO;
|
||||||
|
import com.sczx.order.po.OrderCarImgPO;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface OrderCarImgConvert {
|
||||||
|
OrderCarImgConvert INSTANCE = Mappers.getMapper(OrderCarImgConvert.class);
|
||||||
|
|
||||||
|
OrderCarImgDTO poToDto(OrderCarImgPO orderCarImgPO);
|
||||||
|
|
||||||
|
OrderCarImgPO dtoToPo(OrderCarImgDTO orderCarImgDTO);
|
||||||
|
|
||||||
|
List<OrderCarImgDTO> posToDtos(List<OrderCarImgPO> orderCarImgPOs);
|
||||||
|
}
|
||||||
@ -157,5 +157,5 @@ public class OrderDetailDTO {
|
|||||||
private Integer expectedDays;
|
private Integer expectedDays;
|
||||||
|
|
||||||
@ApiModelProperty("订单车辆图片")
|
@ApiModelProperty("订单车辆图片")
|
||||||
private List<String> orderCarImgList;
|
private List<OrderCarImgDTO> orderCarImgList;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.sczx.order.common.constant.RedisKeyConstants;
|
import com.sczx.order.common.constant.RedisKeyConstants;
|
||||||
import com.sczx.order.common.enums.*;
|
import com.sczx.order.common.enums.*;
|
||||||
|
import com.sczx.order.convert.OrderCarImgConvert;
|
||||||
import com.sczx.order.convert.OrderConvert;
|
import com.sczx.order.convert.OrderConvert;
|
||||||
import com.sczx.order.convert.OrderSubConvert;
|
import com.sczx.order.convert.OrderSubConvert;
|
||||||
import com.sczx.order.dto.*;
|
import com.sczx.order.dto.*;
|
||||||
@ -434,8 +435,8 @@ 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<String> orderCarImgList = orderCarImgPOList.stream().map(OrderCarImgPO::getImgUrl).collect(Collectors.toList());
|
|
||||||
orderDetailDTO.setOrderCarImgList(orderCarImgList);
|
orderDetailDTO.setOrderCarImgList(OrderCarImgConvert.INSTANCE.posToDtos(orderCarImgPOList));
|
||||||
}
|
}
|
||||||
else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
|
else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
|
||||||
//如果是租车中,需要判断是否逾期了
|
//如果是租车中,需要判断是否逾期了
|
||||||
|
|||||||
Reference in New Issue
Block a user