代理商生成数据异常修改

master
dulingling 4 years ago
parent 98a397fa3b
commit 5c66a634ef

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.54</version> <version>2.3.55</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

@ -505,7 +505,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
json.put("net_charge", net_surage); json.put("net_charge", net_surage);
json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value"));
json.put("royalpay_charge", royalpay_surage); 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("commission_type", "1");
json.put("create_time", new Date()); json.put("create_time", new Date());
amountByChannel.add(json); amountByChannel.add(json);
@ -697,7 +697,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
if (type == 2) { if (type == 2) {
json.put("org_net_charge", net_surage); 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("transaction_fee", transaction_fee);
json.put("commission_type", "1"); json.put("commission_type", "1");
json.put("create_time", new Date()); json.put("create_time", new Date());

Loading…
Cancel
Save