From 996a3dc15520f60c7ba6e7ce557dbb7311397b23 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 12 Mar 2024 09:37:11 +0800
Subject: [PATCH] 3/12

---
 .../api/lpkgoods/LpkGoodsDetailsVo.java       |   2 +
 .../yxt/yythmall/api/lpkgoods/LpkGoodsVo.java |   2 +
 .../yythmall/biz/lpkgoods/LpkGoodsMapper.xml  |   3 +-
 .../biz/lpkgoods/LpkGoodsService.java         |   1 +
 .../VegeCellarReserveOrderMapper.java         |  20 -
 .../VegeCellarReserveOrderMapper.xml          | 420 +------------
 .../VegeCellarReserveOrderService.java        | 595 ++----------------
 7 files changed, 45 insertions(+), 998 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java
index 5ab45fd..6db9e6f 100644
--- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java
+++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java
@@ -1,6 +1,7 @@
 package com.yxt.yythmall.api.lpkgoods;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,6 +40,7 @@ public class LpkGoodsDetailsVo implements Vo {
     private String stepWeight;
     @ApiModelProperty("阶梯价格")
     private String stepPrice;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String periodValidity;
     private Integer qssl;
     /**
diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java
index dc83a7e..bcdecc6 100644
--- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java
+++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java
@@ -40,4 +40,6 @@ public class LpkGoodsVo implements Vo {
     private String brandName; // 品牌名称';
     private Long categoryId; // 类别ID';
     private String categoryName; // 类别名称';
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String periodValidity;
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
index c12d4f3..6adf7bc 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml
@@ -58,7 +58,8 @@
                number,
                isAppletGrounding,
                brandId,
-               categoryId
+               categoryId,
+               periodValidity
         from lpk_goods
         where sid = #{sid}
     </select>
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
index 5337ebc..a024769 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
@@ -160,6 +160,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         String goodsNum = shoppingCart==null?"0":shoppingCart.getGoodsNumber();
         vo.setGoodsNumber(goodsNum);
         vo.setMefenPrice(removeZeros(String.valueOf(Double.valueOf(lpkGoods.getWeight())*Double.valueOf(lpkGoods.getPrice()))));
+        vo.setPeriodValidity(lpkGoods.getPeriodValidity());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java
index 93c60ca..c0d2b20 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java
@@ -20,13 +20,6 @@ import java.util.List;
  */
 @Mapper
 public interface VegeCellarReserveOrderMapper extends BaseMapper<VegeCellarReserveOrder> {
-//    IPage<VegeCellarReserveOrderVo> orderList(IPage<VegeCellarReserveOrder> page, @Param("qw") VegeCellarReserveOrderQuery qw);
-//    IPage<VegeCellarReserveOrderVo> orderListByStore(IPage<VegeCellarReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
-//    IPage<VegeCellarReserveOrderVo> orderListByBank(IPage<VegeCellarReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
-//    IPage<VegeCellarReserveOrderVo> orderListByZ(IPage<VegeCellarReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
-////    List<VegeCellarReserveOrderCardVo> orderByCardSid(String sid);
-//
-////    IPage<VegeCellarReserveOrderCardVo> orderListByUserSid(IPage<VegeCellarReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
     IPage<VegeCellarReserveOrderVo> orderListByUserSid(IPage<VegeCellarReserveOrder> page, @Param("query") VegeCellarReserveOrderQuery query);
 
     IPage<ReserveOrderVo> pageOfCustomer(IPage<VegeCellarReserveOrder> page,@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
@@ -44,18 +37,5 @@ public interface VegeCellarReserveOrderMapper extends BaseMapper<VegeCellarReser
     IPage<ReserveOrderVo> pageOfAll(IPage<VegeCellarReserveOrder> page,@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
 
     List<ReserveOrderVo> pageOfAll(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
-//
-//    List<ReserveOrderExport> exportExcel(@Param("qw") VegeCellarReserveOrderQuery qw);
-//    List<ReserveOrderExportByStore> exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrderQuery> qw);
-//    List<ReserveOrderExportByBank> exportExcelByBank(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrderQuery> qw);
-//    List<ReserveOrderExportByZ> exportExcelByZ(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrderQuery> qw);
-//    @Select("select sid from lpk_reserve_order where storeSid=#{storeSid} and reserveDate =#{reserveDate}")
-//    List<String> getOrderByStore(@Param("storeSid")String storeSid,@Param("reserveDate")String reserveDate);
-//    @Select("select * from lpk_reserve_order where customerSid =#{sid} order by createTime desc limit 1")
-//    VegeCellarReserveOrderVo getStoreByCustomerSid(@Param("sid") String sid);
-//    @Select("select * from lpk_reserve_order where cardSid =#{sid} order by reserveDate desc limit 1")
-//    VegeCellarReserveOrderVo selByCardSid(@Param("sid") String sid);
-//    @Select("SELECT o.*,st.`name` AS store FROM lpk_reserve_order o LEFT JOIN lpk_store st ON o.storeSid = st.sid  where o.cardSid =#{sid} ORDER BY o.reserveDate desc")
-//    List<VegeCellarReserveOrderCardVo> selOrderByCardSid(@Param("sid") String sid);
 
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
index e60a171..4b24af0 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
@@ -4,239 +4,6 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="storeListPage" resultType="com.yxt.yythmall.api.lpkstore.LpkStoreVo">
-        select
-        sid,
-        date_format(createTime, '%Y-%m-%d') as createTime,
-        code,
-        `name`,
-        address,
-        phone,
-        businessHours
-        from lpk_store
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="orderList" resultType="com.yxt.yythmall.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.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>
-        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>
-            o.cardType='2'
-            <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>
-        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 3 then '企业卡'
-        end cardType
-        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 o.cardType='3'
-        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
-    </select>
-    <select id="orderListByStore" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo">
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        s.`name` as store,
-        s.sid as storeSid,
-        d.name as bankName,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        d.linker,
-        d.linkPhone,
-        d.address,
-        e.`name` as goodsName,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="orderListByBank" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo">
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        s.`name` as store,
-        s.sid as storeSid,
-        d.name as bankName,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        s.linker,
-        s.phone as linkPhone,
-        s.address,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="orderListByZ" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo">
-        SELECT
-        o.sid,
-        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
-        s.`name` AS store,
-        s.sid AS storeSid,
-        d.NAME AS bankName ,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="orderByCardSid" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo">
-        SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-               c.`code`,
-               s.`name`                               as store,
-               b.`name`                               as bagName,
-               o.sid                                  as orderSid
-        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
-        WHERE o.cardSid = #{sid}
-    </select>
-<!--    <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo">-->
-<!--        SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,-->
-<!--        c.`code`,-->
-<!--        case-->
-<!--        when o.reserveDate IS NOT NULL then 1-->
-<!--        end as  type,-->
-<!--        s.`name` as store,-->
-<!--        b.`name` as bagName,-->
-<!--        o.cardSid as cardSid,-->
-<!--        o.sid as orderSid,-->
-<!--        o.userName,-->
-<!--        o.userPhone,c.serialNumber as serialNumber,-->
-<!--        o.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-->
-<!--        <where>-->
-<!--            ${ew.sqlSegment}-->
-<!--        </where>-->
-<!--        ORDER BY reserveDate DESC-->
-<!--    </select>-->
     <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo">
         SELECT
         o.createTime as createTime,
@@ -266,192 +33,7 @@
         </where>
         order by o.reserveDate desc
     </select>
-    <select id="exportExcel" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExport">
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        o.userName,
-        o.userPhone,
-        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,
-        case o.cardType
-        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
-        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.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>
-        union
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        o.userName,
-        o.userPhone,
-        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,
-        case o.cardType
-        when 2 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 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='2'
-            <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>
-        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 3 then '企业卡'
-        end cardType
-        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 o.cardType='3'
-        order by reserveDate asc,dsid desc,ssid desc,serialNumber asc
-    </select>
-    <select id="exportExcelByStore" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExportByStore">
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        s.`name` as store,
-        s.sid as storeSid,
-        d.name as bankName,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        d.linker,
-        d.linkPhone,
-        d.address,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="exportExcelByBank" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExportByBank">
-        select
-        o.sid,
-        date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        s.`name` as store,
-        s.sid as storeSid,
-        d.name as bankName,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        s.linker,
-        s.phone as linkPhone,
-        s.address,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-    <select id="exportExcelByZ" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExportByZ">
-        SELECT
-        o.sid,
-        date_format( o.reserveDate, '%Y-%m-%d' ) AS reserveDate,
-        s.`name` AS store,
-        s.sid AS storeSid,
-        d.NAME AS bankName ,
-        t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber,
-        case o.cardType
-        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>
-            ${ew.sqlSegment}
-        </where>
-    </select>
+
 
     <select id="pageOfCustomer" resultType="com.yxt.yythmall.biz.vegecallerreserveorder.ReserveOrderVo">
         select
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
index c9cc182..7e9c8e2 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
@@ -110,7 +110,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         }
         dto.setVos(vos);
         dto.setCustomerSid(vegeCellarReserveOrder.getCustomerSid());
-        vegetableCellarService.save1Goods(dto);
+        rb=vegetableCellarService.save1Goods(dto);
         return rb;
     }
 
@@ -163,185 +163,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         return true;
     }
 
-    //    @Test
-//    public void isSatAndSun(){
-//        String date="2023-12-11";
-//        DateTime dateTime = DateUtil.parse(date);; // 获取当前时间
-//        int dayOfWeek = dateTime.dayOfWeekEnum().getValue();// 获取星期几（1-7）
-//
-//        System.out.println(dayOfWeek);
-//        if (dayOfWeek == 1 || dayOfWeek == 7) {
-//            System.out.println(dayOfWeek);
-//        } else {
-//            System.out.println(11111);
-//        }
-//    }
-//    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderList(PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        ResultBean rb = ResultBean.fireFail();
-//        VegeCellarReserveOrderQuery query = pq.getParams();
-//        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
-//        IPage<VegeCellarReserveOrderVo> pagging = baseMapper.orderList(page, query);
-//        List<VegeCellarReserveOrderVo> records = pagging.getRecords();
-//        if (!records.isEmpty()) {
-//            records.forEach(s -> {
-//                List<VegeCellarReserveOrderGoods> orderGoods = VegeCellarReserveOrderGoodsService.selByOrderSid(s.getSid());
-//                List<OrderGoodsVo> goodsVoList = new ArrayList<>();
-//                if (!orderGoods.isEmpty()) {
-//                    for (VegeCellarReserveOrderGoods orderGood : orderGoods) {
-//                        OrderGoodsVo goodsVo = new OrderGoodsVo();
-//                        if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
-//                            LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
-//                            if (null != lpkGoods) {
-//                                goodsVo.setGoodName(lpkGoods.getName());
-//                            }
-//                        }
-//                        if (orderGood.getGoodsNumber() != 0) {
-//                            goodsVo.setNum((int) orderGood.getGoodsNumber());
-//                        }
-//                        goodsVoList.add(goodsVo);
-//                    }
-//                }
-//                s.setGoodsVo(goodsVoList);
-//            });
-//        }
-//        PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
-//        return rb.success().setData(p);
-//    }
-//    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByStore(PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        ResultBean rb = ResultBean.fireFail();
-//        VegeCellarReserveOrderQuery query = pq.getParams();
-//        QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankName())) {
-//            qw.like("d.name", query.getBankName());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//
-//        qw.orderByAsc("o.reserveDate");
-//        qw.orderByDesc("d.sid");
-//        qw.orderByDesc("s.sid");
-//        qw.groupBy("o.cardType");
-//        qw.groupBy("o.reserveDate");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("s.name");
-//        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
-//        IPage<VegeCellarReserveOrderVo> pagging = baseMapper.orderListByStore(page, qw);
-////        List<VegeCellarReserveOrderVo> records = pagging.getRecords();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-////        if (!records.isEmpty()) {
-////            records.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-////            });
-////        }
-//        PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
-//        return rb.success().setData(p);
-//    }
-//    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByBank(PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        ResultBean rb = ResultBean.fireFail();
-//        VegeCellarReserveOrderQuery query = pq.getParams();
-//        QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//
-//        qw.groupBy("d.sid");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("o.reserveDate");
-//        qw.groupBy("o.cardType");
-//        qw.orderByAsc("o.reserveDate");
-//        qw.orderByDesc("d.sid");
-//        qw.orderByDesc("s.sid");
-////        qw.groupBy("s.name");
-//        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
-//        IPage<VegeCellarReserveOrderVo> pagging = baseMapper.orderListByBank(page, qw);
-//        List<VegeCellarReserveOrderVo> records = pagging.getRecords();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//
-////        if (!records.isEmpty()) {
-////            records.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-////            });
-////        }
-//        PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
-//        return rb.success().setData(p);
-//    }
-//    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByZ(PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        ResultBean rb = ResultBean.fireFail();
-//        VegeCellarReserveOrderQuery query = pq.getParams();
-//        QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getUserName())) {
-//            qw.like("o.userName", query.getUserName());
-//        }
-//        if (StringUtils.isNotBlank(query.getUserSid())) {
-//            qw.like("o.customerSid", query.getUserSid());
-//        }
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        qw.orderByAsc("o.reserveDate");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("o.reserveDate");
-//        qw.groupBy("o.cardType");
-////        qw.groupBy("s.name");
-//        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
-//        IPage<VegeCellarReserveOrderVo> pagging = baseMapper.orderListByZ(page, qw);
-//        List<VegeCellarReserveOrderVo> records = pagging.getRecords();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-////        if (!records.isEmpty()) {
-////            records.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-////            });
-////        }
-//        PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
-//        return rb.success().setData(p);
-//    }
-//    public ResultBean orderByCardSid(String sid) {
-//        ResultBean rb = ResultBean.fireFail();
-//        List<VegeCellarReserveOrderCardVo> list = baseMapper.orderByCardSid(sid);
-//        return rb.success().setData(list);
-//    }
-//
+
     public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(PagerQuery<VegeCellarReserveOrderQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         VegeCellarReserveOrderQuery query = pq.getParams();
@@ -373,379 +195,36 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
             if(StringUtils.isNotBlank(vo.getReserveCode())){
                 vo.setNewCode(addSpaces(vo.getReserveCode()));
             }
+            ifCancel(vo.getReserveDate());
             vo.setGoodsVo(goodsVo);
         }
 
         PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
-//
-//    public ResultBean orderDetails(String orderSid) {
-//        ResultBean rb = new ResultBean().fail();
-//        VegeCellarReserveOrder VegeCellarReserveOrder = fetchBySid(orderSid);
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        if (null != VegeCellarReserveOrder) {
-//            AppletVo vo = lpkGiftCardMapper.getGifCardBySid(VegeCellarReserveOrder.getCardSid());
-//            if (StringUtils.isNotBlank(VegeCellarReserveOrder.getStoreSid())) {
-//                LpkStore lpkStore = lpkStoreService.fetchBySid(VegeCellarReserveOrder.getStoreSid());
-//                if (null != lpkStore) {
-//                    if (StringUtils.isNotBlank(lpkStore.getName())) {
-//                        vo.setStore(lpkStore.getName());
-//                    }
-//                }
-//            }
-//            if (StringUtils.isNotBlank(VegeCellarReserveOrder.getReserveDate())) {
-//                try {
-//                    Date parse = sdf.parse(VegeCellarReserveOrder.getReserveDate());
-//                    vo.setReserveDate(sdf.format(parse));
-//                } catch (ParseException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//            List<LpkGiftBagGoodsVo> list = lpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid());
-//            List<StoreSelect> l = lpkStoreService.getAllStore().getData();
-//            List<GoodsVo> goodsVos = new ArrayList<>();
-//            list.forEach(s -> {
-//                VegeCellarReserveOrderGoods goods = VegeCellarReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
-//                VegeCellarReserveOrderGoods orderGoods = VegeCellarReserveOrderGoodsService.selByOrderSidAndGoodSid(orderSid, s.getGoodsSid());
-//                GoodsVo goodsVo = new GoodsVo();
-//                goodsVo.setGoods(s.getGoodsName());
-//                goodsVo.setNum(s.getGoodsNumber());
-//                goodsVo.setGoodsSid(s.getGoodsSid());
-//                goodsVo.setPic(fileUploadComponent.getUrlPrefix() + s.getPicUrl());
-//                if (null != goods) {
-//                    if (goods.getGoodsNumber() != s.getGoodsNumber()) {
-//                        goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
-//                        goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
-//                        if (null != orderGoods) {
-//                            goodsVo.setOrderNum(orderGoods.getGoodsNumber());
-//                        }
-//                        goodsVos.add(goodsVo);
-//                    }
-//                } else {
-//                    goodsVo.setLNum(s.getGoodsNumber());
-//                    goodsVo.setSelect(s.getGoodsNumber());
-//                    goodsVos.add(goodsVo);
-//                }
-//            });
-//            vo.setGoodsVos(goodsVos);
-//            vo.setSelect(l);
-//            return rb.success().setData(vo);
-//        }
-//        return rb.success();
-//    }
-//
-//    public void exportExcel(VegeCellarReserveOrderQuery query) {
-//        //得到所有要导出的数据
-//        List<ReserveOrderExport> exportList = baseMapper.exportExcel(query);
-//        List<ReserveOrderExport> exportList1 = new ArrayList<>();
-//        if (!exportList.isEmpty()) {
-//            exportList.forEach(s -> {
-//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-//                s.setGoodsName(lpkGoods.getName());
-////                if (StringUtils.isNotBlank(s.getUserPhone())) {
-//////                    String phone = s.getUserPhone().substring(0, 3) + "****" + s.getUserPhone().substring(7);
-////                    String phone = s.getUserPhone();
-////                    s.setUserPhone(phone);
-////                }
-////                List<VegeCellarReserveOrderGoods> orderGoods = VegeCellarReserveOrderGoodsService.selByOrderSid(s.getSid());
-////                if (!orderGoods.isEmpty()) {
-////                    int i=0;
-////                    for (VegeCellarReserveOrderGoods orderGood : orderGoods) {
-////                        String num = "";
-////                        String goodsName = "";
-////                        String finWord = "";
-////                        String unitName = "";
-////                        if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
-////                            LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
-////                            if (null != lpkGoods) {
-////                                goodsName = lpkGoods.getName();
-////                                if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
-////                                    unitName = lpkGoods.getUnitName();
-////                                }
-////                            }
-////                        }
-////                        if (orderGood.getGoodsNumber() != 0) {
-////                            num = String.valueOf((int) orderGood.getGoodsNumber());
-////                        }
-////                        finWord = goodsName+num + unitName ;
-////                        i++;
-////                        if(i>1){
-////                            ReserveOrderExport en=new ReserveOrderExport();
-////                            BeanUtil.copyProperties(s,en , "id");
-////                            en.setGoodsInfo(finWord);
-////                            exportList1.add(en);
-////                        }else{
-////                            s.setGoodsInfo(finWord);
-////                            exportList1.add(s);
-////                        }
-////                    }
-////                }
-//            });
-//        }
-//        //定义导出的excel名字
-//        //定义导出的excel名字
-//        String excelName = "订单明细.xlsx";
-//        String fileNameURL = "1";
-//        response.setContentType( "application/vnd.ms-excel");
-//        response.setCharacterEncoding("utf8");
-//        response.setHeader("Content-disposition","attachment;filename="+ excelName );
-//        ServletOutputStream outputStream = null;
-//        try {
-//            WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-//
-//            //设置头居中
-//            headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//
-//            //内容策略
-//            WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-//            //设置 水平居中
-//            contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-////            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle);
-//            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle());
-//
-//            EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器
-//                    .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExport.class)
-//                    //是否自动关闭输入流
-//                    .autoCloseStream(Boolean.TRUE)
-////                    .registerWriteHandler(new  MergeStrategy(exportList.size(),1,5))
-//                    .registerWriteHandler(horizontalCellStyleStrategy)
-//                    .sheet().doWrite(exportList);
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-//    public void exportExcelByStore(VegeCellarReserveOrderQuery query) {
-//        QueryWrapper<VegeCellarReserveOrderQuery> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankName())) {
-//            qw.like("s.name", query.getBankName());
-//        }
-//        qw.orderByAsc("o.reserveDate");
-//        qw.orderByDesc("d.sid");
-//        qw.orderByDesc("s.sid");
-//        qw.groupBy("o.reserveDate");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("s.name");
-////        qw.orderByDesc("o.reserveDate");
-////        qw.groupBy("s.name");
-//        //得到所有要导出的数据
-//        List<ReserveOrderExportByStore> exportList = baseMapper.exportExcelByStore(qw);
-//        List<ReserveOrderExportByStore> exportList1 = new ArrayList<>();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-////        if (!exportList.isEmpty()) {
-////            exportList.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-////            });
-////        }
-//        //定义导出的excel名字
-//        String excelName = "配货信息.xlsx";
-//        String fileNameURL = "1";
-//        response.setContentType( "application/vnd.ms-excel");
-//        response.setCharacterEncoding("utf8");
-//        response.setHeader("Content-disposition","attachment;filename="+ excelName );
-//        ServletOutputStream outputStream = null;
-//        try {
-//            WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-//
-//            //设置头居中
-//            headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//
-//            //内容策略
-//            WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-//            //设置 水平居中
-//            contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-////            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle);
-//            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle());
-//
-//            EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器
-//                    .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByStore.class)
-//                    //是否自动关闭输入流
-//                    .autoCloseStream(Boolean.TRUE)
-////                    .registerWriteHandler(new  MergeStrategy(exportList.size(),1,1))
-//                    .registerWriteHandler(horizontalCellStyleStrategy)
-//                    .sheet().doWrite(exportList);
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-//    public void exportExcelByBank(VegeCellarReserveOrderQuery query) {
-//        QueryWrapper<VegeCellarReserveOrderQuery> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        qw.orderByDesc("o.reserveDate");
-//        qw.groupBy("d.sid");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("o.reserveDate");
-////        qw.groupBy("s.name");
-//        //得到所有要导出的数据
-//        List<ReserveOrderExportByBank> exportList = baseMapper.exportExcelByBank(qw);
-//        List<ReserveOrderExportByBank> exportList1 = new ArrayList<>();
-////        if (!exportList.isEmpty()) {
-////            exportList.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-////            });
-////        }
-//        //定义导出的excel名字
-//        String excelName = "支行汇总信息.xlsx";
-//        String fileNameURL = "1";
-//        response.setContentType( "application/vnd.ms-excel");
-//        response.setCharacterEncoding("utf8");
-//        response.setHeader("Content-disposition","attachment;filename="+ excelName );
-//        ServletOutputStream outputStream = null;
-//        try {
-//            WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-//            //设置头居中
-//            headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//            //内容策略
-//            WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-//            //设置 水平居中
-//            contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-////            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle);
-//            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle());
-//
-//            EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器
-//                    .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByBank.class)
-//                    //是否自动关闭输入流
-//                    .autoCloseStream(Boolean.TRUE)
-////                    .registerWriteHandler(new  MergeStrategy(exportList.size(),1,5))
-//                    .registerWriteHandler(horizontalCellStyleStrategy)
-//                    .sheet().doWrite(exportList);
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-//    public void exportExcelByZ(VegeCellarReserveOrderQuery query) {
-//        QueryWrapper<VegeCellarReserveOrderQuery> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        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')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        qw.orderByAsc("o.reserveDate");
-//        qw.groupBy("t.goodsSid");
-//        qw.groupBy("o.reserveDate");
-////        qw.groupBy("s.name");
-//        //得到所有要导出的数据
-//        List<ReserveOrderExportByZ> exportList = baseMapper.exportExcelByZ(qw);
-//        List<ReserveOrderExportByZ> exportList1 = new ArrayList<>();
-////        if (!exportList.isEmpty()) {
-////            exportList.forEach(s -> {
-////                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-////                s.setGoodsName(lpkGoods.getName());
-//////                List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate());
-//////                List<VegeCellarReserveOrderGoods> orderGoods = VegeCellarReserveOrderGoodsService.selInOrderSid(list);
-//////                if (!orderGoods.isEmpty()) {
-//////                    int i=0;
-//////                    for (VegeCellarReserveOrderGoods orderGood : orderGoods) {
-//////                        String num = "";
-//////                        String goodsName = "";
-//////                        String finWord = "";
-//////                        String unitName = "";
-//////                        if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
-//////                            LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
-//////                            if (null != lpkGoods) {
-//////                                goodsName = lpkGoods.getName();
-//////                                if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
-//////                                    unitName = lpkGoods.getUnitName();
-//////                                }
-//////                            }
-//////                        }
-//////                        if (orderGood.getGoodsNumber() != 0) {
-//////                            num = String.valueOf((int) orderGood.getGoodsNumber());
-//////                        }
-//////                        finWord =  goodsName+ num + unitName;
-//////                        i++;
-//////                        if(i>1){
-//////                            ReserveOrderExportByBank en=new ReserveOrderExportByBank();
-//////                            BeanUtil.copyProperties(s,en , "id");
-//////                            en.setGoodsInfo(finWord);
-//////                            exportList1.add(en);
-//////                        }else{
-//////                            s.setGoodsInfo(finWord);
-//////                            exportList1.add(s);
-//////                        }
-//////                    }
-//////                }
-////            });
-////        }
-//        //定义导出的excel名字
-//        String excelName = "支行汇总信息.xlsx";
-//        String fileNameURL = "1";
-//        response.setContentType( "application/vnd.ms-excel");
-//        response.setCharacterEncoding("utf8");
-//        response.setHeader("Content-disposition","attachment;filename="+ excelName );
-//        ServletOutputStream outputStream = null;
-//        try {
-//            WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-//            //设置头居中
-//            headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//            //内容策略
-//            WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-//            //设置 水平居中
-//            contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-////            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle,contentWriteCellStyle);
-//            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle());
-//
-//            EasyExcel//将数据映射到DownloadDTO实体类并响应到浏览器
-//                    .write(new BufferedOutputStream(response.getOutputStream()), ReserveOrderExportByZ.class)
-//                    //是否自动关闭输入流
-//                    .autoCloseStream(Boolean.TRUE)
-////                    .registerWriteHandler(new  MergeStrategy(exportList.size(),1,5))
-//                    .registerWriteHandler(horizontalCellStyleStrategy)
-//                    .sheet().doWrite(exportList);
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-//    public ResultBean<VegeCellarReserveOrderVo> getStoreByCustomerSid(String sid) {
-//        return new ResultBean().success().setData(baseMapper.getStoreByCustomerSid(sid));
-//    }
-//    public ResultBean<VegeCellarReserveOrderVo> selByCardSid(String sid) {
-//        return new ResultBean().success().setData(baseMapper.selByCardSid(sid));
-//    }
-//    public ResultBean<List<VegeCellarReserveOrderCardVo>> selOrderByCardSid(String sid) {
-//        return new ResultBean().success().setData(baseMapper.selOrderByCardSid(sid));
-//    }
+    public boolean ifCancel(Date reserveDate){
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDate today =DateUtil.offsetDay(DateUtil.parse(sdf1.format(reserveDate)),-1).toInstant().atZone(zoneId).toLocalDate(); // 获取今天的日期
+        LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
+        LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
+        Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
+        int k=DateUtil.parse(sdf1.format(date)).compareTo(DateUtil.parse(sdf1.format(new Date())));
+        if(String.valueOf(k).equals("-1")){
+            return false;
+        }
+        return true;
+    }
+
+    public static void main(String[] args) {
+        String reserveDate="2024-03-13 00:00:00";
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDate today =DateUtil.offsetDay(DateUtil.parse(reserveDate),-1).toInstant().atZone(zoneId).toLocalDate(); // 获取今天的日期
+        LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
+        LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
+        Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
+        System.out.println( date);
+    }
 
 
     private QueryWrapper<VegeCellarReserveOrder> buildQuery(LpkReserveOrderQuery query) {
@@ -776,7 +255,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
         return rb.success().setData(pagerVo);
@@ -784,7 +263,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveCustomerExcel>> mapForExcelCustomer(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
         Map<String, List<ReserveCustomerExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -802,7 +281,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveCustomerExcel> listForExcelCustomer(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
         List<ReserveCustomerExcel> volist = new ArrayList<>();
         list.forEach(vo -> {
@@ -817,7 +296,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfStore(page, qw);
         return rb.success().setData(pagerVo);
@@ -825,7 +304,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveStoreExcel>> mapForExcelStore(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
         Map<String, List<ReserveStoreExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -843,7 +322,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveStoreExcel> listForExcelStore(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
         List<ReserveStoreExcel> listRes = new ArrayList<>();
 
@@ -859,7 +338,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfBank(page, qw);
         return rb.success().setData(pagerVo);
@@ -867,7 +346,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveBankExcel>> mapForExcelBank(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
         Map<String, List<ReserveBankExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -885,7 +364,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveBankExcel> listForExcelBank(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
         List<ReserveBankExcel> volist = new ArrayList<>();
         list.forEach(vo -> {
@@ -900,7 +379,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfAll(page, qw);
         return rb.success().setData(pagerVo);
@@ -910,7 +389,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
 
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-        qw.ne("vo.state","2");
+//        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfAll(qw);
         List<ReserveAllExcel> listRes = new ArrayList<>();