diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java index 90ed1459..e9915826 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java @@ -23,6 +23,7 @@ public class OrderItemVO { private Long orderId; // 商品类型,1成片,2源素材 private Integer goodsType; + private Integer count; /** * 商品ID,goods_type=1关联video.id,=2关联source.id,=3关联template.id */ diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index bc639376..1ce87899 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -513,23 +513,29 @@ public class OrderServiceImpl implements OrderService { item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList())); if (!memberVideoEntityList.isEmpty()) { item.setShootingTime(memberVideoEntityList.getFirst().getCreateTime()); + item.setCount(1); } } else if (Integer.valueOf(2).equals(item.getGoodsType())) { List memberVideoEntityList = sourceMapper.listImageByFaceRelation(orderReqQuery.getMemberId(), item.getFaceId()); item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList())); if (!memberVideoEntityList.isEmpty()) { item.setShootingTime(memberVideoEntityList.getFirst().getCreateTime()); + item.setCount(1); } } else if (Integer.valueOf(0).equals(item.getGoodsType())) { item.setCoverList(Collections.singletonList(item.getCoverUrl())); VideoEntity video = videoRepository.getVideo(item.getGoodsId()); if (video != null) { item.setShootingTime(videoTaskRepository.getTaskShotDate(video.getTaskId())); + item.setCount(1); } } else if (Integer.valueOf(3).equals(item.getGoodsType())) { // 打印订单 List photo = printerMapper.getUserPhotoByIds(orderItemList.stream().map(OrderItemVO::getGoodsId).collect(Collectors.toList())); item.setCoverList(photo.stream().map(MemberPrintResp::getCropUrl).collect(Collectors.toList())); + photo.stream().filter(p -> p.getId().equals(item.getGoodsId().intValue())).findAny().ifPresent(p -> { + item.setCount(p.getQuantity()); + }); } }); });