|
|
@ -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());
|
|
|
|