From 38b9bee4e0e0d9fa637689d2adc253681aace581 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 15 Jan 2024 09:18:34 +0800
Subject: [PATCH] 1/15

---
 .../lpkreserveorder/LpkReserveOrderMapper.xml | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
index f51b718..3f63b63 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
@@ -430,9 +430,11 @@
         c.serialNumber,
         case o.cardType
         when 1 then '家庭菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
@@ -470,9 +472,11 @@
         c.serialNumber,
         case o.cardType
         when 2 then '亲情菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
@@ -513,9 +517,11 @@
         c.serialNumber,
         case o.cardType
         when 3 then '企业菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN emp_card AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
@@ -559,9 +565,11 @@
         c.serialNumber,
         case o.cardType
         when 1 then '家庭菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
@@ -602,9 +610,11 @@
         c.serialNumber,
         case o.cardType
         when 2 then '亲情菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
@@ -647,9 +657,11 @@
         c.serialNumber,
         case o.cardType
         when 3 then '企业菜窖'
-        end cardType
+        end cardType,
+        t.goodsSid as goodsSid
         FROM
         lpk_reserve_order AS o
+        LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN emp_card AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid