From 548b25e9ab723e508454981e52e64d620cafdb58 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 11 Jan 2024 18:09:09 +0800
Subject: [PATCH] 1/11

---
 .../lpkreserveorder/LpkReserveOrderQuery.java |   1 +
 .../appletgiftbag/AppletGiftBagService.java   |   2 +-
 .../LpkReserveOrderMapper.java                |   6 +
 .../lpkreserveorder/LpkReserveOrderMapper.xml | 405 +++++++++++++++---
 .../LpkReserveOrderService.java               |  43 +-
 5 files changed, 385 insertions(+), 72 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java
index d066d63..f9c7237 100644
--- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java
+++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java
@@ -18,4 +18,5 @@ public class LpkReserveOrderQuery implements Query {
     private String bankSid;
     private String bankName;
     private String serialNumber;
+    private String cardType; //1 家庭  2 亲情卡 3 企业
 }
diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
index 9e72949..7c4b30e 100644
--- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
+++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
@@ -249,7 +249,7 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
     public ResultBean  recommendRecord(String sid ) {
         ResultBean rb=new ResultBean().fail();
         AppletGiftBagVo vo=new AppletGiftBagVo();
-        AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid",sid));
+        AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
         vo.setRemarks(bag.getRemarks());
         vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl());
         recommendRecord recommendRecord=new recommendRecord();
diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java
index 4beeaeb..4b65c50 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java
@@ -18,6 +18,9 @@ import java.util.List;
 @Mapper
 public interface LpkReserveOrderMapper extends BaseMapper<LpkReserveOrder> {
     IPage<LpkReserveOrderVo> orderList(IPage<LpkReserveOrder> page,@Param("qw") LpkReserveOrderQuery qw);
+    IPage<LpkReserveOrderVo> orderList1(IPage<LpkReserveOrder> page,@Param("qw") LpkReserveOrderQuery qw);
+    IPage<LpkReserveOrderVo> orderList2(IPage<LpkReserveOrder> page,@Param("qw") LpkReserveOrderQuery qw);
+    IPage<LpkReserveOrderVo> orderList3(IPage<LpkReserveOrder> page,@Param("qw") LpkReserveOrderQuery qw);
     IPage<LpkReserveOrderVo> orderListByStore(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
     IPage<LpkReserveOrderVo> orderListByBank(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
     IPage<LpkReserveOrderVo> orderListByZ(IPage<LpkReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrder> qw);
@@ -27,6 +30,9 @@ public interface LpkReserveOrderMapper extends BaseMapper<LpkReserveOrder> {
     IPage<LpkReserveOrderCardVo> orderListByUserSid(IPage<LpkReserveOrder> page, @Param("userSid")String userSid);
 
     List<ReserveOrderExport> exportExcel(@Param("qw") LpkReserveOrderQuery qw);
+    List<ReserveOrderExport> exportExcel1(@Param("qw") LpkReserveOrderQuery qw);
+    List<ReserveOrderExport> exportExcel2(@Param("qw") LpkReserveOrderQuery qw);
+    List<ReserveOrderExport> exportExcel3(@Param("qw") LpkReserveOrderQuery qw);
     List<ReserveOrderExportByStore> exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);
     List<ReserveOrderExportByBank> exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);
     List<ReserveOrderExportByZ> exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper<LpkReserveOrderQuery> qw);
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 e17a1c9..059b22d 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
@@ -32,7 +32,7 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 1 then '家庭卡'
+        when 1 then '家庭菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
@@ -42,9 +42,6 @@
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         <where>
             o.cardType='1'
-            <if test="qw.bankSid !='' and qw.bankSid!=null">
-                and s.bankSid=#{qw.bankSid}
-            </if>
             <if test="qw.store !='' and qw.store!=null">
                 and s.name=#{qw.store}
             </if>
@@ -69,7 +66,7 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 2 then '亲情卡'
+        when 2 then '亲情菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
@@ -106,7 +103,7 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 3 then '企业卡'
+        when 3 then '企业菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
@@ -114,7 +111,129 @@
         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 o.cardType='3'
+        <where>
+            o.cardType='3'
+            <if test="qw.bankSid !='' and qw.bankSid!=null">
+                and s.bankSid=#{qw.bankSid}
+            </if>
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="orderList1" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo">
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 1 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 lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            o.cardType='1'
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="orderList2" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo">
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 1 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 lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            o.cardType='1'
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="orderList3" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo">
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 1 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 lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            o.cardType='3'
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
         order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
     </select>
     <select id="orderListByStore" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo">
@@ -131,15 +250,13 @@
         d.address,
         e.`name` as goodsName,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType
         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
         left join lpk_bank as d on d.sid =s.bankSid
         left join lpk_goods e on e.sid= t.goodsSid
         <where>
@@ -159,16 +276,14 @@
         s.phone as linkPhone,
         s.address,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType,
         e.`name` as goodsName
         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
         left join lpk_bank as d on d.sid =s.bankSid
         left join lpk_goods e on e.sid= t.goodsSid
         <where>
@@ -185,17 +300,15 @@
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType,
         e.`name` as goodsName
         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
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         LEFT JOIN lpk_goods e on e.sid =t.goodsSid
         <where>
@@ -300,30 +413,75 @@
         ORDER BY reserveDate DESC
     </select>
     <select id="exportExcel" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
-        select
+        SELECT
         o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
         o.userName,
         o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
         d.sid as dsid,
         s.sid as ssid,
-        s.`name` as store,
-        b.`name` as bagName,
-        d.name as bankName,
-        c.`code`,c.serialNumber,
-        t.goodsSid as goodsSid,
-        t.goodsNumber as goodsNumber,
+        c.serialNumber,
         case o.cardType
-        when 1 then '家庭卡'
+        when 1 then '家庭菜窖'
         end cardType
-        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
+        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 lpk_bank as d on d.sid =s.bankSid
+        LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         <where>
-            o.cardType='1'
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='1'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
+                and o.cardType=#{qw.cardType}
+            </if>
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
+        union
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 2 then '亲情菜窖'
+        end cardType
+        FROM
+        lpk_reserve_order AS o
+        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
+        LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='2'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
+                and o.cardType=#{qw.cardType}
+            </if>
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>
@@ -338,30 +496,124 @@
             </if>
         </where>
         union
-        select
+        SELECT
         o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
         o.userName,
         o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
         d.sid as dsid,
         s.sid as ssid,
-        s.`name` as store,
-        b.`name` as bagName,
-        d.name as bankName,
-        c.`code`,c.serialNumber,
-        t.goodsSid as goodsSid,
-        t.goodsNumber as goodsNumber,
+        c.serialNumber,
         case o.cardType
-        when 2 then '亲情卡'
+        when 3 then '企业菜窖'
         end cardType
-        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
+        FROM
+        lpk_reserve_order AS o
+        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
+        LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='3'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
+                and o.cardType=#{qw.cardType}
+            </if>
+            <if test="qw.bankSid !='' and qw.bankSid!=null">
+                and s.bankSid=#{qw.bankSid}
+            </if>
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+
+        </where>
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="exportExcel1" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 1 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 lpk_bank AS d ON d.sid = s.bankSid
+        <where>
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='1'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
+                and o.cardType=#{qw.cardType}
+            </if>
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+        </where>
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="exportExcel2" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
+
+        SELECT
+        o.sid,
+        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
+        o.userName,
+        o.userPhone,
+        s.`name` AS store,
+        b.`name` AS bagName,
+        d.NAME AS bankName,
+        c.`code`,
+        d.sid as dsid,
+        s.sid as ssid,
+        c.serialNumber,
+        case o.cardType
+        when 2 then '亲情菜窖'
+        end cardType
+        FROM
+        lpk_reserve_order AS o
+        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
-        left join lpk_bank as d on d.sid =s.bankSid
+        LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         <where>
-            o.cardType='2'
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='2'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
+                and o.cardType=#{qw.cardType}
+            </if>
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>
@@ -375,7 +627,9 @@
                 and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
             </if>
         </where>
-        union
+        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
+    </select>
+    <select id="exportExcel3" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
         SELECT
         o.sid,
         date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
@@ -389,7 +643,7 @@
         s.sid as ssid,
         c.serialNumber,
         case o.cardType
-        when 3 then '企业卡'
+        when 3 then '企业菜窖'
         end cardType
         FROM
         lpk_reserve_order AS o
@@ -397,7 +651,28 @@
         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 o.cardType='3'
+        <where>
+            1=1
+            <if test="qw.cardType =='' and qw.cardType ==null ">
+                and o.cardType='3'
+            </if>
+            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
+                and o.cardType=#{qw.cardType}
+            </if>
+            <if test="qw.bankSid !='' and qw.bankSid!=null">
+                and s.bankSid=#{qw.bankSid}
+            </if>
+            <if test="qw.store !='' and qw.store!=null">
+                and s.name=#{qw.store}
+            </if>
+            <if test="qw.startDate !='' and qw.startDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d')>=date_format(#{qw.startDate},'%Y-%m-%d')
+            </if>
+            <if test="qw.endDate !='' and qw.endDate!=null">
+                and date_format(o.reserveDate,'%Y-%m-%d') &lt;= date_format(#{qw.endDate},'%Y-%m-%d')
+            </if>
+
+        </where>
         order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
     </select>
     <select id="exportExcelByStore" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExportByStore">
@@ -413,16 +688,14 @@
         d.linkPhone,
         d.address,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType,
         e.name as goodsName
         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
         left join lpk_bank as d on d.sid =s.bankSid
         left join lpk_goods e on e.sid= t.goodsSid
         <where>
@@ -442,16 +715,14 @@
         s.phone as linkPhone,
         s.address,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType,
         e.name as goodsName
         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
         left join lpk_bank as d on d.sid =s.bankSid
         left join lpk_goods e on e.sid= t.goodsSid
         <where>
@@ -468,17 +739,15 @@
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
         case o.cardType
-        when 1 then '家庭卡'
-        when 2 then '亲情卡'
-        when 3 then '企业卡'
+        when 1 then '家庭菜窖'
+        when 2 then '亲情菜窖'
+        when 3 then '企业菜窖'
         end cardType,
         e.name as goodsName
         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
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
         left join lpk_goods e on e.sid= t.goodsSid
         <where>
diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
index c281b76..efd05e6 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
@@ -8,6 +8,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -110,7 +111,16 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
-        IPage<LpkReserveOrderVo> pagging = baseMapper.orderList(page, query);
+        IPage<LpkReserveOrderVo> pagging=new Page<>();
+        if(StringUtils.isBlank(query.getCardType())){
+            pagging= baseMapper.orderList(page, query);
+        }else if(query.getCardType().equals("1")){
+            pagging= baseMapper.orderList1(page, query);
+        }else if(query.getCardType().equals("2")){
+            pagging= baseMapper.orderList2(page, query);
+        }else if(query.getCardType().equals("3")){
+            pagging= baseMapper.orderList3(page, query);
+        }
         List<LpkReserveOrderVo> records = pagging.getRecords();
         if (!records.isEmpty()) {
             records.forEach(s -> {
@@ -142,6 +152,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStore())) {
             qw.like("s.name", query.getStore());
         }
@@ -186,7 +199,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
         qw.eq("1", "1");
-
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStartDate())) {
 
             String startDate = query.getStartDate();
@@ -227,6 +242,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStore())) {
             qw.like("s.name", query.getStore());
         }
