1/11

src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagVo.java

@@ -28,9 +28,13 @@ public class AppletGiftBagVo implements Vo {
     private String remarks;
     private String count;//
     private List<GiftBagGoods> giftBagGoods;
+    private List<recommendRecord> recordList;
 
     public String getPrice() {
         DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+        if(null==price){
+            price="0";
+        }
         return price=decimalFormat.format(Double.valueOf(price));
     }
 }

src/main/java/com/yxt/yyth/api/appletgiftbag/recommendRecord.java

@@ -0,0 +1,12 @@
+package com.yxt.yyth.api.appletgiftbag;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/11 9:29
+ */
+@Data
+public class recommendRecord {
+    private String content;
+}

src/main/java/com/yxt/yyth/api/lpkgiftbag/LpkGiftBagVo.java

@@ -1,10 +1,13 @@
 package com.yxt.yyth.api.lpkgiftbag;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.yyth.api.appletgiftbag.recommendRecord;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/11/21 15:12
@@ -22,4 +25,5 @@ public class LpkGiftBagVo implements Vo {
     private String iconUrl;
     private String isEnable;
     private String isGrounding;
+    private String remarks;
 }

src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java

@@ -67,15 +67,16 @@ public class AppletVo {
 
         ZoneId zoneId = ZoneId.systemDefault();
         Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
+        Date nowDate=new Date();
+//        Date nowDate=DateUtil.parse("2024-01-03 11:43:52");
 //        System.out.println(date);
         //1>2 1 、1<2 -1 、1=2 0
-        int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
+        int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(nowDate)))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
         if(String.valueOf(k).equals("1")){
-            start=sdf.format(DateUtil.offsetDay(new Date(),+2));
+            start=sdf.format(DateUtil.offsetDay(nowDate,+2));
         }else{
-            start=sdf.format(DateUtil.offsetDay(new Date(),+1));
+            start=sdf.format(DateUtil.offsetDay(nowDate,+1));
         }
-
         if(StringUtils.isNotBlank(dateEnd)){
             int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
             if(String.valueOf(i).equals("-1")){

src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java

@@ -35,4 +35,5 @@ public class LpkReserveOrderVo implements Vo {
     private String linker;
     private String linkPhone;
     private String address;
+    private String cardType;
 }

src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java

@@ -22,19 +22,22 @@ public class ReserveOrderExportByBank {
     @ExcelProperty(value = "支行",index = 1)
     private String bankName;
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品名称",index = 2)
+    @ExcelProperty(value = "卡类型",index = 2)
+    private String cardType;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "商品名称",index = 3)
     private String goodsName;
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品数量(份)",index = 3)
+    @ExcelProperty(value = "商品数量(份)",index = 4)
     private String goodsNumber;
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系人",index = 4)
+    @ExcelProperty(value = "联系人",index = 5)
     private String linker;
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系电话",index = 5)
+    @ExcelProperty(value = "联系电话",index = 6)
     private String linkPhone;
     @ColumnWidth(50)
-    @ExcelProperty(value = "地址",index = 6)
+    @ExcelProperty(value = "地址",index = 7)
     private String address;
 
     @ExcelIgnore

src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java

@@ -28,21 +28,23 @@ public class ReserveOrderExportByStore {
     @ColumnWidth(20)
     @ExcelProperty(value = "提货门店",index = 2)
     private String store;
-
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品名称",index = 3)
+    @ExcelProperty(value = "卡类型",index = 3)
+    private String cardType;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "商品名称",index = 4)
     private String goodsName;
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品数量(份)",index = 4)
+    @ExcelProperty(value = "商品数量(份)",index = 5)
     private String goodsNumber;
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系人",index = 5)
+    @ExcelProperty(value = "联系人",index = 6)
     private String linker;
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系电话",index = 6)
+    @ExcelProperty(value = "联系电话",index = 7)
     private String linkPhone;
     @ColumnWidth(50)
-    @ExcelProperty(value = "地址",index = 7)
+    @ExcelProperty(value = "地址",index = 8)
     private String address;
 
     @ExcelIgnore

src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByZ.java

@@ -18,13 +18,16 @@ public class ReserveOrderExportByZ {
     @ColumnWidth(20)
     @ExcelProperty(value = "预约时间",index = 0)
     private String reserveDate;
-
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品名称",index = 1)
+    @ExcelProperty(value = "卡类型",index = 1)
+    private String cardType;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "商品名称",index = 2)
     private String goodsName;
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品数量(份)",index = 2)
+    @ExcelProperty(value = "商品数量(份)",index = 3)
     private String goodsNumber;
+
     @ExcelIgnore
     private String storeSid;
     @ExcelIgnore

src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagRest.java

@@ -70,5 +70,9 @@ public class AppletGiftBagRest {
     public ResultBean getGiftBagBySid(@PathVariable String sid) {
         return AppletGiftBagService.getGiftBagBySid(sid);
     }
-
+    @ApiOperation("共享家庭卡蔬菜详情")
+    @GetMapping("/recommendRecord/{sid}")
+    public ResultBean  recommendRecord(@PathVariable("sid") String sid) {
+        return AppletGiftBagService.recommendRecord(sid);
+    }
 }

src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 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.PagerUtil;
@@ -15,6 +14,8 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yyth.api.appletgiftbag.*;
 import com.yxt.yyth.api.appletgiftbaggoods.AppletGiftBagGoods;
 import com.yxt.yyth.api.appletgiftbag.GiftBagGoods;
+import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagVo;
+import com.yxt.yyth.api.appletgiftbag.recommendRecord;
 import com.yxt.yyth.api.lpkgoods.LpkGoods;
 import com.yxt.yyth.biz.appletgiftbaggoods.AppletGiftBagGoodsService;
 import com.yxt.yyth.biz.lpkgoods.LpkGoodsService;
@@ -245,5 +246,23 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
         String  c= d.setScale(2,BigDecimal.ROUND_HALF_UP).toString();
         return String.valueOf(c);
     }
-
+    public ResultBean  recommendRecord(String sid ) {
+        ResultBean rb=new ResultBean().fail();
+        AppletGiftBagVo vo=new AppletGiftBagVo();
+        AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid",sid));
+        vo.setRemarks(bag.getRemarks());
+        vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl());
+        recommendRecord recommendRecord=new recommendRecord();
+        recommendRecord.setContent("梧桐居助力您获得7斤白菜");
+        recommendRecord recommendRecord1=new recommendRecord();
+        recommendRecord1.setContent("龙助力您获得7斤白菜");
+        recommendRecord recommendRecord2=new recommendRecord();
+        recommendRecord2.setContent("美人助力您获得15斤土豆");
+        List<recommendRecord> list=new ArrayList<>();
+        list.add(recommendRecord);
+        list.add(recommendRecord1);
+        list.add(recommendRecord2);
+        vo.setRecordList(list);
+        return rb.success().setData(vo);
+    }
 }

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -37,9 +37,7 @@ import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord;
 import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto;
 import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcode;
 import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcodeDto;
