From 01ab7a07f72d3068a9c31d87e4376b13097ef44f Mon Sep 17 00:00:00 2001
From: yf <770153798@qq.com>
Date: Mon, 20 Jan 2025 09:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/impl/KeywordSearchHandler.java    |  3 +-
 .../saleorder/SaleOrderServiceImpl.java       | 45 ++++++++++---------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/base/controller/admin/keyword/handler/impl/KeywordSearchHandler.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/base/controller/admin/keyword/handler/impl/KeywordSearchHandler.java
index 5fbd923..6f4a60e 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/base/controller/admin/keyword/handler/impl/KeywordSearchHandler.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/base/controller/admin/keyword/handler/impl/KeywordSearchHandler.java
@@ -42,6 +42,7 @@ public class KeywordSearchHandler {
                 Page page = new Page();
                 page.setSize(maxCount);
                 LambdaQueryWrapper<ProductInfoDO> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.select(ProductInfoDO::getCode, ProductInfoDO::getBrandId,BaseDO::getDeleted);
                 if(FuncUtil.isNotEmpty(keyword)){
                     queryWrapper.like(ProductInfoDO::getCode, keyword);
                 }
@@ -49,7 +50,7 @@ public class KeywordSearchHandler {
                     queryWrapper.eq(ProductInfoDO::getBrandId, filter);
                 }
                 queryWrapper.eq(BaseDO::getDeleted,false);
-                queryWrapper.groupBy(ProductInfoDO::getCode);
+                queryWrapper.groupBy(ProductInfoDO::getCode,BaseDO::getDeleted,ProductInfoDO::getBrandId);
                 Page<ProductInfoDO> page1 = productInfoMapper.selectPage(page, queryWrapper);
                 List<ProductInfoDO> records = page1.getRecords();
                 List<KeywordResultVO> res = new ArrayList<>();
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index d0b2dc2..f9396a2 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -1259,31 +1259,36 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             throw exception(ErrorCodeConstants.SALE_ORDER_NOT_FILE_EXPORT);
         }
 
-        String zipFileName = StrUtil.format(pathUrl + "/订单稿件_{}", new Date().getTime());
+        String zipFileName = StrUtil.format(targetPath + "/订单稿件_{}.zip", new Date().getTime());
 
         // 压缩到的位置
-        File zipFile = new File(zipFileName + ".zip");
+        File zipFile = new File(zipFileName);
+        if(zipFile.exists()){
+            System.out.println("文件："+zipFileName);
+            ZipUtil.zip(zipFile, false, files.toArray(new File[files.size()]));
 
-        ZipUtil.zip(zipFile, false, files.toArray(new File[files.size()]));
+            // 设置响应类型
+            //response.setContentType("application/pdf");
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(zipFile.getName(), "UTF-8"));
 
-        // 设置响应类型
-        //response.setContentType("application/pdf");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(zipFile.getName(), "UTF-8"));
-
-        // 输出PDF到响应输出流
-        // 将文件内容写入响应流
-        try (InputStream inputStream = new FileInputStream(zipFile)) {
-            IoUtil.copy(inputStream, response.getOutputStream());
-        } catch (IOException e) {
-            // 异常处理
-            log.info("导出销售合约写入流失败，{}", e.getMessage());
-        }
-        // 导出完删除
-        delFiles.add(zipFileName);
-        for (String delFile : delFiles) {
-            FileUtil.del(delFile);
+            // 输出PDF到响应输出流
+            // 将文件内容写入响应流
+            try (InputStream inputStream = new FileInputStream(zipFile)) {
+                IoUtil.copy(inputStream, response.getOutputStream());
+            } catch (IOException e) {
+                // 异常处理
+                log.info("写入流失败，{}", e.getMessage());
+            }
+            // 导出完删除
+            delFiles.add(zipFileName);
+            for (String delFile : delFiles) {
+                FileUtil.del(delFile);
+            }
+        }else {
+            System.out.println("文件不存在");
         }
+
     }
 
     /**