From 948bd0d2e2ee15e1cc9d7e0e8d9b7adc0153e76e Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 8 Sep 2025 21:37:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(AppOrderV2Controller):=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9C=AC=20faceId=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 faceId 参数缺失时，增加兼容旧版本的处理逻辑
- 根据产品类型和产品 ID 获取 faceId，确保系统能够正常计算价格
---
 .../controller/mobile/AppOrderV2Controller.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderV2Controller.java b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderV2Controller.java
index c92a16f..753d844 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderV2Controller.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderV2Controller.java
@@ -9,8 +9,10 @@ import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.task.entity.TaskEntity;
 import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
+import com.ycwl.basic.model.pc.video.entity.VideoEntity;
 import com.ycwl.basic.pricing.enums.ProductType;
 import com.ycwl.basic.repository.TemplateRepository;
+import com.ycwl.basic.repository.VideoRepository;
 import com.ycwl.basic.repository.VideoTaskRepository;
 import com.ycwl.basic.service.pc.OrderService;
 import com.ycwl.basic.utils.ApiResponse;
@@ -58,6 +60,7 @@ public class AppOrderV2Controller {
     private final VideoMapper videoMapper;
     private final VideoTaskRepository videoTaskRepository;
     private final TemplateRepository templateRepository;
+    private final VideoRepository videoRepository;
 
     /**
      * 移动端价格计算
@@ -80,7 +83,17 @@ public class AppOrderV2Controller {
         // 验证faceId参数
         if (request.getFaceId() == null) {
             log.warn("移动端价格计算：faceId参数缺失");
-            return ApiResponse.fail("faceId参数不能为空");
+//            return ApiResponse.fail("faceId参数不能为空");
+            // 兼容：兼容旧版本
+            ProductItem productItem = request.getProducts().getFirst();
+            switch (productItem.getProductType()) {
+                case VLOG_VIDEO -> {
+                    VideoEntity video = videoRepository.getVideo(Long.valueOf(productItem.getProductId()));
+                    TaskEntity task = videoTaskRepository.getTaskById(video.getTaskId());
+                    request.setFaceId(task.getFaceId());
+                }
+                case RECORDING_SET, PHOTO_SET -> request.setFaceId(Long.valueOf(productItem.getProductId()));
+            }
         }
         
         // 查询人脸信息进行权限验证