-import com.yxt.yyth.api.lpkgiftbag.GiftBagGoods;
+import com.yxt.yyth.api.lpkgiftbag.*;
-import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag;
-import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagDto;
 import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo;
 import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoods;
 import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -30,7 +30,10 @@
         c.`code`,
         d.sid as dsid,
         s.sid as ssid,
-        c.serialNumber
+        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
@@ -64,7 +67,10 @@
         c.`code`,
         d.sid as dsid,
         s.sid as ssid,
-        c.serialNumber
+        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
@@ -86,6 +92,29 @@
                 and date_format(o.reserveDate,'%Y-%m-%d') <= 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.yyth.api.lpkreserveorder.LpkReserveOrderVo">
@@ -99,13 +128,20 @@
         sum(t.goodsNumber) as goodsNumber,
         d.linker,
         d.linkPhone,
-        d.address
+        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>
@@ -121,13 +157,20 @@
         sum(t.goodsNumber) as goodsNumber,
         s.linker,
         s.phone as linkPhone,
-        s.address
+        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>
@@ -140,7 +183,13 @@
         s.sid AS storeSid,
         d.NAME AS bankName ,
         t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber
+        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
@@ -148,6 +197,7 @@
         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>
@@ -262,7 +312,10 @@
         d.name as bankName,
         c.`code`,c.serialNumber,
         t.goodsSid as goodsSid,
-        t.goodsNumber as goodsNumber
+        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
@@ -297,7 +350,10 @@
         d.name as bankName,
         c.`code`,c.serialNumber,
         t.goodsSid as goodsSid,
-        t.goodsNumber as goodsNumber
+        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
@@ -319,6 +375,29 @@
                 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.yyth.api.lpkreserveorder.ReserveOrderExportByStore">
@@ -332,13 +411,20 @@
         sum(t.goodsNumber) as goodsNumber,
         d.linker,
         d.linkPhone,
-        d.address
+        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>
@@ -354,13 +440,20 @@
         sum(t.goodsNumber) as goodsNumber,
         s.linker,
         s.phone as linkPhone,
-        s.address
+        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>
@@ -373,7 +466,13 @@
         s.sid AS storeSid,
         d.NAME AS bankName ,
         t.goodsSid as goodsSid,
-        sum(t.goodsNumber) as goodsNumber
+        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
@@ -381,6 +480,7 @@
         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>

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java

