From 092c99d25da8113841d779d109598b188859671d Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 6 Feb 2026 20:37:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(goods):=20=E4=BF=AE=E5=A4=8D=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E5=88=87=E7=89=87=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 合并 WAITING_USER_SELECT 和 COMPLETED 状态的处理分支
- 统一查询人脸关联视频信息的逻辑
- 修正前端状态返回的一致性问题
---
 .../basic/service/mobile/impl/GoodsServiceImpl.java  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
index 32a12539..29b3d75f 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
@@ -332,16 +332,8 @@ public class GoodsServiceImpl implements GoodsService {
 
         // ==================== 第四步：根据切片完成状态返回结果 ====================
 
-        if (status == FaceCutStatus.WAITING_USER_SELECT) {
-            // 切片已完成，但景区配置了 face_select_first=true
-            // 需要等待用户手动选择模板后才开始渲染
-            // 前端展示：「专属视频合成中」
-            response.setStatus(VideoTaskStatus.PROCESSING.getCode());
-            return response;
-        }
-
-        if (status == FaceCutStatus.COMPLETED) {
-            // 切片已完成，查询该人脸关联的视频信息
+        if (status == FaceCutStatus.WAITING_USER_SELECT || status == FaceCutStatus.COMPLETED) {
+            // 切片已完成（或等待用户选择），查询该人脸关联的视频信息
             List<MemberVideoEntity> taskList = videoMapper.listRelationByFace(faceId);
             if (taskList == null || taskList.isEmpty()) {
                 response.setStatus(VideoTaskStatus.PENDING.getCode());