From 5942a9b7289ebd7a5ce7e1cf0d7abf2ed18b4639 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 29 Jul 2025 10:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=8F=A3=E4=BB=B7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9Evlog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/pc/impl/OrderServiceImpl.java     | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

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 3aa549e..0c2178d 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
@@ -1,6 +1,7 @@
 package com.ycwl.basic.service.pc.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
 import com.ycwl.basic.utils.JacksonUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -110,6 +111,8 @@ public class OrderServiceImpl implements OrderService {
     private PrinterMapper printerMapper;
     @Autowired
     private ScenicService scenicService;
+    @Autowired
+    private VideoMapper videoMapper;
 
     @Override
     public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
@@ -168,13 +171,13 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public ApiResponse<OrderRespVO> detail(Long orderId) {
-        OrderRespVO byId = orderMapper.getById(orderId);
-        List<OrderItemVO> orderItemList = byId.getOrderItemList();
+        OrderRespVO order = orderMapper.getById(orderId);
+        List<OrderItemVO> orderItemList = order.getOrderItemList();
         List<GoodsDetailVO> goodsList = new ArrayList<>();
         List<Integer> _f = new ArrayList<>();
         orderItemList.forEach(item -> {
             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()));
                 if (!_f.contains(1)) {
                     _f.add(1);
@@ -195,7 +198,7 @@ public class OrderServiceImpl implements OrderService {
                     }
                 }
             } 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()));
                 if (!_f.contains(2)) {
                     _f.add(2);
@@ -230,12 +233,31 @@ public class OrderServiceImpl implements OrderService {
                             goods.setGoodsType(3);
                             goods.setScenicId(sourceEntity.getScenicId());
                             goods.setTemplateCoverUrl(sourceEntity.getCropUrl());
-                            goods.setScenicId(sourceEntity.getScenicId());
                             goods.setCreateTime(sourceEntity.getCreateTime());
                             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 {
                 item.setCoverList(Collections.singletonList(item.getCoverUrl()));
                 VideoEntity videoMapperById = videoRepository.getVideo(item.getGoodsId());
@@ -267,8 +289,8 @@ public class OrderServiceImpl implements OrderService {
                 }
             }
         });
-        byId.setGoodsList(goodsList);
-        return ApiResponse.success(byId);
+        order.setGoodsList(goodsList);
+        return ApiResponse.success(order);
     }
 
     /**