From e5eea4c3497e57ed7efe19f457d64c152cc1afe5 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 14 Feb 2026 18:19:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(face):=20=E4=BF=AE=E5=A4=8D=E6=91=84?=
 =?UTF-8?q?=E5=BD=B1=E5=B8=88=E6=8B=8D=E7=85=A7=E5=86=85=E5=AE=B9=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加会员资源关系查询以获取正确的购买状态
- 修改内容设置逻辑使用会员资源关系中的购买状态
- 实现流式过滤匹配资源ID并设置对应的购买标识
---
 .../basic/service/pc/impl/OrderServiceImpl.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 144697ea..4522a3fb 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
@@ -44,6 +44,7 @@ import com.ycwl.basic.model.pc.price.entity.PriceConfigEntity;
 import com.ycwl.basic.model.pc.price.resp.GoodsListRespVO;
 import com.ycwl.basic.model.pc.printer.resp.MemberPrintResp;
 import com.ycwl.basic.model.pc.source.entity.SourceEntity;
+import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
 import com.ycwl.basic.model.pc.task.entity.TaskEntity;
 import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
 import com.ycwl.basic.model.pc.video.entity.VideoEntity;
@@ -423,6 +424,21 @@ public class OrderServiceImpl implements OrderService {
                 goods.setTemplateCoverUrl(item.getCoverUrl());
                 goods.setScenicId(order.getScenicId());
                 goodsList.add(goods);
+            } else if (Integer.valueOf(14).equals(item.getGoodsType())) { // 单张照片 goodsId就是sourceId
+                SourceRespVO source = sourceMapper.getById(item.getGoodsId());
+                if (source != null) {
+                    item.setCoverList(Collections.singletonList(source.getUrl()));
+                    GoodsDetailVO goods = new GoodsDetailVO();
+                    goods.setGoodsId(source.getId());
+                    goods.setGoodsName("单张照片");
+                    goods.setUrl(source.getUrl());
+                    goods.setGoodsType(14);
+                    goods.setScenicId(source.getScenicId());
+                    goods.setTemplateCoverUrl(source.getUrl());
+                    goods.setCreateTime(source.getCreateTime());
+                    goodsList.add(goods);
+                    item.setShootingTime(source.getCreateTime());
+                }
             } else {
                 item.setCoverList(Collections.singletonList(item.getCoverUrl()));
                 VideoEntity videoMapperById = videoRepository.getVideo(item.getGoodsId());