From c10d5e4a97c28e10cd8d5aa2068194e4617a03e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 14:04:47 +0800
Subject: [PATCH] 修改pdf水印

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |  245 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 217 insertions(+), 28 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index c0b812b..20750b6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -707,11 +707,11 @@
                 orderCancel.setPayType(3);
                 orderCancelService.updateById(orderCancel);
 
-                //添加已收入明细
-                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
-                //添加已收入明细
-                Company company = companyService.selectById(orderPrivateCar.getCompanyId());
-                Double taxi = company.getSpeMoney();
+//                //添加已收入明细
+//                incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
+//                //添加已收入明细
+//                Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+//                Double taxi = company.getSpeMoney();
                 BigDecimal c =new BigDecimal(query.getMoney());//司机收入
                 incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
                 Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1058,11 +1058,32 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
                                 xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
                                 Element xj_chinese = document.getElementById("xj_chinese");
-                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                 pay_type_chinese.text("余额支付");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1106,8 +1127,29 @@
                                 title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
                                 xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
                                 Element xj_english = document.getElementById("xj_english");
-                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_english = document.getElementById("pay_type_english");
                                 pay_type_english.text("I-GO Wallet");
                                 Element pay_money_english = document.getElementById("pay_money_english");
@@ -1151,8 +1193,29 @@
                                 title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
                                 xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
                                 Element xj_french = document.getElementById("xj_french");
-                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_french = document.getElementById("pay_type_french");
                                 pay_type_french.text("Portefeuille I-GO");
                                 Element pay_money_french = document.getElementById("pay_money_french");
@@ -1203,7 +1266,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -1214,7 +1277,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");
@@ -1374,11 +1437,32 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
                                 xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
                                 Element xj_chinese = document.getElementById("xj_chinese");
-                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                 pay_type_chinese.text("现金");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1422,8 +1506,29 @@
                                 title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
                                 xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
                                 Element xj_english = document.getElementById("xj_english");
-                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_english = document.getElementById("pay_type_english");
                                 pay_type_english.text("Cash");
                                 Element pay_money_english = document.getElementById("pay_money_english");
@@ -1467,8 +1572,29 @@
                                 title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
                                 xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
                                 Element xj_french = document.getElementById("xj_french");
-                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_french = document.getElementById("pay_type_french");
                                 pay_type_french.text("En espèces");
                                 Element pay_money_french = document.getElementById("pay_money_french");
@@ -1520,7 +1646,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -1531,7 +1657,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");
@@ -1764,11 +1890,11 @@
                 orderCancelService.updateById(query1);
             }
 
-            //添加已收入明细
-            incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
-            //添加已收入明细
-            Company company = companyService.selectById(orderPrivateCar.getCompanyId());
-            Double taxi = company.getSpeMoney();
+//            //添加已收入明细
+//            incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
+//            //添加已收入明细
+//            Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+//            Double taxi = company.getSpeMoney();
             BigDecimal c =new BigDecimal(query.getAmount());//司机收入
             incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
             Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1878,11 +2004,32 @@
                                 document.getElementById("french").remove();
                                 document.getElementsByTag("title").get(0).text("I-GO电子收据");
                                 Element title_chinese = document.getElementById("title_chinese");
-                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",您在I-GO此订单消费GHS " + orderPrivateCar.getPayMoney());
                                 Element xcf_chinese = document.getElementById("xcf_chinese");
                                 xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_chinese = document.getElementById("yhq_chinese");
+                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+                                    yhq_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_chinese = document.getElementById("zk_chinese");
+                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
+                                    zk_chinese_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_chinese = document.getElementById("hb_chinese");
+                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
+                                    hb_chinese_div.remove();
+                                }
                                 Element xj_chinese = document.getElementById("xj_chinese");
-                                xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_chinese.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_chinese = document.getElementById("pay_type_chinese");
                                 pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : "银行卡支付");
                                 Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -1926,8 +2073,29 @@
                                 title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ",You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
                                 Element xcf_english = document.getElementById("xcf_english");
                                 xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_english = document.getElementById("yhq_english");
+                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_english_div = document.getElementById("yhq_english_div");
+                                    yhq_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_english = document.getElementById("zk_english");
+                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_english_div = document.getElementById("zk_english_div");
+                                    zk_english_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_english = document.getElementById("hb_english");
+                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_english_div = document.getElementById("hb_english_div");
+                                    hb_english_div.remove();
+                                }
                                 Element xj_english = document.getElementById("xj_english");
-                                xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_english.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_english = document.getElementById("pay_type_english");
                                 pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" : "Bank card");
                                 Element pay_money_english = document.getElementById("pay_money_english");
@@ -1971,8 +2139,29 @@
                                 title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
                                 Element xcf_french = document.getElementById("xcf_french");
                                 xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+                                    Element yhq_french = document.getElementById("yhq_french");
+                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
+                                }else{
+                                    Element yhq_french_div = document.getElementById("yhq_french_div");
+                                    yhq_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+                                    Element zk_french = document.getElementById("zk_french");
+                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
+                                }else{
+                                    Element zk_french_div = document.getElementById("zk_french_div");
+                                    zk_french_div.remove();
+                                }
+                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+                                    Element hb_french = document.getElementById("hb_french");
+                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
+                                }else{
+                                    Element hb_french_div = document.getElementById("hb_french_div");
+                                    hb_french_div.remove();
+                                }
                                 Element xj_french = document.getElementById("xj_french");
-                                xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+                                xj_french.text("GHS " + orderPrivateCar.getPayMoney());
                                 Element pay_type_french = document.getElementById("pay_type_french");
                                 pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : "Carte bancaire");
                                 Element pay_money_french = document.getElementById("pay_money_french");
@@ -2024,7 +2213,7 @@
                             fileWriter.write(document.html());
                             fileWriter.flush();
                             fileWriter.close();
-                            FileInputStream fileInputStream = new FileInputStream(file);
+
                             File file1 = new File("/usr/local/nginx/html/files/pdf/");
                             if(!file1.exists()){
                                 file1.mkdirs();
@@ -2035,7 +2224,7 @@
                             }
                             try {
                                 FileOutputStream fileOutputStream = new FileOutputStream(file1);
-                                HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+                                HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream);
                             }catch (Exception e){
                                 e.printStackTrace();
                                 System.out.println("html转pdf异常");

--
Gitblit v1.7.1