From 5166240edfa484d8768228d702f0b6c48c37660a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 10 Sep 2018 10:10:31 +0800
Subject: [PATCH] add clearing_estimate  : hf

---
 .../core/impls/EstimateAnalysisServiceImpl.java     | 13 ++++++++++++-
 .../templates/settle_estimate_analysis.html         |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
index 2dc8f4195..9521c1680 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
@@ -166,10 +166,21 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
         } else {
             dayInfo.put("t1", 0);
         }
+
+        List<JSONObject> hfSettle = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "hf");
+        if (hfSettle !=null && hfSettle.size()>0) {
+            for (JSONObject logs : hfSettle) {
+                dayInfo.put("hfSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
+                dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("hfSettleFee_" + logs.getString("merchants")));
+            }
+        }else {
+            dayInfo.put("platformGetSettleFee",BigDecimal.ZERO);
+        }
+
         List<JSONObject> alipaySettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "Alipay");
         for (JSONObject logs : alipaySettleLogs) {
             dayInfo.put("aliSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
-            dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants")));
+            dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants"))));
         }
 
         List<JSONObject> alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline");
diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
index 2de2c0e78..96315a7c2 100644
--- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
+++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
@@ -52,6 +52,7 @@
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1487387142"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay" alt="Alipay"/>  到账金额:<a class="text-green" ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.aliOnlineSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline" alt="AliPayOnline"/>  到账金额(AlipayOnline):<a class="text-green" ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a></p>
+                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"> <img src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/>  到账金额:<a class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a></p>
                                                 <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee" style="color: #f06010"> <img src="/static/images/r_logo.svg" style="width: 20px;height: 20px;" uib-tooltip="RoyalPay" alt="RoyalPay"/>  总到账金额:<a class="text-green" ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
                                         </div>
                                         <!-- /.box-body -->