Merge branch 'master' of http://gitea.yxtsoft.com/lipinka/yxt-yyth-biz

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

@@ -76,8 +76,8 @@ public class LpkGiftCardRest {
 
     @ApiOperation(value = "礼包卡信息列表导出")
     @PostMapping("/exportExcel")
-    public ResultBean exportExcel(@RequestBody LpkGiftCardListQuery query) {
+    public void exportExcel(@RequestBody LpkGiftCardListQuery query) {
-        return lpkGiftCardService.exportExcel(query);
+         lpkGiftCardService.exportExcel(query);
     }
 
 

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

@@ -309,8 +309,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         return rb.success().setData("成功");
     }
 
-    public ResultBean exportExcel(LpkGiftCardListQuery query) {
+    public void exportExcel(LpkGiftCardListQuery query) {
-        ResultBean rb = ResultBean.fireFail();
+
         String finUrl = "https://supervise.yxtsoft.com/lpkapi?code=";
         QueryWrapper<LpkGiftCard> qw = new QueryWrapper<>();
         qw.eq("1", "1");
@@ -341,6 +341,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 //        }
         //导出提货卡信息列表
         ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
-        return rb.success();
+
     }
 }

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

@@ -61,7 +61,7 @@ public class LpkReserveOrderRest {
 
     @ApiOperation(value = "预约订单信息列表导出")
     @PostMapping("/exportExcel")
-    public ResultBean exportExcel(@RequestBody LpkReserveOrderQuery query) {
+    public void exportExcel(@RequestBody LpkReserveOrderQuery query) {
-        return lpkReserveOrderService.exportExcel(query);
+        lpkReserveOrderService.exportExcel(query);
-    };
+    }
 }

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

@@ -2,6 +2,7 @@ package com.yxt.yyth.biz.lpkreserveorder;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -28,6 +29,7 @@ import com.yxt.yyth.biz.lpkgoods.LpkGoodsService;
 import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
 import com.yxt.yyth.biz.lpkstore.LpkStoreService;
 import org.apache.commons.collections.list.AbstractLinkedList;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -191,8 +193,7 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         return rb.success();
     }
 
-    public ResultBean exportExcel(LpkReserveOrderQuery query) {
+    public void exportExcel(LpkReserveOrderQuery query) {
-        ResultBean rb = ResultBean.fireFail();
         QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
         qw.eq("1", "1");
         if (StringUtils.isNotBlank(query.getStore())) {
@@ -256,6 +257,5 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
 //        }
         //导出预约订单信息列表
         ExportExcelUtils.export(fileNameURL, exportList, ReserveOrderExport.class, response);
-        return rb.success();
     }
 }