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

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

diff --git a/pom.xml b/pom.xml
index 3ec94532f..d79e05eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.54</version>
+    <version>2.3.55</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 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());