Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java

@@ -154,6 +154,7 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         //T1 ok
         JSONObject dayInfo = new JSONObject();
+        dayInfo.put("platformGetSettleFee", BigDecimal.ZERO);
         String endStr = DateFormatUtils.format(date, "yyyy/MM/dd");
         JSONObject maxDays = estimateAnalysisMapper.findMaxCleanDays(endStr);
         String end_date = maxDays.getString("date_str");
@@ -172,6 +173,7 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
         }
 
         List<JSONObject> alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline");
+        logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString());
         for (JSONObject logs : alipayOnlineSettleLogs) {
             dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
             dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants"))));