From 6c33158e6681d363903c5802f1668e62098aefc0 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 20 Apr 2018 17:46:17 +0800
Subject: [PATCH] fix bug

---
 .../clearing/core/impl/CleanServiceImpl.java       | 11 -----------
 .../merchants/core/impls/ClientManagerImpl.java    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index a7e0060fe..d93c5dab0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -882,17 +882,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         PageList<JSONObject> logs = clearingDetailMapper.listReportsOfSettlementLogs(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("report_date.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
-        if (query.getPage()==1){
-            if (!logs.isEmpty() && logs.size()>0){
-                JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time"));
-                if (sendMailLog == null) {
-                    result.put("padding",true);
-                }
-                if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) {
-                    result.put("padding",true);
-                }
-            }
-        }
         return result;
     }
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 3bbe27eea..1b0638e72 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -14,6 +14,7 @@ import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
 import au.com.royalpay.payment.manage.device.core.DeviceManager;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
 import au.com.royalpay.payment.manage.mappers.log.ClientsOperationLogMapper;
+import au.com.royalpay.payment.manage.mappers.log.LogSettleMailMapper;
 import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper;
 import au.com.royalpay.payment.manage.mappers.redpack.ActClientInvitationCodeMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
@@ -168,6 +169,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Resource
     private OrgMapper orgMapper;
     @Resource
+    private LogSettleMailMapper logSettleMailMapper;
+    @Resource
     private CommoditiesMapper commoditiesMapper;
     @Resource
     private ActClientInvitationCodeMapper actClientInvitationCodeMapper;
@@ -2451,6 +2454,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
+        if (query.getPage()==1){
+            if (!logs.isEmpty() && logs.size()>0){
+                JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time"));
+                if (sendMailLog == null) {
+                    result.put("padding",true);
+                }
+                if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) {
+                    result.put("padding",true);
+                }
+            }
+        }
         return result;
     }