From 1d98827bfb296094cebd7c4891c01ef4819af44c Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sat, 2 Nov 2024 11:10:11 +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

---
 .../service/saleorder/SaleOrderServiceImpl.java   | 15 +++++++++++++--
 .../src/main/resources/application.yaml           |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

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 db1a9fa..acb14d3 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
@@ -4,6 +4,7 @@ import cn.hangtag.framework.common.exception.ServiceException;
 import cn.hangtag.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.hangtag.framework.common.pojo.PageResult;
 import cn.hangtag.framework.common.util.FuncUtil;
+import cn.hangtag.framework.common.util.http.HttpUtils;
 import cn.hangtag.framework.common.util.object.BeanUtils;
 import cn.hangtag.framework.common.util.validation.AssertUtil;
 import cn.hangtag.framework.mybatis.core.dataobject.BaseDO;
@@ -60,6 +61,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -137,7 +140,8 @@ public class SaleOrderServiceImpl implements SaleOrderService {
     @Value("${pdfPath}")
     private String pdfPath;
 
-
+    @Value("${wkappurl}")
+    private String wkappUrl;
 
 
     @Override
@@ -487,7 +491,14 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             String templatePath = fileName + ".html";
             String pdfPath = fileName + ".pdf";
             FileUtil.writeString(htmlContent,templatePath, "UTF-8");
-            WKHtmlToPdfUtil.convert(templatePath, pdfPath);
+
+            //请求wkapp
+            JSONObject params = new JSONObject();
+            params.put("input_html_path",templatePath);
+            params.put("output_pdf_path",pdfPath);
+            String result = HttpUtil.post(wkappUrl + "/exehtmltopdf", params, 5 * 60 * 1000);
+            log.info("请求wkapp接口返回结果："+result);
+            //WKHtmlToPdfUtil.convert(templatePath, pdfPath);
             File file = FileUtil.file(pdfPath);
             files.add(file);
             delFiles.add(pdfPath);
diff --git a/hangtag-server/src/main/resources/application.yaml b/hangtag-server/src/main/resources/application.yaml
index 4b9adb6..24291a7 100644
--- a/hangtag-server/src/main/resources/application.yaml
+++ b/hangtag-server/src/main/resources/application.yaml
@@ -279,4 +279,5 @@ oms:
   partyb: 东莞市网络网纳科技有限公司
   partybAddress: 东莞市南城*********
 
-pdfPath: C:\Users\Admin\Desktop\1111111\test
\ No newline at end of file
+pdfPath: C:\Users\Admin\Desktop\1111111\test
+wkappurl: http://127.0.0.1:76/
\ No newline at end of file