From 5cc32ddf61154bdc131beff6a04e5e2d2d907128 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sun, 14 Dec 2025 00:04:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=99=AF=E5=8C=BA=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在member_plog_data子查询中增加scenic_id字段 - 添加puzzle_template与puzzle_generation_record的左连接 - 修改member_plog_data与其他表的连接条件以兼容景区ID匹配 - 支持通过goods_id或scenic_id关联member_plog_data表 - 提升订单详情中图片资源定位准确性 --- src/main/resources/mapper/OrderMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index 3ba9ddde..69e44efc 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -112,8 +112,9 @@ 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 + 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 ) SELECT oi.id AS oiId, @@ -168,7 +169,7 @@ LEFT JOIN member_source_aicam_data msac ON o.face_id = msac.face_id AND oi.goods_id = msac.face_id AND oi.goods_type = 13 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 + 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 WHERE oi.order_id = #{id};