|
|
@ -352,6 +352,13 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
|
|
|
|
wechat_rate = new BigDecimal("0.005");
|
|
|
|
wechat_rate = new BigDecimal("0.005");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 2018-09-01后Alipay_Online手续费0.006
|
|
|
|
|
|
|
|
BigDecimal alipay_online_rate;
|
|
|
|
|
|
|
|
if (end_date.compareTo("2018-09-01 02:00:00") <= 0) {
|
|
|
|
|
|
|
|
alipay_online_rate = new BigDecimal("0.018");
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
alipay_online_rate = new BigDecimal("0.006");
|
|
|
|
|
|
|
|
}
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog(start_date, end_date, channel, "Credit", wechat_rate);
|
|
|
|
JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog(start_date, end_date, channel, "Credit", wechat_rate);
|
|
|
|
sysLogs.put("sys_pay_fee", creditLogs.getBigDecimal("aud_amount"));
|
|
|
|
sysLogs.put("sys_pay_fee", creditLogs.getBigDecimal("aud_amount"));
|
|
|
@ -363,7 +370,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
|
|
|
|
if (StringUtils.equals("Alipay", channel)) {
|
|
|
|
if (StringUtils.equals("Alipay", channel)) {
|
|
|
|
sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, new BigDecimal(0.006)));
|
|
|
|
sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, new BigDecimal(0.006)));
|
|
|
|
} else if (StringUtils.equals("AlipayOnline", channel)) {
|
|
|
|
} else if (StringUtils.equals("AlipayOnline", channel)) {
|
|
|
|
sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, new BigDecimal(0.018)));
|
|
|
|
sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, alipay_online_rate));
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
sysLogs.put("sys_surcharge", creditLogs.getBigDecimal("charge_amount").subtract(debitLogs.getBigDecimal("charge_amount")));
|
|
|
|
sysLogs.put("sys_surcharge", creditLogs.getBigDecimal("charge_amount").subtract(debitLogs.getBigDecimal("charge_amount")));
|
|
|
|
}
|
|
|
|
}
|
|
|
|