From b3b8f40d034cdc625bc7916b37ec4600b6149015 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sat, 2 Nov 2024 15:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BAPI=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/saleorder/vo/SaleOrderRespVO.java   |  4 ++++
 .../convert/saleorder/SaleOrderConvert.java   |  3 ++-
 .../saleorder/SaleOrderServiceImpl.java       | 21 ++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
index b0aef64..a96745e 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
@@ -88,6 +88,10 @@ public class SaleOrderRespVO {
     @ExcelProperty("货币")
     private String currency;
 
+    @Schema(description = "邮箱")
+    @ExcelProperty("邮箱")
+    private String emails;
+
     @Schema(description = "发票备注")
     @ExcelProperty("发票备注")
     private String invoiceRemarks;
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
index f1dbb47..60c4502 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
@@ -22,7 +22,8 @@ public interface SaleOrderConvert {
            // @Mapping(target = "id", ignore = true),
             @Mapping(source = "invoiceCode", target = "invoiceCode"),
             @Mapping(source = "invoiceName", target = "invoiceName"),
-            @Mapping(source = "address", target = "address")
+            @Mapping(source = "address", target = "address"),
+            @Mapping(source = "emails", target = "emails")
     })
     SaleOrderRespVO convert(SaleOrderDO bean);
 
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 c0665f5..efbfa76 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
@@ -329,13 +329,28 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                         Long saleContractId = generateSaleContract(saleOrder,entrys);
 
                         String htmlContent = generateHtmlContent(saleContractId);
-                        String fileName = StrUtil.format(pdfPath+"/SaleContract_{}",
-                                new Date().getTime());
+
+                        //docker生成路径
+                        String pathUrl = System.getProperty("user.dir") + "/pdffile";
+                        String fileName = StrUtil.format(pathUrl+"/SaleContract_{}", saleOrder.getBillno());
+                        //主宿机生成路径
+                        String fileName2 = StrUtil.format(pdfPath+"/SaleContract_{}", saleOrder.getBillno());
 
                         String templatePath = fileName + ".html";
                         String pdfPath = fileName + ".pdf";
+                        String templatePath2 = fileName2 + ".html";
+                        String pdfPath2 = fileName2 + ".pdf";
+
                         FileUtil.writeString(htmlContent,templatePath, "UTF-8");
-                        WKHtmlToPdfUtil.convert(templatePath, pdfPath);
+
+                        log.info("已生成HTML文件："+templatePath);
+                        //请求wkapp
+                        JSONObject params2 = new JSONObject();
+                        params2.put("input_html_path","file://"+templatePath2);
+                        params2.put("output_pdf_path",pdfPath2);
+                        log.info("请求wkapp接口url："+wkappUrl+"/exehtmltopdf");
+                        String result = HttpUtil.post(wkappUrl + "/exehtmltopdf", params2, 5 * 60 * 1000);
+                        log.info("请求wkapp接口返回结果："+result);
 
                         //发送消息
                         String emails = saleOrder.getEmails();