@@ -356,7 +374,17 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
 
     public void exportExcel(LpkReserveOrderQuery query) {
         //得到所有要导出的数据
-        List<ReserveOrderExport> exportList = baseMapper.exportExcel(query);
+
+        List<ReserveOrderExport> exportList = new ArrayList<>();
+        if(StringUtils.isBlank(query.getCardType())){
+            exportList= baseMapper.exportExcel( query);
+        }else if(query.getCardType().equals("1")){
+            exportList= baseMapper.exportExcel1( query);
+        }else if(query.getCardType().equals("2")){
+            exportList= baseMapper.exportExcel2( query);
+        }else if(query.getCardType().equals("3")){
+            exportList= baseMapper.exportExcel3( query);
+        }
         List<ReserveOrderExport> exportList1 = new ArrayList<>();
         if (!exportList.isEmpty()) {
             exportList.forEach(s -> {
@@ -437,6 +465,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
     public void exportExcelByStore(LpkReserveOrderQuery query) {
         QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStartDate())) {
             String startDate = query.getStartDate();
             qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
@@ -506,6 +537,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
     public void exportExcelByBank(LpkReserveOrderQuery query) {
         QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStartDate())) {
             String startDate = query.getStartDate();
             qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
@@ -566,6 +600,9 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
     public void exportExcelByZ(LpkReserveOrderQuery query) {
         QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
         qw.eq("1", "1");
+        if (StringUtils.isNotBlank(query.getCardType())) {
+            qw.like("o.cardType", query.getCardType());
+        }
         if (StringUtils.isNotBlank(query.getStartDate())) {
             String startDate = query.getStartDate();
             qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");