You've already forked FrameTour-BE
一口价订单返回vlog
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package com.ycwl.basic.service.pc.impl;
|
package com.ycwl.basic.service.pc.impl;
|
||||||
|
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
|
||||||
import com.ycwl.basic.utils.JacksonUtil;
|
import com.ycwl.basic.utils.JacksonUtil;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
@@ -110,6 +111,8 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
private PrinterMapper printerMapper;
|
private PrinterMapper printerMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ScenicService scenicService;
|
private ScenicService scenicService;
|
||||||
|
@Autowired
|
||||||
|
private VideoMapper videoMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
|
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
|
||||||
@@ -168,13 +171,13 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ApiResponse<OrderRespVO> detail(Long orderId) {
|
public ApiResponse<OrderRespVO> detail(Long orderId) {
|
||||||
OrderRespVO byId = orderMapper.getById(orderId);
|
OrderRespVO order = orderMapper.getById(orderId);
|
||||||
List<OrderItemVO> orderItemList = byId.getOrderItemList();
|
List<OrderItemVO> orderItemList = order.getOrderItemList();
|
||||||
List<GoodsDetailVO> goodsList = new ArrayList<>();
|
List<GoodsDetailVO> goodsList = new ArrayList<>();
|
||||||
List<Integer> _f = new ArrayList<>();
|
List<Integer> _f = new ArrayList<>();
|
||||||
orderItemList.forEach(item -> {
|
orderItemList.forEach(item -> {
|
||||||
if (Integer.valueOf(1).equals(item.getGoodsType())) { // 原片 goodsId就是人脸ID
|
if (Integer.valueOf(1).equals(item.getGoodsType())) { // 原片 goodsId就是人脸ID
|
||||||
List<SourceEntity> memberVideoEntityList = sourceMapper.listVideoByFaceRelation(byId.getMemberId(), item.getGoodsId());
|
List<SourceEntity> memberVideoEntityList = sourceMapper.listVideoByFaceRelation(order.getMemberId(), item.getGoodsId());
|
||||||
item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList()));
|
item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList()));
|
||||||
if (!_f.contains(1)) {
|
if (!_f.contains(1)) {
|
||||||
_f.add(1);
|
_f.add(1);
|
||||||
@@ -195,7 +198,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (Integer.valueOf(2).equals(item.getGoodsType())) { // 照片 goodsId就是人脸ID
|
} else if (Integer.valueOf(2).equals(item.getGoodsType())) { // 照片 goodsId就是人脸ID
|
||||||
List<SourceEntity> memberVideoEntityList = sourceMapper.listImageByFaceRelation(byId.getMemberId(), item.getGoodsId());
|
List<SourceEntity> memberVideoEntityList = sourceMapper.listImageByFaceRelation(order.getMemberId(), item.getGoodsId());
|
||||||
item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList()));
|
item.setCoverList(memberVideoEntityList.stream().map(SourceEntity::getUrl).collect(Collectors.toList()));
|
||||||
if (!_f.contains(2)) {
|
if (!_f.contains(2)) {
|
||||||
_f.add(2);
|
_f.add(2);
|
||||||
@@ -230,12 +233,31 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
goods.setGoodsType(3);
|
goods.setGoodsType(3);
|
||||||
goods.setScenicId(sourceEntity.getScenicId());
|
goods.setScenicId(sourceEntity.getScenicId());
|
||||||
goods.setTemplateCoverUrl(sourceEntity.getCropUrl());
|
goods.setTemplateCoverUrl(sourceEntity.getCropUrl());
|
||||||
goods.setScenicId(sourceEntity.getScenicId());
|
|
||||||
goods.setCreateTime(sourceEntity.getCreateTime());
|
goods.setCreateTime(sourceEntity.getCreateTime());
|
||||||
goodsList.add(goods);
|
goodsList.add(goods);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (Integer.valueOf(-1).equals(item.getGoodsType())) { // 模板一套
|
||||||
|
TemplateRespVO template = templateRepository.getTemplate(item.getGoodsId());
|
||||||
|
item.setCoverUrl(template.getCoverUrl());
|
||||||
|
List<MemberVideoEntity> videoEntities = videoMapper.listRelationByFaceAndTemplate(order.getFaceId(), item.getGoodsId());
|
||||||
|
if (!videoEntities.isEmpty()) {
|
||||||
|
for (MemberVideoEntity memberVideoEntity : videoEntities) {
|
||||||
|
GoodsDetailVO goods = new GoodsDetailVO();
|
||||||
|
goods.setGoodsId(memberVideoEntity.getVideoId());
|
||||||
|
goods.setGoodsName(template.getName());
|
||||||
|
goods.setGoodsType(0);
|
||||||
|
goods.setScenicId(memberVideoEntity.getScenicId());
|
||||||
|
goods.setTemplateCoverUrl(template.getCoverUrl());
|
||||||
|
goods.setCreateTime(videoTaskRepository.getTaskShotDate(memberVideoEntity.getTaskId()));
|
||||||
|
VideoEntity video = videoRepository.getVideo(memberVideoEntity.getVideoId());
|
||||||
|
if (video != null) {
|
||||||
|
goods.setUrl(video.getVideoUrl());
|
||||||
|
}
|
||||||
|
goodsList.add(goods);
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
item.setCoverList(Collections.singletonList(item.getCoverUrl()));
|
item.setCoverList(Collections.singletonList(item.getCoverUrl()));
|
||||||
VideoEntity videoMapperById = videoRepository.getVideo(item.getGoodsId());
|
VideoEntity videoMapperById = videoRepository.getVideo(item.getGoodsId());
|
||||||
@@ -267,8 +289,8 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
byId.setGoodsList(goodsList);
|
order.setGoodsList(goodsList);
|
||||||
return ApiResponse.success(byId);
|
return ApiResponse.success(order);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user