|
|
|
@ -54,16 +54,16 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
|
|
|
|
|
@Override
|
|
|
|
|
public JSONObject getChannelSettleLog(String channel) {
|
|
|
|
|
JSONObject sysLogs = new JSONObject();
|
|
|
|
|
JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog5("2018-02-05 02:00:00", sdfNormal.format(new Date()), channel, "Credit");
|
|
|
|
|
JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog5("2018-04-05 02:00:00", sdfNormal.format(new Date()), channel, "Credit");
|
|
|
|
|
sysLogs.put("sys_pay_fee", creditLogs.getBigDecimal("rmb_amount"));
|
|
|
|
|
|
|
|
|
|
JSONObject debitLogs = platformSettlementMapper.calculateSysSettleLog5("2018-02-05 02:00:00", sdfNormal.format(new Date()), channel, "Debit");
|
|
|
|
|
JSONObject debitLogs = platformSettlementMapper.calculateSysSettleLog5("2018-04-05 02:00:00", sdfNormal.format(new Date()), channel, "Debit");
|
|
|
|
|
sysLogs.put("sys_refund_fee", debitLogs.getBigDecimal("rmb_amount"));
|
|
|
|
|
|
|
|
|
|
sysLogs.put("surcharge", creditLogs.getBigDecimal("charge_amount").subtract(debitLogs.getBigDecimal("charge_amount")));
|
|
|
|
|
|
|
|
|
|
sysLogs.put("sys_settle_amount", sysLogs.getBigDecimal("sys_pay_fee").subtract(sysLogs.getBigDecimal("sys_refund_fee")).subtract(sysLogs.getBigDecimal("surcharge")));
|
|
|
|
|
sysLogs.put("start_date","2018-02-05");
|
|
|
|
|
sysLogs.put("start_date","2018-04-05");
|
|
|
|
|
sysLogs.put("end_date",sdfClear.format(new Date()));
|
|
|
|
|
return sysLogs;
|
|
|
|
|
}
|
|
|
|
|