@@ -164,19 +164,20 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         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<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<LpkReserveOrderVo> pagging = baseMapper.orderListByStore(page, qw);
-        List<LpkReserveOrderVo> records = pagging.getRecords();
+//        List<LpkReserveOrderVo> records = pagging.getRecords();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (!records.isEmpty()) {
+//        if (!records.isEmpty()) {
-            records.forEach(s -> {
+//            records.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-            });
+//            });
-        }
+//        }
         PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
@@ -202,6 +203,7 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         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");
@@ -211,12 +213,12 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         List<LpkReserveOrderVo> records = pagging.getRecords();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-        if (!records.isEmpty()) {
+//        if (!records.isEmpty()) {
-            records.forEach(s -> {
+//            records.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-            });
+//            });
-        }
+//        }
         PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
@@ -249,17 +251,18 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         qw.orderByAsc("o.reserveDate");
         qw.groupBy("t.goodsSid");
         qw.groupBy("o.reserveDate");
+        qw.groupBy("o.cardType");
 //        qw.groupBy("s.name");
         IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<LpkReserveOrderVo> pagging = baseMapper.orderListByZ(page, qw);
         List<LpkReserveOrderVo> records = pagging.getRecords();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (!records.isEmpty()) {
+//        if (!records.isEmpty()) {
-            records.forEach(s -> {
+//            records.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-            });
+//            });
-        }
+//        }
         PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
@@ -463,12 +466,12 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         List<ReserveOrderExportByStore> exportList = baseMapper.exportExcelByStore(qw);
         List<ReserveOrderExportByStore> exportList1 = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        if (!exportList.isEmpty()) {
+//        if (!exportList.isEmpty()) {
-            exportList.forEach(s -> {
+//            exportList.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-            });
+//            });
-        }
+//        }
         //定义导出的excel名字
         String excelName = "配货信息.xlsx";
         String fileNameURL = "1";
@@ -525,12 +528,12 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         //得到所有要导出的数据
         List<ReserveOrderExportByBank> exportList = baseMapper.exportExcelByBank(qw);
         List<ReserveOrderExportByBank> exportList1 = new ArrayList<>();
-        if (!exportList.isEmpty()) {
+//        if (!exportList.isEmpty()) {
-            exportList.forEach(s -> {
+//            exportList.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-            });
+//            });
-        }
+//        }
         //定义导出的excel名字
         String excelName = "支行汇总信息.xlsx";
         String fileNameURL = "1";
@@ -584,46 +587,46 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         //得到所有要导出的数据
         List<ReserveOrderExportByZ> exportList = baseMapper.exportExcelByZ(qw);
         List<ReserveOrderExportByZ> exportList1 = new ArrayList<>();
-        if (!exportList.isEmpty()) {
+//        if (!exportList.isEmpty()) {
-            exportList.forEach(s -> {
+//            exportList.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//                s.setGoodsName(lpkGoods.getName());
-//                List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate());
+////                List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate());
-//                List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
+////                List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
-//                if (!orderGoods.isEmpty()) {
+////                if (!orderGoods.isEmpty()) {
-//                    int i=0;
+////                    int i=0;
-//                    for (LpkReserveOrderGoods orderGood : orderGoods) {
+////                    for (LpkReserveOrderGoods orderGood : orderGoods) {
-//                        String num = "";
+////                        String num = "";
-//                        String goodsName = "";
+////                        String goodsName = "";
-//                        String finWord = "";
+////                        String finWord = "";
-//                        String unitName = "";
+////                        String unitName = "";
-//                        if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
+////                        if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
-//                            LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
+////                            LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
-//                            if (null != lpkGoods) {
+////                            if (null != lpkGoods) {
-//                                goodsName = lpkGoods.getName();
+////                                goodsName = lpkGoods.getName();
-//                                if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
+////                                if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
-//                                    unitName = lpkGoods.getUnitName();
+////                                    unitName = lpkGoods.getUnitName();
-//                                }
+////                                }
-//                            }
+////                            }
-//                        }
+////                        }
-//                        if (orderGood.getGoodsNumber() != 0) {
+////                        if (orderGood.getGoodsNumber() != 0) {
-//                            num = String.valueOf((int) orderGood.getGoodsNumber());
+////                            num = String.valueOf((int) orderGood.getGoodsNumber());
-//                        }
+////                        }
-//                        finWord =  goodsName+ num + unitName;
+////                        finWord =  goodsName+ num + unitName;
-//                        i++;
+////                        i++;
-//                        if(i>1){
+////                        if(i>1){
-//                            ReserveOrderExportByBank en=new ReserveOrderExportByBank();
+////                            ReserveOrderExportByBank en=new ReserveOrderExportByBank();
-//                            BeanUtil.copyProperties(s,en , "id");
+////                            BeanUtil.copyProperties(s,en , "id");
-//                            en.setGoodsInfo(finWord);
+////                            en.setGoodsInfo(finWord);
-//                            exportList1.add(en);
+////                            exportList1.add(en);
-//                        }else{
+////                        }else{
-//                            s.setGoodsInfo(finWord);
+////                            s.setGoodsInfo(finWord);
-//                            exportList1.add(s);
+////                            exportList1.add(s);
-//                        }
+////                        }
-//                    }
+////                    }
-//                }
+////                }
-            });
+//            });
-        }
+//        }
         //定义导出的excel名字
         String excelName = "支行汇总信息.xlsx";
         String fileNameURL = "1";