diff --git a/pom.xml b/pom.xml
index 82bc6a565..70fe15ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.2.9
+ 1.2.10
UTF-8
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 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 tradeInTypes = JSONObject.parseArray(jsonStr,JSONObject.class);
if(tradeInTypes != null){
return tradeInTypes;
}
List 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 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 topTradePartnersNew = JSONObject.parseArray(jsonStr,JSONObject.class);
if(topTradePartnersNew != null){
return topTradePartnersNew;
}
params.putIfAbsent("rankType", "aud_fee");
List 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 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 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 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;