From 0bf6aeadbf761f9317975d32306f312fda8c9386 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 12 Jan 2024 09:12:53 +0800
Subject: [PATCH] 1/12

---
 .../biz/lpkreserveorder/LpkReserveOrderMapper.xml    | 12 ++++++------
 1 file changed, 6 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 059b22d..5544bee 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
@@ -178,16 +178,16 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 1 then '亲情菜窖'
+        when 2 then '亲情菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
         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
+        LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
+        LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         <where>
-            o.cardType='1'
+            o.cardType='2'
             <if test="qw.store !='' and qw.store!=null">
                 and s.name=#{qw.store}
             </if>
@@ -214,12 +214,12 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 1 then '企业菜窖'
+        when 3 then '企业菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
-        LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
+        LEFT JOIN emp_card AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         <where>