From 1193616476285aa6ee25f21ce32c5bc7ac8cd9b4 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Tue, 11 Aug 2020 14:40:49 +0800
Subject: [PATCH] =?UTF-8?q?upd:=E4=BB=A3=E7=90=86=E5=95=86=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E7=94=9F=E6=88=90=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../core/impls/CityPartnerPrizeServiceImpl.java           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d662731f..ae1dcea8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.57</version>
+    <version>2.3.58</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index 0f4af53bc..73a23b485 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -595,7 +595,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                 if(StringUtils.equals(channel.toLowerCase() + "_rate_value","rpaypmt_card_rate_value")){
                     //rpaypmt_domestic_card
                     BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal("rpaypmt_domestic_card_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
-                    BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));
+                    BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge")
+                            .subtract(params.getBigDecimal("surcharge_cashback"))
+                            .subtract(params.getBigDecimal("transaction_fee"));
                     if (!params.containsKey("transaction_fee") || StringUtils.isEmpty(params.getString("transaction_fee"))) {
                         params.put("transaction_fee", BigDecimal.ZERO);
                     }
@@ -637,7 +639,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                     transaction_fee = transaction_fee.add(params.getBigDecimal("transaction_fee"));
                 }else{
                     BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
-                    BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));
+                    BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge")
+                            .subtract(params.getBigDecimal("surcharge_cashback"))
+                            .subtract(params.getBigDecimal("transaction_fee"));
                     //增加货币判断
                     //增加transaction_fee为null异常
                     if (!params.containsKey("transaction_fee") || StringUtils.isEmpty(params.getString("transaction_fee"))) {