diff --git a/pom.xml b/pom.xml index 3ec94532f..d79e05eec 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.54 + 2.3.55 UTF-8 2.4.0 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 fe4fb0b6f..581cce80b 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 @@ -505,7 +505,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { json.put("net_charge", net_surage); json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); json.put("royalpay_charge", royalpay_surage); - json.put("org_charge", org_charge); + json.put("org_charge", org_charge.signum()<0?new BigDecimal(0):org_charge); json.put("commission_type", "1"); json.put("create_time", new Date()); amountByChannel.add(json); @@ -697,7 +697,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { if (type == 2) { json.put("org_net_charge", net_surage); } - json.put("org_charge", org_charge); + json.put("org_charge", org_charge.signum()<0?new BigDecimal(0):org_charge); json.put("transaction_fee", transaction_fee); json.put("commission_type", "1"); json.put("create_time", new Date());