From 25ef91379ff9797e544009adf876ddadc5c34ee6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 5 Jun 2019 09:37:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=8E=E6=B8=85=E7=AE=97=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8gst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../core/impl/SurchargeAccountServiceImpl.java                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71698ff44..7802d4737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.0.26</docker-image.version>
+        <docker-image.version>1.0.27</docker-image.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java
index f53d0f34c..fa09f6708 100644
--- a/src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java
@@ -205,9 +205,9 @@ public class SurchargeAccountServiceImpl implements SurchargeAccountService {
             }
         }
         pdfInfo.put("surcharge_wechat", wechatSurcharge);
-        pdfInfo.put("amount_wechat", wechatSurcharge);
+        pdfInfo.put("amount_wechat", wechatSurcharge.add(wechatTaxAmount));
         pdfInfo.put("surcharge_alipay", alipaySurcharge);
-        pdfInfo.put("amount_alipay", alipaySurcharge);
+        pdfInfo.put("amount_alipay", alipaySurcharge.add(alipayTaxAmount));
         pdfInfo.put("amount", wechatSurcharge.add(alipaySurcharge));
         pdfInfo.put("gst", wechatTaxAmount.add(alipayTaxAmount));
         pdfInfo.put("total_amount", (wechatAmount.add(alipayAmount)).setScale(2, RoundingMode.DOWN));