Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.55</version>
+    <version>2.3.57</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

@@ -455,11 +455,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                             .subtract(params.getBigDecimal("transaction_fee"));
                     //增加货币判断
                     int i = currencyScale(params.getString("clearing_currency"));
-                    total = total.add(tmpClearingAmount);
-                    total_surage = total_surage.add(tmpTotalSurcharge).setScale(i, RoundingMode.HALF_UP);
                     royalpay_surage = royalpay_surage.add(tmpClearingAmount.multiply(channelRate).setScale(i, RoundingMode.HALF_UP));
-                    net_surage = net_surage.add(params.getBigDecimal("channel_surcharge"));
-                    transaction_fee = transaction_fee.add(params.getBigDecimal("transaction_fee"));
 
                     //rpaypmt_overseas_card
                     channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal("rpaypmt_overseas_card" + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
@@ -615,13 +611,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                             dateto = params.getDate("transaction_time");
                         }
                     }
-
-                    total = total.add(tmpClearingAmount);
-                    total_surage = total_surage.add(tmpTotalSurcharge).setScale(i, RoundingMode.HALF_UP);
                     royalpay_surage = royalpay_surage.add(tmpClearingAmount.multiply(channelRate).setScale(i, RoundingMode.HALF_UP));
-                    net_surage = net_surage.add(params.getBigDecimal("channel_surcharge"));
-                    transaction_fee = transaction_fee.add(params.getBigDecimal("transaction_fee"));
-
                     //rpaypmt_overseas_card
                     channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal( "rpaypmt_overseas_card_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
                     tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml

@@ -938,11 +938,11 @@
                t.channel,
                t.surcharge_rate,
                t.transaction_time,
-               if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)     clearing_amount,
-               if(t.transaction_type = 'Credit', t.total_surcharge, -t.total_surcharge)     total_surcharge,
-               if(t.transaction_type = 'Credit', t.transaction_fee, -t.transaction_fee)     transaction_fee,
-               if(t.transaction_type = 'Credit', t.channel_surcharge, -t.channel_surcharge) channel_surcharge,
-               if(t.transaction_type = 'Credit', t.settle_amount, -t.settle_amount)         settle_amount,
+               IF( t.transaction_type = 'Credit', t.clearing_amount,-(if(t.clearing_amount>=0,t.clearing_amount, - t.clearing_amount))) clearing_amount,
+               IF( t.transaction_type = 'Credit', t.total_surcharge, -(if(t.total_surcharge>=0,t.total_surcharge, - t.total_surcharge))) total_surcharge,
+               IF( t.transaction_type = 'Credit', t.transaction_fee, -(if(t.transaction_fee>=0,t.transaction_fee, - t.transaction_fee))) transaction_fee,
+               IF( t.transaction_type = 'Credit', t.channel_surcharge, - (if(t.channel_surcharge>=0,t.channel_surcharge, - t.channel_surcharge))) channel_surcharge,
+               IF( t.transaction_type = 'Credit', t.settle_amount, - (if(t.settle_amount>=0,t.settle_amount, - t.settle_amount)) ) settle_amount,
                t.order_id,
                t.org_rate,
                t.surcharge_cashback,