From 6a22fc87a74012b7651a3ad0c3fc06945b959748 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 14 Feb 2026 17:54:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=BC=A0=E7=85=A7=E7=89=87=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 member_single_photo_data CTE 查询单张照片数据
- 添加订单类型 14 对应单张照片类型的映射
- 在订单项目查询中增加对单张照片类型的支持
- 关联 member_single_photo_data 表获取单张照片的 face_id 和 URL
- 实现单张照片类型的 face_url 和 imgUrl 映射逻辑
---
 src/main/resources/mapper/OrderMapper.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 3624502f..8f0ea21c 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -115,6 +115,13 @@
                  SELECT 5 as type, gr.template_id as id, pt.scenic_id as scenic_id, gr.result_image_url as url, gr.face_id
                   FROM puzzle_generation_record gr
                   left join puzzle_template pt on gr.template_id = pt.id
+            ),
+            member_single_photo_data AS (
+                 SELECT ms.source_id, ms.face_id, f.face_url, s.url
+                  FROM member_source ms
+                  LEFT JOIN face f ON ms.face_id = f.id
+                  LEFT JOIN source s ON ms.source_id = s.id
+                  WHERE s.id IS NOT NULL AND ms.deleted = 0
             )
         SELECT
             oi.id AS oiId,
@@ -136,6 +143,7 @@
                 WHEN '4' THEN '一体机照片打印'
                 WHEN '5' THEN 'pLog'
                 WHEN '13' THEN '打卡点拍照'
+                WHEN '14' THEN '单张照片'
                 ELSE '其他'
                 END AS goods_name,
             CASE oi.goods_type
@@ -143,12 +151,14 @@
                 WHEN '1' THEN oi.goods_id
                 WHEN '2' THEN oi.goods_id
                 WHEN '13' THEN oi.goods_id
+                WHEN '14' THEN mspd.face_id
                 END AS face_id,
             CASE oi.goods_type
                 WHEN '0' THEN mvd.face_url
                 WHEN '1' THEN msd.face_url
                 WHEN '2' THEN msd.face_url
                 WHEN '13' THEN msac.face_url
+                WHEN '14' THEN mspd.face_url
                 END AS face_url,
             CASE oi.goods_type
                 WHEN '0' THEN mvd.video_url
@@ -161,6 +171,7 @@
                 WHEN '4' THEN mpa.url
                 WHEN '5' THEN mpl.url
                 WHEN '13' THEN msac.url
+                WHEN '14' THEN mspd.url
                 END AS imgUrl
         FROM order_item oi
                  LEFT JOIN `order` o ON oi.order_id = o.id
@@ -170,6 +181,7 @@
                  LEFT JOIN member_photo_data mpd ON oi.goods_id = mpd.id AND mpd.type = oi.goods_type
                  LEFT JOIN member_aio_photo_data mpa ON oi.goods_id = mpa.id AND mpa.type = oi.goods_type
                  LEFT JOIN member_plog_data mpl ON (oi.goods_id = mpl.id OR oi.goods_id = mpl.scenic_id) AND mpl.type = oi.goods_type AND o.face_id = mpl.face_id
+                 LEFT JOIN member_single_photo_data mspd ON oi.goods_id = mspd.source_id AND o.face_id = mspd.face_id AND oi.goods_type = 14
         WHERE oi.order_id = #{id};
     </select>