From 447fea52e677628ad50cd134bc72001d78da0ed6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 01:30:46 +0800
Subject: [PATCH] [fix]

---
 .../manage/analysis/beans/AnalysisBean.java   | 24 +++++++++----------
 .../analysis/core/DashboardService.java       |  2 +-
 .../core/impls/DashboardServiceImpl.java      |  2 ++
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
index dc67aed73..65edd513b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
@@ -62,7 +62,7 @@ public class AnalysisBean {
         if (bd_id != null){
             params.put("bd_id",bd_id);
         }
-        if (org_id !=null){
+        if (org_id != null){
             params.put("org_id",org_id);
         }
         if (begin_month != null){
@@ -71,25 +71,25 @@ public class AnalysisBean {
         if (end_month != null){
             params.put("end_month",end_month);
         }
-        if (customer_id!=null && !customer_id.isEmpty()){
-            params.put("customer_id",customer_id.trim());
+        if (customer_id != null && !customer_id.isEmpty()){
+            params.put("customer_id", customer_id.trim());
         }
-        if (rankType!=null){
-            params.put("rankType",rankType);
+        if (rankType != null){
+            params.put("rankType", rankType);
         }
-        if(channel!=null){
-            params.put("channel",channel);
+        if(channel != null){
+            params.put("channel", channel);
         }
-        if(bd_name!=null){
-            params.put("bd_name",bd_name);
+        if(bd_name != null){
+            params.put("bd_name", bd_name);
         }
-        if (client_moniker!=null){
+        if (client_moniker != null){
             params.put("client_moniker", client_moniker);
         }
-        if (amount_from!=null && amount_from.length()>0){
+        if (amount_from != null && amount_from.length() > 0){
             params.put("amount_from", new BigDecimal(amount_from));
         }
-        if (amount_to!=null && amount_to.length()>0){
+        if (amount_to != null && amount_to.length() > 0){
             params.put("amount_to", new BigDecimal(amount_to));
         }
         return params;
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
index eb071d334..53202d7a1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
@@ -22,7 +22,7 @@ public interface DashboardService {
 
     List<JSONObject> getTradeInTypes(JSONObject params);
 
-    List<JSONObject> getTopTradePartners(JSONObject params, int limit);
+    //List<JSONObject> getTopTradePartners(JSONObject params, int limit);
 
     List<JSONObject> getTopTradePartners(JSONObject params);
 
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 97ef7c216..5887c83ea 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
@@ -161,12 +161,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         return transactionAnalysisMapper.getTradeAmountInTypes(params);
     }
 
+    /*
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params, int limit) {
         params.put("rankType", "aud_fee");
         params.put("limit", limit);
         return clientAnalysisMapper.listPartnersTradeAmount(params);
     }
+    */
 
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params) {