From 8991e48c62f4d6bbd0f544c347effed406b420bb Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 6 Sep 2019 17:50:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20dashboard=20=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impls/DashboardServiceImpl.java      | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82bc6a565..70fe15ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.9</version>
+    <version>1.2.10</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index a222cf0a8..d2e43a4fa 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -153,13 +153,13 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public List<JSONObject> getTradeInTypes(JSONObject params) {
-        String jsonStr = stringRedisTemplate.boundValueOps("tradeInTypes"+params.getString("begin")+params.getString("end")).get();
+        String jsonStr = stringRedisTemplate.boundValueOps("tradeInTypes"+params.getString("org_id")+ params.getString("begin")).get();
         List<JSONObject> tradeInTypes = JSONObject.parseArray(jsonStr,JSONObject.class);
         if(tradeInTypes != null){
             return tradeInTypes;
         }
         List<JSONObject> res = transactionAnalysisMapper.getTradeAmountInTypes(params);
-        stringRedisTemplate.boundValueOps("tradeInTypes"+params.getString("begin")+params.getString("end")).set(res.toString(), 5, TimeUnit.MINUTES);
+        stringRedisTemplate.boundValueOps("tradeInTypes"+params.getString("org_id")+ params.getString("begin")).set(res.toString(), 5, TimeUnit.MINUTES);
         return res;
     }
 
@@ -173,15 +173,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public List<JSONObject> getTopTradePartnersNew(JSONObject params) {
-        String jsonStr = stringRedisTemplate.boundValueOps("topTradePartnersNew"+params.getString("begin")+params.getString("end")).get();
+        String jsonStr = stringRedisTemplate.boundValueOps("topTradePartnersNew"+params.getString("org_id")+ params.getString("begin")).get();
         List<JSONObject> topTradePartnersNew = JSONObject.parseArray(jsonStr,JSONObject.class);
         if(topTradePartnersNew != null){
             return topTradePartnersNew;
         }
         params.putIfAbsent("rankType", "aud_fee");
         List<JSONObject> res = clientAnalysisMapper.listPartnersTradeAmountNew(params);
-        String a = "b";
-        stringRedisTemplate.boundValueOps("topTradePartnersNew"+params.getString("begin")+params.getString("end")).set(res.toString(), 5, TimeUnit.MINUTES);
+        stringRedisTemplate.boundValueOps("topTradePartnersNew"+params.getString("org_id")+ params.getString("begin")).set(res.toString(), 5, TimeUnit.MINUTES);
         return res;
     }
 
@@ -292,16 +291,16 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public List<JSONObject> getTradeAnalysisInDays(JSONObject params) {
-        if (!params.containsKey("client_ids") && !params.containsKey("org_id")) {
-            params.put("client_id", 0);
-        }
-        String jsonStr = stringRedisTemplate.boundValueOps("tradeAnalysisInDays"+params.getIntValue("client_id")+params.getString("begin")+params.getString("end")).get();
+        String jsonStr = stringRedisTemplate.boundValueOps("tradeAnalysisInDays"+params.getString("org_id")+ params.getString("begin")).get();
         List<JSONObject> tradeAnalysisInDays = JSONObject.parseArray(jsonStr,JSONObject.class);
         if(tradeAnalysisInDays != null){
             return tradeAnalysisInDays;
         }
+        if (!params.containsKey("client_ids") && !params.containsKey("org_id")) {
+            params.put("client_id", 0);
+        }
         List<JSONObject> res = customerAndOrdersStatisticsMapper.getSumCustomersAnalysis(params);
-        stringRedisTemplate.boundValueOps("tradeAnalysisInDays"+params.getIntValue("client_id")+params.getString("begin")+params.getString("end")).set(res.toString(), 5, TimeUnit.MINUTES);
+        stringRedisTemplate.boundValueOps("tradeAnalysisInDays"+params.getString("org_id")+ params.getString("begin")).set(res.toString(), 5, TimeUnit.MINUTES);
         return res;
     }
 
@@ -458,7 +457,6 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
     @Override
     public JSONObject getNewRecord() {
         String jsonStr = stringRedisTemplate.boundValueOps("newRecord").get();
-
         JSONObject newRecord = JSONObject.parseObject(jsonStr);
         if(newRecord != null){
             return newRecord;