upd:代理商提成生成数据异常修改

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>

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"))) {