[Y] 修复清算预估

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

@@ -174,7 +174,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
             params.put("settlement_fee", settleFee.getBigDecimal("settlement_fee"));
             params.put("channel", channel);
             params.put("last_update_date", new Date());
-            JSONObject sysClearData = getSystemClearingAmount(dateStr, null, channel);
+            JSONObject sysClearData = getSystemClearingAmount(dateStr, aliSettleLog, channel);
             if (sysClearData != null && sysClearData.size() > 0) {
                 params.put("sys_pay_fee", sysClearData.getBigDecimal("sys_pay_fee"));
                 params.put("sys_refund_fee", sysClearData.getBigDecimal("sys_refund_fee"));
@@ -292,22 +292,23 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
         return alipaySettleLog;
     }
 
-    public JSONObject getSystemClearingAmount(Date settle_date, SettlementLog settlementLog, String channel) throws Exception {
+    public JSONObject getSystemClearingAmount(Date settle_date, Object settlementLog, String channel) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 02:00:00");
         JSONObject sysLogs = new JSONObject();
         String start_date = null;
         String end_date = null;
         if (StringUtils.equals("Alipay", channel)) {
-
             JSONObject lastClearDay = estimateAnalysisMapper.findLastCleanDays(sdfClear.format(settle_date), 1);
             start_date = sdf.format(lastClearDay.getDate("date_str"));
             end_date = sdf.format(settle_date);
             logger.info("Alipay System Settle Logs:" + start_date + "<====>" + end_date);
-
         } else if (StringUtils.equals("Wechat", channel)) {
-            start_date = sdf.format(settlementLog.getStart());
+            SettlementLog wechatSettleLog = (SettlementLog) settlementLog;
-            end_date = sdf.format(settlementLog.getEnd());
+            start_date = sdf.format(wechatSettleLog.getStart());
+            end_date = sdf.format(wechatSettleLog.getEnd());
             logger.info("Wechat System Settle Logs:" + start_date + "<====>" + end_date);
+        } else if (StringUtils.equals("AlipayOnline", channel)) {
+
         } else {
             return null;
         }