From 7f0c42f3b9137a7df92055058da649d3aae55beb Mon Sep 17 00:00:00 2001 From: Tayl0r <519104047@qq.com> Date: Thu, 1 Mar 2018 14:43:17 +0800 Subject: [PATCH] =?UTF-8?q?[Y]=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E6=B8=85=E7=AE=97=E9=A2=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/PlatformClearAnalysisServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java index 16ff14059..7bba88849 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java @@ -17,6 +17,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -294,6 +295,7 @@ 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; @@ -308,7 +310,9 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService { end_date = sdf.format(wechatSettleLog.getEnd()); logger.info("Wechat System Settle Logs:" + start_date + "<====>" + end_date); } else if (StringUtils.equals("AlipayOnline", channel)) { - + JSONObject alipayOnlineSettleLog = (JSONObject) settlementLog; + start_date = onlineSdf.format(alipayOnlineSettleLog.getDate("min_date")); + end_date = onlineSdf.format(DateUtils.addDays(alipayOnlineSettleLog.getDate("max_date"), 1)); } else { return null; }