diff --git a/src/main/java/com/sczx/order/convert/OrderCarImgConvert.java b/src/main/java/com/sczx/order/convert/OrderCarImgConvert.java new file mode 100644 index 0000000..56b07e2 --- /dev/null +++ b/src/main/java/com/sczx/order/convert/OrderCarImgConvert.java @@ -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 posToDtos(List orderCarImgPOs); +} diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java index f25ad42..873d535 100644 --- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java @@ -157,5 +157,5 @@ public class OrderDetailDTO { private Integer expectedDays; @ApiModelProperty("订单车辆图片") - private List orderCarImgList; + private List orderCarImgList; } 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 0f983f6..250b757 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.order.common.constant.RedisKeyConstants; import com.sczx.order.common.enums.*; +import com.sczx.order.convert.OrderCarImgConvert; import com.sczx.order.convert.OrderConvert; import com.sczx.order.convert.OrderSubConvert; import com.sczx.order.dto.*; @@ -434,8 +435,8 @@ public class OrderServiceImpl implements OrderService { //查询订单车辆图片 List orderCarImgPOList = orderCarImgRepo.list(new LambdaQueryWrapper().eq(OrderCarImgPO::getOrderId, orderDetailDTO.getOrderId())); if(!CollectionUtils.isEmpty(orderCarImgPOList)){ - List 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())){ //如果是租车中,需要判断是否逾期了