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 14afd639..c06a4203 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 @@ -311,10 +311,10 @@ public class OrderServiceImpl implements OrderService { GoodsDetailVO goods = new GoodsDetailVO(); goods.setGoodsId(sourceEntity.getId()); goods.setGoodsName("录像集录像"); - goods.setUrl(sourceEntity.getUrl()); + goods.setUrl(sourceEntity.getVideoUrl()); goods.setGoodsType(sourceEntity.getType()); goods.setScenicId(sourceEntity.getScenicId()); - goods.setUrl(sourceEntity.getVideoUrl()); + goods.setVideoUrl(sourceEntity.getVideoUrl()); goods.setTemplateCoverUrl(sourceEntity.getUrl()); goods.setCreateTime(sourceEntity.getCreateTime()); goodsList.add(goods); @@ -394,6 +394,15 @@ public class OrderServiceImpl implements OrderService { goodsList.add(goods); } } + } else if (Integer.valueOf(5).equals(item.getGoodsType())) { // pLog + GoodsDetailVO goods = new GoodsDetailVO(); + goods.setGoodsId(item.getGoodsId()); + goods.setGoodsName("pLog"); + goods.setGoodsType(5); + goods.setUrl(item.getCoverUrl()); + goods.setTemplateCoverUrl(item.getCoverUrl()); + goods.setScenicId(order.getScenicId()); + goodsList.add(goods); } else { item.setCoverList(Collections.singletonList(item.getCoverUrl())); VideoEntity videoMapperById = videoRepository.getVideo(item.getGoodsId());