From caad0c2cf008d62d2445825c6983214cd3965432 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 21 Nov 2025 14:40:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0plog=E5=9B=BE?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在OrderServiceImpl中增加对商品类型5的处理逻辑
- 设置商品名称和订单类型为"plog图"
- 在OrderMapper.xml中新增member_plog_data查询块
- 添加对goods_type为5时coverUrl和imgUrl的映射
- 增加对goods_type为5时商品名称的显示处理
- 新增member_plog_data表的左连接查询条件
---
 .../com/ycwl/basic/service/pc/impl/OrderServiceImpl.java  | 3 +++
 src/main/resources/mapper/OrderMapper.xml                 | 8 ++++++++
 2 files changed, 11 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 68fbdd0b..b3e31bdc 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
@@ -183,6 +183,9 @@ public class OrderServiceImpl implements OrderService {
                     } else if (Integer.valueOf(4).equals(orderItemList.getFirst().getGoodsType())) {
                         item.setGoodsName("一体机打印");
                         item.setOrderType("一体机打印");
+                    } else if (Integer.valueOf(5).equals(orderItemList.getFirst().getGoodsType())) {
+                        item.setGoodsName("plog图");
+                        item.setOrderType("plog图");
                     } else {
                         item.setGoodsName("未知商品");
                         item.setOrderType("未知商品");
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 700056f0..64debb84 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -103,6 +103,10 @@
             member_aio_photo_data AS (
                  SELECT 4 as type, s.id, s.url as url
                   FROM source s
+            ),
+            member_plog_data AS (
+                 SELECT 5 as type, gr.template_id as id, gr.result_image_url as url, gr.face_id
+                  FROM puzzle_generation_record gr
             )
         SELECT
             oi.id AS oiId,
@@ -113,6 +117,7 @@
             CASE oi.goods_type
                 WHEN '0' THEN mvd.cover_url
                 WHEN '3' THEN mpd.url
+                WHEN '5' THEN mpl.url
                 END AS coverUrl,
             oi.goods_type,
             CASE oi.goods_type
@@ -121,6 +126,7 @@
                 WHEN '2' THEN '照片集'
                 WHEN '3' THEN '照片打印'
                 WHEN '4' THEN '一体机照片打印'
+                WHEN '5' THEN 'pLog'
                 ELSE '其他'
                 END AS goods_name,
             CASE oi.goods_type
@@ -142,6 +148,7 @@
                 WHEN '2' THEN msd.url
                 WHEN '3' THEN mpd.url
                 WHEN '4' THEN mpa.url
+                WHEN '5' THEN mpl.url
                 END AS imgUrl
         FROM order_item oi
                  LEFT JOIN `order` o ON oi.order_id = o.id
@@ -149,6 +156,7 @@
                  LEFT JOIN member_source_data msd ON o.face_id = msd.face_id  AND oi.goods_id = msd.face_id AND msd.type = oi.goods_type
                  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 AND mpl.type = oi.goods_type AND o.face_id = mpl.face_id
         WHERE oi.order_id = #{id};
     </select>