From 78aa62f892f62446810f720c22bee93604a0e4cd Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 5 Aug 2020 12:11:52 +1000
Subject: [PATCH] risk control: chargeback

---
 .../core/impls/OrgAnalysisServiceImp.java     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
index 39c91dcae..20f6985ed 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
@@ -1,10 +1,10 @@
 package au.com.royalpay.payment.manage.analysis.core.impls;
 
 import au.com.royalpay.payment.manage.analysis.core.OrgAnalysisService;
-import au.com.royalpay.payment.manage.analysis.mappers.CustomerAndOrdersStatisticsMapper;
 import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
 import au.com.royalpay.payment.manage.mappers.log.StatisticsBDSalesReportMapper;
 import au.com.royalpay.payment.manage.organizations.core.OrgManager;
+import au.com.royalpay.payment.tools.utils.JsonHelper;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Service;
@@ -30,30 +30,26 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
     @Resource
     private OrgManager orgManager;
 
-    @Resource
-    private CustomerAndOrdersStatisticsMapper customerAndOrdersStatisticsMapper;
 
     @Override
-    public List<JSONObject> getSalesAnalysis(JSONObject params,JSONObject manager) {
-        orgManager.checkOrgIds(manager,params);
-        params.put("org_type",0);
-        List<JSONObject> OrgTransaction = statisticsBDSalesReportMapper.getPartnerAmountList(params);
-        List<JSONObject> newOrgTransaction  = new ArrayList<>();
-        OrgTransaction.forEach(item->{
-                newOrgTransaction.add(new JSONObject(){{
-                    put("org_id",item.getString("org_id"));
-                    put("org_name",item.getString("org_name"));
-                    put("amount",item.getString("clearing_amount"));
-                }}
-            );
-        });
+    public List<JSONObject> getSalesAnalysis(JSONObject params, JSONObject manager) {
+        orgManager.checkOrgIds(manager, params);
+        params.put("org_type", 0);
+        List<JSONObject> orgTransactions = statisticsBDSalesReportMapper.getPartnerAmountList(params);
+        List<JSONObject> newOrgTransaction = new ArrayList<>();
+        orgTransactions.forEach(item -> newOrgTransaction.add(JsonHelper.newJson(json -> {
+                    json.put("org_id", item.getString("org_id"));
+                    json.put("org_name", item.getString("org_name"));
+                    json.put("amount", item.getString("clearing_amount"));
+                })
+        ));
         //判断查询的最后一天是否是当日,若是当日,将当日数据添加至结果集内
         SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
         if (sd.format(params.getDate("end")).equals(sd.format(DateUtils.addDays(new Date(), 1)))) {
             params.put("begin", DateUtils.addDays(params.getDate("end"), -1));
-            params.put("end",params.getDate("end"));
+            params.put("end", params.getDate("end"));
             List<JSONObject> todayOrgTransaction = transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params);
-            if(todayOrgTransaction.size()!=0){
+            if (!todayOrgTransaction.isEmpty()) {
                 for (JSONObject todayOrgTransactionItem : todayOrgTransaction) {
                     boolean flag = false;
                     for (JSONObject orgTransaction : newOrgTransaction) {
@@ -64,7 +60,7 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
                         }
                     }
                     if (!flag) {
-                        todayOrgTransactionItem.put("amount",todayOrgTransactionItem.getString("clearing_amount"));
+                        todayOrgTransactionItem.put("amount", todayOrgTransactionItem.getString("clearing_amount"));
                         newOrgTransaction.add(todayOrgTransactionItem);
                     }
                 }