From 59523900934a3aba58cc0ed7fa7a09f79a80f706 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 8 Jan 2026 11:11:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=92=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9ID=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复当完成数量小于等于0时视频任务状态设置为待处理
- 调整内容页面VO中内容ID的设置顺序以确保正确赋值
---
 .../com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java   | 3 +++
 .../java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 8d8a9e7e..6f4e111d 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
@@ -330,6 +330,9 @@ public class GoodsServiceImpl implements GoodsService {
         // 设置已完成数量和总模板数
         response.setCount(count.get());
         response.setMaxCount(templateList.size());
+        if (count.get() <= 0) {
+             response.setStatus(VideoTaskStatus.PENDING.getCode());
+        }
 
         // ==================== 第四步：根据切片完成状态返回结果 ====================
 
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
index d2bc76c2..0f3b5aee 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
@@ -488,12 +488,12 @@ public class FaceServiceImpl implements FaceService {
             contentPageVO.setContentType(1);
             contentPageVO.setSort(contentPageVO.getSort());
             if (!memberVideoEntityList.isEmpty()) {
+                contentPageVO.setContentId(memberVideoEntityList.getFirst().getVideoId());
                 boolean isBuy = orderRepository.checkUserBuyFaceItem(userId, faceId, 0, contentPageVO.getContentId());
                 if (!isBuy) {
                     isBuy = orderRepository.checkUserBuyFaceItem(userId, faceId, -1, contentPageVO.getTemplateId()); // 购买模板
                 }
                 contentPageVO.setIsBuy(isBuy ? 1 : 0);
-                contentPageVO.setContentId(memberVideoEntityList.getFirst().getVideoId());
                 VideoEntity video = videoRepository.getVideo(contentPageVO.getContentId());
                 if (video != null) {
                     contentPageVO.setVideoUrl(video.getVideoUrl());