|
|
|
@ -295,7 +295,6 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
|
|
|
|
|
|
|
|
|
|
public JSONObject getSystemClearingAmount(Date settle_date, Object settlementLog, String channel) throws Exception {
|
|
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 02:00:00");
|
|
|
|
|
SimpleDateFormat onlineSdf = new SimpleDateFormat("yyyyMMdd 02:00:00");
|
|
|
|
|
JSONObject sysLogs = new JSONObject();
|
|
|
|
|
String start_date = null;
|
|
|
|
|
String end_date = null;
|
|
|
|
@ -312,8 +311,8 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
|
|
|
|
|
} else if (StringUtils.equals("AlipayOnline", channel)) {
|
|
|
|
|
JSONObject alipayOnlineSettleLog = (JSONObject) settlementLog;
|
|
|
|
|
logger.info("AlipayOnline System Settle Logs:" + alipayOnlineSettleLog.getDate("min_time") + "<====>" + alipayOnlineSettleLog.getDate("max_time"));
|
|
|
|
|
start_date = onlineSdf.format(alipayOnlineSettleLog.getDate("min_time"));
|
|
|
|
|
end_date = onlineSdf.format(DateUtils.addDays(alipayOnlineSettleLog.getDate("max_time"), 1));
|
|
|
|
|
start_date = sdf.format(alipayOnlineSettleLog.getDate("min_time"));
|
|
|
|
|
end_date = sdf.format(DateUtils.addDays(alipayOnlineSettleLog.getDate("max_time"), 1));
|
|
|
|
|
} else {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|