From 1e28b924ec89869bc3eb2584819da3590d325b07 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 5 Mar 2020 16:19:44 +0800
Subject: [PATCH 01/26] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86?=
 =?UTF-8?q?=E5=9F=8Eapp=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 .../manage/appclient/core/impls/RetailRSvcServiceImpl.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f708f676..415730784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.84</version>
+    <version>1.3.87</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
index 07cd3ef40..2c5124683 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
@@ -47,8 +47,9 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         JSONObject clientConfig = clientConfigMapper.find(device.getIntValue("client_id"));
-        if (!debug && !clientConfig.getBooleanValue("geek_shop_status")) {
-            throw new BadRequestException("商户未开店");
+        if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id")==9) {
+//            throw new NotFoundException();
+            return new JSONObject();
         }
         JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode);
         if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key"))

From 5fb3e409da2080da4a9f9e416c547d7fecb29068 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 6 Mar 2020 12:13:05 +0800
Subject: [PATCH 02/26] add shortname rsvc

---
 pom.xml                                                     | 2 +-
 .../payment/manage/appclient/beans/RSvcMchBean.java         | 4 ++++
 .../manage/appclient/core/impls/RetailRSvcServiceImpl.java  | 6 +++---
 .../manage/merchants/core/impls/ClientManagerImpl.java      | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 415730784..cbfe4ba4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.87</version>
+    <version>1.3.89</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
index 1ca80e1cb..94e3bb9f0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
@@ -47,6 +47,10 @@ public class RSvcMchBean {
      * 商户名称
      */
     private String merchantName;
+    /**
+     * 商户shortname名称
+     */
+    private String shortName;
     /**
      * 公司地址 address
      */
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
index 2c5124683..1e220b6c3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
@@ -11,6 +11,7 @@ import au.com.royalpay.payment.tools.codec.AESCrypt;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.encryptalgorithm.SignUtils;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
+import au.com.royalpay.payment.tools.exceptions.NotFoundException;
 import au.com.royalpay.payment.tools.mappers.CommonIncrementalChannelMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -47,9 +48,8 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         JSONObject clientConfig = clientConfigMapper.find(device.getIntValue("client_id"));
-        if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id")==9) {
-//            throw new NotFoundException();
-            return new JSONObject();
+        if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id") != 9) {
+            throw new NotFoundException();
         }
         JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode);
         if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key"))
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 ecbe77194..c795264cb 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
@@ -6599,6 +6599,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         RSvcMchBean svcMchBean = new RSvcMchBean();
         svcMchBean.setMerchantNumber(mchInfo.getString("username"));
         svcMchBean.setMerchantName(mchInfo.getString("company_name"));
+        svcMchBean.setShortName(mchInfo.getString("short_name"));
         svcMchBean.setPartnerCode(mchInfo.getString("client_moniker"));
         svcMchBean.setCredentialCode(mchInfo.getString("credential_code"));
         svcMchBean.setPayHost(PlatformEnvironment.getEnv().mainHost());

From 482bb9721d12bdbee3a21c9d3022d11fe36c5248 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 9 Mar 2020 10:41:30 +0800
Subject: [PATCH 03/26] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B0=E8=80=81=E6=B6=88=E8=B4=B9=E8=80=85=E4=BA=BA=E5=A4=B4?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=AF=8F=E6=97=A5=E6=95=B0=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../mappers/TransactionAnalysisMapper.xml     | 46 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbfe4ba4b..139e8631c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.89</version>
+    <version>1.3.90</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 81dab16c5..c71b6d2ae 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -406,10 +406,11 @@
 
     <select id="countNewCustomers" resultType="java.lang.Integer">
         <![CDATA[
-        SELECT COUNT(DISTINCT customer_id) FROM pmt_orders o
+        SELECT COUNT(DISTINCT customer_id) FROM (SELECT o.customer_id FROM pmt_transactions t
+        INNER JOIN pmt_orders o ON o.order_id = t.order_id
         ]]>
         <![CDATA[
-        WHERE o.create_time >= #{begin} AND o.create_time < #{end} AND o.status>4
+        WHERE o.create_time >= #{begin} AND o.create_time < #{end}
         ]]>
         <if test="client_ids!=null">
             AND o.client_id IN
@@ -420,31 +421,30 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and o.org_id in
+        <if test="org_id!=null and org_ids==null">and t.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and t.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
         </if>
         <if test="channel !=null">and o.channel = #{channel}</if>
-        AND EXISTS (
-            <![CDATA[
-            select customer_id from pmt_orders oo where oo.customer_id=o.customer_id
-            and oo.create_time < #{begin} AND oo.status>4
-            ]]>
-            <if test="client_ids!=null">
-                AND oo.client_id IN
-                <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
-                    #{client_id}
-                </foreach>
-            </if>
-            <if test="client_ids==null and client_id != null">
-                and oo.client_id=#{client_id}
-            </if>
-            <if test="org_id!=null and org_ids==null">and oo.org_id=#{org_id}</if>
-            <if test="org_ids!=null">and oo.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
-            </if>
-            <if test="channel !=null">and oo.channel = #{channel}</if>
+        <![CDATA[
+        GROUP BY o.customer_id) p
+        where p.customer_id NOT IN (SELECT o.customer_id FROM pmt_transactions t INNER JOIN pmt_orders o ON o.order_id = t.order_id
+        ]]>
+        <![CDATA[
+        WHERE o.create_time < #{begin}
+        ]]>
+        <if test="client_ids!=null">
+            AND o.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id != null">
+            and o.client_id=#{client_id}
+        </if>
+        <![CDATA[
         )
+        ]]>
     </select>
     <select id="countOldCustomers" resultType="java.lang.Integer">
         <![CDATA[

From b19d14ab7a520f28566336dc82afca51b1fd3b42 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 9 Mar 2020 17:40:39 +0800
Subject: [PATCH 04/26] =?UTF-8?q?Upd:=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B6=88=E8=B4=B9=E8=80=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E7=94=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  2 +-
 .../manage/analysis/core/DashboardService.java   |  2 ++
 .../core/impls/DashboardServiceImpl.java         | 15 +++++++++++++++
 .../payment/manage/dev/web/TestController.java   | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 139e8631c..f2839281c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.90</version>
+    <version>1.3.91</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 237e8ab11..700d78df7 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
@@ -57,6 +57,8 @@ public interface DashboardService {
 
     void generateCustomersAndOrdersStatistics(Date analysisDate);
 
+    void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker);
+
     JSONObject getOrderAndCustomerPerDay(JSONObject partner,AnalysisBean partnerAnalysisBean);
 
     List<JSONObject> getStatisticsCustomersAndOrdersInDays(JSONObject partner, AnalysisBean partnerAnalysisBean);
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 0c558bd7c..af21be50c 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
@@ -488,7 +488,22 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         JSONObject totalObject = new JSONObject();
         totalObject.put("client_id",0);
         generateData(format,date,totalObject);
+    }
 
+    /**
+     * 重新生成执行商户下某日消费者数据
+     * @param analysisDate
+     * @param clientMoniker
+     */
+    public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker){
+        DateFormat format = new SimpleDateFormat("yyyyMMdd");
+        String date = format.format(analysisDate);
+        List<JSONObject> clients =clientMapper.listClients();
+        for (JSONObject client:clients){
+            if(client.getString("client_moniker").equals(clientMoniker)){
+                generateData(format, date, client);
+            }
+        }
     }
 
     private void generateData(DateFormat format, String date, JSONObject client) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index ed634ce60..c8f3671dd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -575,6 +575,22 @@ public class TestController implements ApplicationEventPublisherAware {
                 });
     }
 
+
+    /**
+     * 重新生成执行商户下某日消费者数据
+     * @param date
+     * @param clientMoniker
+     */
+    @GetMapping("/task/analysisCustomerDashboard")
+    public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,String clientMoniker){
+        try {
+            dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientMoniker);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+    }
+
     @ManagerMapping(value = "/reports/ato_reports/royalpay_ato_report_{year}.bttps", role = ManagerRole.DEVELOPER, method = RequestMethod.GET)
     @ReadOnlyConnection
     public void downloadATOReport(@PathVariable String year, HttpServletResponse resp) throws IOException {

From 2b921b92c3ada100b66986e3fa83deea0cb42c64 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 9 Mar 2020 17:49:06 +0800
Subject: [PATCH 05/26] =?UTF-8?q?Upd:=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B6=88=E8=B4=B9=E8=80=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E7=94=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../payment/manage/analysis/core/DashboardService.java      | 2 +-
 .../manage/analysis/core/impls/DashboardServiceImpl.java    | 6 +++---
 .../com/royalpay/payment/manage/dev/web/TestController.java | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2839281c..5242a10a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.91</version>
+    <version>1.3.92</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 700d78df7..ed0a43e65 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
@@ -57,7 +57,7 @@ public interface DashboardService {
 
     void generateCustomersAndOrdersStatistics(Date analysisDate);
 
-    void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker);
+    void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientId);
 
     JSONObject getOrderAndCustomerPerDay(JSONObject partner,AnalysisBean partnerAnalysisBean);
 
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 af21be50c..c5b5c0142 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
@@ -493,14 +493,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
     /**
      * 重新生成执行商户下某日消费者数据
      * @param analysisDate
-     * @param clientMoniker
+     * @param clientId
      */
-    public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientMoniker){
+    public void generateCustomersAndOrdersStatisticsByClientMoniker(Date analysisDate,String clientId){
         DateFormat format = new SimpleDateFormat("yyyyMMdd");
         String date = format.format(analysisDate);
         List<JSONObject> clients =clientMapper.listClients();
         for (JSONObject client:clients){
-            if(client.getString("client_moniker").equals(clientMoniker)){
+            if(client.getString("client_id").equals(clientId)){
                 generateData(format, date, client);
             }
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index c8f3671dd..25a77c46a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -579,12 +579,12 @@ public class TestController implements ApplicationEventPublisherAware {
     /**
      * 重新生成执行商户下某日消费者数据
      * @param date
-     * @param clientMoniker
+     * @param clientId
      */
     @GetMapping("/task/analysisCustomerDashboard")
-    public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,String clientMoniker){
+    public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,@RequestParam("clientId")String clientId){
         try {
-            dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientMoniker);
+            dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientId);
         } catch (ParseException e) {
             e.printStackTrace();
         }

From 7ee7ababe11f6dd689661257d51ea4d88fb030e2 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 02:03:25 +0800
Subject: [PATCH 06/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8B=BE=E9=80=89=E5=8F=91=E9=80=81=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=8F=96=E6=B6=88=E6=AF=8F=E6=97=A5=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/PartnerCardDashboardServiceImp.java |  65 +++++-----
 .../clearing/core/CleanService.java           |   8 +-
 .../clearing/core/impl/CleanServiceImpl.java  | 111 ++++++++----------
 .../clearing/web/SettlementDevController.java |   9 +-
 .../mappers/log/LogSettleMailMapper.java      |   3 +-
 .../manage/support/abafile/ABAFile.java       |  14 +++
 .../templates/mail/settlement_mail.html       |   3 +-
 src/main/ui/static/analysis/clearing-log.js   |  38 +++---
 .../analysis/templates/settlement_detail.html |   4 +-
 .../templates/settlement_send_check_code.html |   7 +-
 .../payment/manage/task/SettleMailTest.java   |   3 +-
 11 files changed, 137 insertions(+), 128 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
index 063e582df..fc60a39c4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
@@ -52,32 +52,33 @@ public class PartnerCardDashboardServiceImp implements PartnerCardDashboardServi
     private LogSettleMailMapper logSettleMailMapper;
     @Resource
     private PaymentApi paymentApi;
+
     @Override
     public JSONObject getCommonAnalysis(String client_moniker) {
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         client.putAll(clientConfigService.find(client.getIntValue("client_id")));
         JSONObject earlistOrder = transactionAnalysisMapper.getEarliestOrder(client.getIntValue("client_id"));
         Date data = new Date();
-        if (earlistOrder != null){
-            client.put("transaction_time", DateFormatUtils.format(earlistOrder.getDate("transaction_time"),"yyyy-MM-dd"));
+        if (earlistOrder != null) {
+            client.put("transaction_time", DateFormatUtils.format(earlistOrder.getDate("transaction_time"), "yyyy-MM-dd"));
         }
-        JSONObject res = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data,"Wechat");
-        JSONObject best_pay = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data,"Bestpay");
-        JSONObject ali_pay = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data,"Alipay");
+        JSONObject res = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data, "Wechat");
+        JSONObject best_pay = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data, "Bestpay");
+        JSONObject ali_pay = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), data, "Alipay");
         JSONObject rate_value = new JSONObject();
-        if (res!= null){
-            rate_value.put("wechat_rate_value",res.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
+        if (res != null) {
+            rate_value.put("wechat_rate_value", res.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
             if (res.getInteger("clean_days") != null) {
                 client.put("clean_days", res.getIntValue("clean_days"));
             }
         }
-        if(best_pay != null){
-            rate_value.put("best_rate_value",best_pay.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
+        if (best_pay != null) {
+            rate_value.put("best_rate_value", best_pay.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
         }
-        if(ali_pay != null){
-            rate_value.put("ali_rate_value",ali_pay.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
+        if (ali_pay != null) {
+            rate_value.put("ali_rate_value", ali_pay.getBigDecimal("rate_value").setScale(1, BigDecimal.ROUND_DOWN));
         }
-        client.put("rate_value",rate_value);
+        client.put("rate_value", rate_value);
         return client;
     }
 
@@ -86,7 +87,7 @@ public class PartnerCardDashboardServiceImp implements PartnerCardDashboardServi
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         Assert.notNull(client);
         JSONObject params = new JSONObject();
-        params.put("client_id",client.getIntValue("client_id"));
+        params.put("client_id", client.getIntValue("client_id"));
         return transactionAnalysisMapper.getTransactionCommonAnalysis(params);
     }
 
@@ -95,7 +96,7 @@ public class PartnerCardDashboardServiceImp implements PartnerCardDashboardServi
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         Assert.notNull(client);
         JSONObject params = new JSONObject();
-        params.put("client_id",client.getIntValue("client_id"));
+        params.put("client_id", client.getIntValue("client_id"));
         return customerAndOrdersStatisticsMapper.getPartnerCustomerAndOrderStatistics(params);
     }
 
@@ -104,16 +105,16 @@ public class PartnerCardDashboardServiceImp implements PartnerCardDashboardServi
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         Assert.notNull(client);
         JSONObject params = new JSONObject();
-        params.put("client_id",client.getIntValue("client_id"));
+        params.put("client_id", client.getIntValue("client_id"));
         return dashboardService.getTradeInTypes(params);
     }
 
     @Override
-    public JSONObject getOrderAndCustomerPerDay(String client_moniker){
+    public JSONObject getOrderAndCustomerPerDay(String client_moniker) {
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         Assert.notNull(client);
         JSONObject params = new JSONObject();
-        params.put("client_id",client.getIntValue("client_id"));
+        params.put("client_id", client.getIntValue("client_id"));
         return customerAndOrdersStatisticsMapper.getAvgOrderAndCustomerStatistics(params);
     }
 
@@ -124,38 +125,38 @@ public class PartnerCardDashboardServiceImp implements PartnerCardDashboardServi
         JSONObject earlistOrder = transactionAnalysisMapper.getEarliestOrder(client.getIntValue("client_id"));
         String timezone = client.getString("timezone");
         AnalysisBean analysisBean = new AnalysisBean();
-        if (earlistOrder != null){
-            analysisBean.setBegin(DateFormatUtils.format(earlistOrder.getDate("transaction_time"),"yyyyMMdd"));
+        if (earlistOrder != null) {
+            analysisBean.setBegin(DateFormatUtils.format(earlistOrder.getDate("transaction_time"), "yyyyMMdd"));
         }
-        analysisBean.setEnd(DateFormatUtils.format(new Date(),"yyyyMMdd"));
+        analysisBean.setEnd(DateFormatUtils.format(new Date(), "yyyyMMdd"));
         JSONObject params = analysisBean.toParams(timezone);
-        params.put("client_id",client.getIntValue("client_id"));
+        params.put("client_id", client.getIntValue("client_id"));
         return dashboardService.getTradeAnalysisInHours(params);
     }
 
     @Override
-    public JSONObject getSettlementLog(String client_moniker,TradeLogQuery query) {
+    public JSONObject getSettlementLog(String client_moniker, TradeLogQuery query) {
         JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
         Assert.notNull(client);
         int client_id = client.getIntValue("client_id");
         String timezone = client.getString("timezone");
         JSONObject earlistOrder = transactionAnalysisMapper.getEarliestOrder(client_id);
-        if (earlistOrder!= null){
-            query.setDatefrom(DateFormatUtils.format(earlistOrder.getDate("transaction_time"),"yyyyMMdd"));
+        if (earlistOrder != null) {
+            query.setDatefrom(DateFormatUtils.format(earlistOrder.getDate("transaction_time"), "yyyyMMdd"));
         }
-        query.setDateto(DateFormatUtils.format(new Date(),"yyyyMMdd"));
+        query.setDateto(DateFormatUtils.format(new Date(), "yyyyMMdd"));
         JSONObject params = query.toParams(timezone);
         params.put("client_id", client_id);
         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 (query.getPage() == 1) {
+            if (!logs.isEmpty()) {
+                List<JSONObject> sendMailLogs = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time"));
+                if (sendMailLogs.isEmpty()) {
+                    result.put("padding", true);
                 }
-                if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) {
-                    result.put("padding",true);
+                if (!sendMailLogs.isEmpty() && sendMailLogs.stream().anyMatch(mail -> mail.getIntValue("mail_status") != 1)) {
+                    result.put("padding", true);
                 }
             }
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
index 2becdc015..7d8560431 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
@@ -43,9 +43,9 @@ public interface CleanService {
 
     void settlementXlsx(Date date, HttpServletResponse response) throws IOException;
 
-    List<JSONObject> getXlsx(Date dt, String bank) throws IOException;
+    List<JSONObject> getXlsx(Date dt, String bank, List<String> clearIds) throws IOException;
 
-    List<ABAFile> getAba(Date dt, String bank) throws IOException;
+    List<ABAFile> getAba(Date dt, String bank, List<String> clearIds) throws IOException;
 
     void settlementAba(Date date, HttpServletResponse response) throws IOException;
 
@@ -79,11 +79,11 @@ public interface CleanService {
     void getTodaySettlementLogs();
 
 
-    JSONObject sendSettlementMail(Date date, String checkCode);
+    JSONObject sendSettlementMail(Date date, List<String> clearIds);
 
     void sendCheckCode(Date date, JSONObject manager);
 
-    JSONObject findLogSettleByDate(Date date);
+    List<JSONObject> findLogSettleByDate(Date date);
 
     JSONObject validTransactions(Date date, boolean fix, boolean b, boolean b1);
 
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 7f1cb41ec..448b871a8 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
@@ -64,7 +64,6 @@ import org.springframework.format.number.CurrencyStyleFormatter;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring5.SpringTemplateEngine;
 
@@ -256,6 +255,12 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 return data;
             }).collect(Collectors.toList());
             log.put("bank_statistics", bankStatistics);
+            if (StringUtils.isNotEmpty(log.getString("plan_detail"))) {
+                try {
+                    log.put("plan_detail", JSON.parseObject(log.getString("plan_detail")));
+                } catch (JSONException ignore) {
+                }
+            }
             log.put("editable", DateUtils.isSameDay(log.getDate("settle_date"), new Date()) && log.getBooleanValue("editable"));
             log.put("channel_analysis", clearingDetailAnalysisMapper.analysisChannelReport(clearingId));
         }
@@ -390,9 +395,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public List<JSONObject> getXlsx(Date dt, String bank) throws IOException {
+    public List<JSONObject> getXlsx(Date dt, String bank, List<String> clearIds) throws IOException {
         List<JSONObject> logs = clearingLogMapper.findByDate(dt);
-        logs = logs.stream().filter(log -> log.getBooleanValue("editable")).collect(Collectors.toList());
+        logs = logs.stream().filter(log -> log.getBooleanValue("editable"))
+                .filter(log -> clearIds.isEmpty() || clearIds.contains(log.getString("clearing_id")))
+                .collect(Collectors.toList());
         if (logs.isEmpty()) {
             throw new NotFoundException();
         }
@@ -486,9 +493,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public List<ABAFile> getAba(Date dt, String bank) {
+    public List<ABAFile> getAba(Date dt, String bank, List<String> clearIds) {
         List<JSONObject> logs = clearingLogMapper.findByDate(dt);
-        logs = logs.stream().filter(log -> log.getBooleanValue("editable")).collect(Collectors.toList());
+        logs = logs.stream().filter(log -> log.getBooleanValue("editable"))
+                .filter(log -> clearIds.isEmpty() || clearIds.contains(log.getString("clearing_id")))
+                .collect(Collectors.toList());
         if (logs.isEmpty()) {
             throw new NotFoundException();
         }
@@ -496,11 +505,19 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         for (JSONObject log : logs) {
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
             details = mergeBatchSettleClients(details);
-            files.addAll(generateSettleAbaFiles(dt, details, log.getDate("operate_time")));
+            String remark = extractSettleRemark(log);
+            files.addAll(generateSettleAbaFiles(dt, details, log.getDate("operate_time"), remark));
         }
         return files.stream().filter(file -> bank.equals(file.bank())).collect(Collectors.toList());
     }
 
+    public String extractSettleRemark(JSONObject log) {
+        return Optional.ofNullable(StringUtils.defaultIfEmpty(log.getString("plan_detail"), null))
+                .map(JSON::parseObject)
+                .map(plan -> StringUtils.defaultIfEmpty(plan.getString("remark"), plan.getString("plan_id")))
+                .orElse("");
+    }
+
     private byte[] generateSettleXlsxFile(Date dt, List<JSONObject> settlements, String bank) throws IOException {
         try (Workbook wb = new XSSFWorkbook()) {
             Sheet sheet = wb.createSheet("Merchant_Settlement_Info_" + DateFormatUtils.format(dt, "yyyyMMdd"));
@@ -536,7 +553,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         for (JSONObject log : logs) {
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
             details = mergeBatchSettleClients(details);
-            files.addAll(generateSettleAbaFiles(dt, details, log.getDate("operate_time")));
+            files.addAll(generateSettleAbaFiles(dt, details, log.getDate("operate_time"), extractSettleRemark(log)));
         }
         OutputStream ous = resp.getOutputStream();
         if (files.size() == 1) {
@@ -580,7 +597,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         resp.addHeader("Content-Disposition", "attachment; filename=" + zipName);
         OutputStream ous = resp.getOutputStream();
 
-        List<ABAFile> abaFiles = generateSettleAbaFiles(settleDate, details, opTime);
+        List<ABAFile> abaFiles = generateSettleAbaFiles(settleDate, details, opTime, extractSettleRemark(clearing));
         try (ZipOutputStream zos = new ZipOutputStream(ous)) {
             for (ABAFile aba : abaFiles) {
                 zos.putNextEntry(new ZipEntry(aba.filename()));
@@ -591,9 +608,12 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         }
     }
 
-    private List<ABAFile> generateSettleAbaFiles(Date dt, List<JSONObject> settlements, Date operateTime) {
+    private List<ABAFile> generateSettleAbaFiles(Date dt, List<JSONObject> settlements, Date operateTime, String remark) {
         List<String> banks = settlements.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
-        return banks.stream().map(bank -> generateSettleAbaFile(bank, dt, settlements)).peek(file -> file.setOperateTime(operateTime)).collect(Collectors.toList());
+        return banks.stream().map(bank -> generateSettleAbaFile(bank, dt, settlements))
+                .peek(file -> file.setOperateTime(operateTime))
+                .peek(file -> file.setRemark(remark))
+                .collect(Collectors.toList());
     }
 
     private ABAFile generateSettleAbaFile(String bank, Date dt, List<JSONObject> settlements) {
@@ -1092,28 +1112,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public JSONObject sendSettlementMail(Date date, String checkCode) {
+    public JSONObject sendSettlementMail(Date date, List<String> clearIds) {
         JSONObject result = new JSONObject();
-        String redisCode = stringRedisTemplate.boundValueOps(reidsCheckCodeKey).get();
-        if (StringUtils.isEmpty(redisCode)) {
-            result.put("result", 1);
-            result.put("msg", "The verification code has expired ，Please send the verification code again");
-            return result;
-        }
-        if (!redisCode.equals(checkCode)) {
-            result.put("result", 1);
-            result.put("msg", "The verification code is incorrect");
-            return result;
-        }
-        JSONObject settleMail = logSettleMailMapper.findByDate(date);
-        if (settleMail != null) {
-            List<JSONObject> emailStatus = mailService.checkEmailStatus(settleMail.getString("email_id"));
-            if (!CollectionUtils.isEmpty(emailStatus) && emailStatus.get(0).getIntValue("status") == 1 && settleMail.getIntValue("mail_status") == 1) {
-                result.put("result", 0);
-                result.put("msg", "Excel has been sent");
-                return result;
-            }
-        }
         try {
             String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
             JSONObject model = new JSONObject();
@@ -1121,7 +1121,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd");
             List<JSONObject> attachList = new ArrayList<>();
             JSONObject attach1 = new JSONObject();
-            List<JSONObject> xlsxFileList = getXlsx(date, "CBA");
+            List<JSONObject> xlsxFileList = getXlsx(date, "CBA", clearIds);
             if (xlsxFileList.size() > 1) {
                 fileName1 += ".zip";
                 attach1.put("content", Base64.encodeBase64String(getZipByteArr(xlsxFileList)));
@@ -1133,7 +1133,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             attachList.add(attach1);
 
             JSONObject attach2 = new JSONObject();
-            List<ABAFile> abaFileList = getAba(date, "CBA");
+            List<ABAFile> abaFileList = getAba(date, "CBA", clearIds);
             String fileName2 = "Merchant_Settlement_Info_aba_" + DateFormatUtils.format(date, "yyyyMMdd");
             if (abaFileList.size() > 1) {
                 fileName2 += ".zip";
@@ -1157,6 +1157,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             Context ctx = new Context();
             ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
             ctx.setVariable("abaFiles", abaFileList);
+            ctx.setVariable("totalAmount", abaFileList.stream().map(ABAFile::getTotalSettleAmount).reduce(BigDecimal::add));
             final String content = thymeleaf.process("mail/settlement_mail", ctx);
             // 测试用地址
             // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
@@ -1164,35 +1165,21 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             JSONObject config = sysConfigManager.getSysConfig();
             String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"), config.getString("settle_mail_cc"), content, attachList);
 
-            if (settleMail == null) {
-                JSONObject settleMailRecord = new JSONObject();
-                settleMailRecord.put("send_date", new Date());
-                settleMailRecord.put("clearing_date", date);
-                settleMailRecord.put("email_id", mailId);
-                if (StringUtils.isEmpty(mailId)) {
-                    result.put("result", 1);
-                    result.put("msg", "System error");
-                    settleMailRecord.put("mail_status", 0);
-                    settleMailRecord.put("notice_status", 0);
-                    logSettleMailMapper.save(settleMailRecord);
-                    return result;
-                } else {
-                    settleMailRecord.put("mail_status", 1);
-                    settleMailRecord.put("notice_status", 0);
-                    logSettleMailMapper.save(settleMailRecord);
-                }
+            JSONObject settleMailRecord = new JSONObject();
+            settleMailRecord.put("send_date", new Date());
+            settleMailRecord.put("clearing_date", date);
+            settleMailRecord.put("email_id", mailId);
+            if (StringUtils.isEmpty(mailId)) {
+                result.put("result", 1);
+                result.put("msg", "System error");
+                settleMailRecord.put("mail_status", 0);
+                settleMailRecord.put("notice_status", 0);
+                logSettleMailMapper.save(settleMailRecord);
+                return result;
             } else {
-                if (!StringUtils.isEmpty(mailId)) {
-                    JSONObject updateRecord = new JSONObject();
-                    updateRecord.put("id", settleMail.getString("id"));
-                    updateRecord.put("mail_status", 1);
-                    updateRecord.put("email_id", mailId);
-                    logSettleMailMapper.update(updateRecord);
-                } else {
-                    result.put("result", 0);
-                    result.put("msg", "System error");
-                    return result;
-                }
+                settleMailRecord.put("mail_status", 1);
+                settleMailRecord.put("notice_status", 0);
+                logSettleMailMapper.save(settleMailRecord);
             }
             sendTaskFinishMessages(ManagerRole.FINANCIAL_STAFF, "清算文件已发送清算方", "发送清算通知");
             clearingLogMapper.lockSettlements(date);
@@ -1246,7 +1233,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public JSONObject findLogSettleByDate(Date date) {
+    public List<JSONObject> findLogSettleByDate(Date date) {
         return logSettleMailMapper.findByDate(date);
     }
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
index ad48c2b8b..8a76ca76c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
@@ -121,14 +121,15 @@ public class SettlementDevController {
         }
     }
 
-    @ManagerMapping(value = "/reports/{date}/send_settlement_xlsx/{checkCode}", role = {ManagerRole.FINANCIAL_STAFF})
-    public JSONObject sendSettlementMail(@PathVariable("date") String date, @PathVariable("checkCode") String checkCode) {
+    @ManagerMapping(value = "/reports/{date}/send_settlement_xlsx", role = {ManagerRole.FINANCIAL_STAFF}, method = RequestMethod.POST)
+    public JSONObject sendSettlementMail(@PathVariable("date") String date, @RequestBody JSONObject data) {
         Date dt = null;
         try {
             dt = dateFormat.parse(date);
         } catch (ParseException e) {
         }
-        return cleanService.sendSettlementMail(dt, checkCode);
+        List<String> clearIds = data.getJSONArray("clearing_ids").toJavaList(String.class);
+        return cleanService.sendSettlementMail(dt, clearIds);
     }
 
     @ManagerMapping(value = "/reports/send_checkcode", role = {ManagerRole.FINANCIAL_STAFF})
@@ -137,7 +138,7 @@ public class SettlementDevController {
     }
 
     @RequestMapping(value = "/reports/{date}/send_status")
-    public JSONObject sendStatus(@PathVariable String date) {
+    public List<JSONObject> sendStatus(@PathVariable String date) {
         Date dt = null;
         try {
             dt = dateFormat.parse(date);
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java
index 3d9bf9e1e..bc1177425 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java
@@ -6,6 +6,7 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by davep on 2016-09-04.
@@ -16,7 +17,7 @@ public interface LogSettleMailMapper {
     @AutoSql(type = SqlType.INSERT)
     void save(JSONObject clearingLog);
 
-    JSONObject findByDate(Date date);
+    List<JSONObject> findByDate(Date date);
 
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject update);
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
index 9e0f0d2e2..889f3d0c5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
@@ -21,6 +21,7 @@ public class ABAFile {
     private List<SettleMerchantInfo> settlements;
     private BigDecimal totalSettleAmount;
     private Date operateTime;
+    private String remark;
 
     public ABAFile(ABAConfig.ABABase base, Date settleDate) {
         this.base = base;
@@ -34,6 +35,15 @@ public class ABAFile {
         totalSettleAmount = totalSettleAmount.add(settleAmount);
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public ABAFile setRemark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
     public boolean manualSending() {
         return base.isManualSending();
     }
@@ -62,6 +72,10 @@ public class ABAFile {
         return format.format(totalSettleAmount);
     }
 
+    public BigDecimal getTotalSettleAmount(){
+        return totalSettleAmount;
+    }
+
     private String generateFinalLine() {
         StringBuilder lineBuilder = new StringBuilder(baseLine);
         lineBuilder.replace(0, 1, "7");
diff --git a/src/main/resources/templates/mail/settlement_mail.html b/src/main/resources/templates/mail/settlement_mail.html
index 3eb798957..6ca340d91 100644
--- a/src/main/resources/templates/mail/settlement_mail.html
+++ b/src/main/resources/templates/mail/settlement_mail.html
@@ -5,11 +5,12 @@
     <br>
     <br>
     <p>Please find the attached settlement files data up to <span th:text="${date}"></span></p>
+    <p th:text="|Total Amount: ${totalAmount}|"></p>
     <p></p>
     <p>File Validation:</p>
     <p>
     <ul>
-        <li th:each="aba : ${abaFiles}" th:text="|${aba.filename()} : ${aba.getTotalSettleAmountStr()}|"></li>
+        <li th:each="aba : ${abaFiles}" th:text="|${aba.filename()}(${aba.getRemark()}) : ${aba.getTotalSettleAmountStr()}|"></li>
     </ul>
     </p>
     <br>
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index f8a642d0f..5ad0a7347 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -323,11 +323,16 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             if ($scope.datePattern == nowStr) {
                 $scope.sendNotice = true;
             }
-            $scope.displaySendCheckCode = function () {
+            $scope.displaySendCheck = function () {
                 $uibModal.open({
                     templateUrl: '/static/analysis/templates/settlement_send_check_code.html',
                     controller: 'settlementSendCheckCodeCtrl',
-                    size: 'sm'
+                    size: 'sm',
+                    resolve: {
+                        settleLogs: function () {
+                            return $scope.detail.logs.filter(log => log.editable);
+                        }
+                    }
                 });
             };
 
@@ -348,15 +353,6 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 })[0];
             };
 
-            $http.get('/sys/settlement/reports/' + $stateParams.date + '/send_status/').then(function (resp) {
-                if (resp.data != null && resp.data.mail_status == 1) {
-                    $scope.hasSentMail = true;
-                }
-            });
-            $scope.$on("sendMailSuccess",
-                function (event, msg) {
-                    $scope.hasSentMail = true;
-                });
 
             $scope.confirmSendSettlementMail = function () {
                 commonDialog.confirm({
@@ -497,7 +493,18 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         };
 
     }]);
-    app.controller('settlementSendCheckCodeCtrl', ['$scope', '$http', '$rootScope', '$stateParams', function ($scope, $http, $rootScope, $stateParams) {
+    app.controller('settlementSendCheckCodeCtrl', ['$scope', '$http', '$rootScope', '$stateParams', 'settleLogs', function ($scope, $http, $rootScope, $stateParams, settleLogs) {
+        $scope.settleLogs = settleLogs.map(log => {
+            let info = {
+                'id': log.clearing_id,
+                'remark': log.plan_detail.remark || log.plan_detail.plan_id,
+                'send': false
+            };
+            return info
+        });
+        $scope.switchSendFlag=function(info){
+            info.send=!info.send
+        };
         $scope.sendCheckCodeButton = false;
         $scope.sendMailButton = false;
         $scope.check_code = '';
@@ -510,12 +517,9 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
 
         $scope.sendSettlementMail = function () {
             $scope.error_msg = '正在发送，请稍后。';
-            if ($scope.check_code == '' || $scope.check_code == null) {
-                $scope.error_msg = '请输入验证码';
-                return;
-            }
             $scope.sendMailButton = true;
-            $http.get('/sys/settlement/reports/' + $stateParams.date + '/send_settlement_xlsx/' + $scope.check_code).then(function (resp) {
+            $http.post('/sys/settlement/reports/' + $stateParams.date + '/send_settlement_xlsx',
+                {clearing_ids:$scope.settleLogs.filter(log=>log.send).map(log=>log.clearing_id)}).then(function (resp) {
                 $scope.error_msg = resp.data.msg;
                 $scope.sendMailButton = false;
                 if (resp.data.result == 0) {
diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html
index 195557b90..3e8a67a2e 100644
--- a/src/main/ui/static/analysis/templates/settlement_detail.html
+++ b/src/main/ui/static/analysis/templates/settlement_detail.html
@@ -29,7 +29,7 @@
                     <i class="fa fa-download"></i> Settlement.aba
                 </a>
                 <button type="button" class="btn btn-warning " ng-if="(('1000'|withRole) && !hasSentMail)&&sendNotice"
-                        data-toggle="modal" ng-click="displaySendCheckCode()">
+                        data-toggle="modal" ng-click="displaySendCheck()">
                     Send Settlement Mail
                 </button>
                 <button class="btn btn-success" ng-if="hasSentMail" disabled="true">
@@ -60,7 +60,7 @@
                                     ng-click="switchSettleBatch(log)"
                                     ng-class="{active:analysisFilter.clearing_id==log.clearing_id}">
                                 <i class="fa fa-lock" ng-if="!log.editable"></i>
-                                <span ng-bind="log.operate_time"></span>
+                                <span ng-bind="'['+(log.plan_detail.remark||log.plan_detail.plan_id)+']'+log.operate_time"></span>
                             </button>
                         </div>
                     </div>
diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 515eb2fa1..630ede11d 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -4,10 +4,9 @@
 <div class="modal-body" style="height: 300px">
     <div class="text-center" >
         <div class="col-sm-12">
-            <input type="text" ng-model="check_code" class="col-sm-6" style="margin-right:7px" required>
-            <button type="button" class="btn btn-default col-sm-5" data-dismiss="modal"
-                    ng-click="sendCheckCode()" ng-disabled="sendCheckCodeButton">发送验证码
-            </button>
+            <ul class="list-group">
+                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">[{{log.remark}}]log.clearing_id</li>
+            </ul>
         </div>
         <div class="col-sm-12">
             <button type="button" class="btn btn-primary" style="width: 100%; margin-top: 30px" data-dismiss="modal"
diff --git a/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java b/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
index 9e597d5ff..dfa5abc8b 100644
--- a/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
@@ -14,6 +14,7 @@ import org.thymeleaf.spring5.SpringTemplateEngine;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -33,7 +34,7 @@ public class SettleMailTest {
     @Test
     public void parse() throws IOException {
         Date date = DateUtils.truncate(new Date(), Calendar.DATE);
-        List<ABAFile> abaFileList = cleanService.getAba(date, "CBA");
+        List<ABAFile> abaFileList = cleanService.getAba(date, "CBA", new ArrayList<>());
 
         Context ctx = new Context();
         ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));

From dc9b211ae3f1ae1d8465a56c973f71023101f9bb Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 09:36:48 +0800
Subject: [PATCH 07/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8B=BE=E9=80=89=E5=8F=91=E9=80=81=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=8F=96=E6=B6=88=E6=AF=8F=E6=97=A5=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/clearing-log.js              | 9 ++-------
 .../analysis/templates/settlement_send_check_code.html   | 5 ++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 5ad0a7347..7173f8632 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -497,6 +497,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         $scope.settleLogs = settleLogs.map(log => {
             let info = {
                 'id': log.clearing_id,
+                'time':log.operate_time,
+                'amount':log.net_amount,
                 'remark': log.plan_detail.remark || log.plan_detail.plan_id,
                 'send': false
             };
@@ -507,13 +509,6 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         };
         $scope.sendCheckCodeButton = false;
         $scope.sendMailButton = false;
-        $scope.check_code = '';
-        $scope.sendCheckCode = function () {
-            $scope.error_msg = '';
-            $http.get('/sys/settlement/reports/send_checkcode').then(function (resp) {
-            });
-            $scope.sendCheckCodeButton = true;
-        };
 
         $scope.sendSettlementMail = function () {
             $scope.error_msg = '正在发送，请稍后。';
diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 630ede11d..0d17de1de 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -5,7 +5,10 @@
     <div class="text-center" >
         <div class="col-sm-12">
             <ul class="list-group">
-                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">[{{log.remark}}]log.clearing_id</li>
+                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
+                    <span>[{{log.remark}}]log.clearing_id</span>
+                    <span class="pull-right" ng-bind="log.net_amount|currency:''"></span>
+                </li>
             </ul>
         </div>
         <div class="col-sm-12">

From e49e7fb960ae02cdd9412cecdbb5d08e5dc9df88 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 11:13:03 +0800
Subject: [PATCH 08/26] feat(settle ui): ui dockerfile

---
 docker/Dockerfile          |  13 +++
 docker/conf.d/default.conf | 212 +++++++++++++++++++++++++++++++++++++
 docker/upstream.conf.tpl   |  12 +++
 3 files changed, 237 insertions(+)
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/conf.d/default.conf
 create mode 100644 docker/upstream.conf.tpl

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 000000000..003fa2a9f
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,13 @@
+FROM nginx:alpine
+
+COPY conf.d /etc/nginx/
+
+COPY ../src/main/ui /var/www/royalpay
+
+COPY upstream.conf.tpl /opt/upstream.conf.tpl
+
+RUN apk add gettext
+
+EXPOSE 80
+
+CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/docker/conf.d/default.conf b/docker/conf.d/default.conf
new file mode 100644
index 000000000..34eb9914c
--- /dev/null
+++ b/docker/conf.d/default.conf
@@ -0,0 +1,212 @@
+server {
+    listen 80;
+    server_name _ default;
+    underscores_in_headers on;
+    proxy_ignore_client_abort on;
+    client_max_body_size 0;
+
+    access_log logs/mpay.log;
+
+    location / {
+        root /var/www/royalpay/;
+        try_files $uri $uri/login.html @route;
+    }
+
+    location @route {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+}
+server {
+    listen 3000;
+    server_name _ default;
+
+    location ~ ^/api/v1.0/retail/((?!(app|rsvc)).)+ {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /oauth {
+        proxy_pass http://rpgateway;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+    location /api/v1.0/retail/app {
+        proxy_pass http://rpgateway;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+
+    location ~ ^/api/v1.0/((jd)|(customs)|(alipay)|(rpay)|(yeepay)|(lakala_pay)|(cb_bankpay)|(bestpay)|(hf)|(wechat_jsapi_gateway)|(h5_payment)|(gateway)|(hf_gateway)|(jd_gateway)|(micropay)|(retail_qrcode)|(jsapi_gateway)|(share_code)|(payment))/ {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /static {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+    location /api/wechat {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /api/payment/v1.0/wechat_jsapi_payment/ {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /partner/cashiers/payment {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /client/goods {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+
+    }
+
+    location /goods/payment {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+    location /dev/status {
+        proxy_pass http://rppaycenter;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+    location / {
+        proxy_pass http://rpmanage;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
+}
\ No newline at end of file
diff --git a/docker/upstream.conf.tpl b/docker/upstream.conf.tpl
new file mode 100644
index 000000000..6fe1d4113
--- /dev/null
+++ b/docker/upstream.conf.tpl
@@ -0,0 +1,12 @@
+upstream rpmanage{
+    server ${manage_svc};
+}
+upstream rppaycenter{
+    server ${paycenter_svc};
+}
+upstream rptrans{
+    server ${trans_svc};
+}
+upstream rpgateway{
+    server ${gtway_svc};
+}

From 6863b28f1b386e7b212d3b6fa8145f395982aa11 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 11:18:07 +0800
Subject: [PATCH 09/26] feat(settle ui): ui dockerfile

---
 Dockerfile                               | 13 +++++++++++++
 docker/Dockerfile                        | 13 -------------
 {docker => uidocker}/conf.d/default.conf |  0
 {docker => uidocker}/upstream.conf.tpl   |  0
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 docker/Dockerfile
 rename {docker => uidocker}/conf.d/default.conf (100%)
 rename {docker => uidocker}/upstream.conf.tpl (100%)

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..5cf50efdf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM nginx:alpine
+
+COPY uidocker/conf.d /etc/nginx/
+
+COPY src/main/ui /var/www/royalpay
+
+COPY uidocker/upstream.conf.tpl /opt/upstream.conf.tpl
+
+RUN apk add gettext
+
+EXPOSE 80
+
+CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 003fa2a9f..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM nginx:alpine
-
-COPY conf.d /etc/nginx/
-
-COPY ../src/main/ui /var/www/royalpay
-
-COPY upstream.conf.tpl /opt/upstream.conf.tpl
-
-RUN apk add gettext
-
-EXPOSE 80
-
-CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/docker/conf.d/default.conf b/uidocker/conf.d/default.conf
similarity index 100%
rename from docker/conf.d/default.conf
rename to uidocker/conf.d/default.conf
diff --git a/docker/upstream.conf.tpl b/uidocker/upstream.conf.tpl
similarity index 100%
rename from docker/upstream.conf.tpl
rename to uidocker/upstream.conf.tpl

From 132b7e15ca4166ea352cf3a4703d44d79900b0da Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 11:56:33 +0800
Subject: [PATCH 10/26] feat(settle ui): ui dockerfile

---
 src/main/resources/application-officedev.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application-officedev.properties b/src/main/resources/application-officedev.properties
index 599663cb0..7e08ad4d1 100644
--- a/src/main/resources/application-officedev.properties
+++ b/src/main/resources/application-officedev.properties
@@ -9,4 +9,8 @@ spring.datasource.master.password=rpayplus
 spring.datasource.slave.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.slave.username=root
-spring.datasource.slave.password=rpayplus
\ No newline at end of file
+spring.datasource.slave.password=rpayplus
+
+spring.redis.host=192.168.0.84
+spring.redis.port=6379
+spring.redis.database=9
\ No newline at end of file

From 61bd70e283e8d009f44a40e0efd3722b18078de2 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 12:08:05 +0800
Subject: [PATCH 11/26] feat(settle ui): ui dockerfile

---
 src/main/resources/application-officedev.properties | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application-officedev.properties b/src/main/resources/application-officedev.properties
index 7e08ad4d1..13dbe1448 100644
--- a/src/main/resources/application-officedev.properties
+++ b/src/main/resources/application-officedev.properties
@@ -1,15 +1,17 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.schema-name=royalpay
+spring.datasource.user=root
+spring.datasource.pwd=rpayplus
 spring.datasource.host=192.168.0.84:3306
 spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.master.username=root
-spring.datasource.master.password=rpayplus
+spring.datasource.master.username=${spring.datasource.user}
+spring.datasource.master.password=${spring.datasource.pwd}
 
 spring.datasource.slave.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.slave.username=root
-spring.datasource.slave.password=rpayplus
+spring.datasource.slave.username=${spring.datasource.user}
+spring.datasource.slave.password=${spring.datasource.pwd}
 
 spring.redis.host=192.168.0.84
 spring.redis.port=6379

From 7f38aadc597c66f534e22029f564834b411cd827 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 12:47:06 +0800
Subject: [PATCH 12/26] feat(settle ui): ui dockerfile

---
 Dockerfile                 | 2 +-
 uidocker/upstream.conf.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5cf50efdf..334996983 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ RUN apk add gettext
 
 EXPOSE 80
 
-CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
+CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && cat /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/uidocker/upstream.conf.tpl b/uidocker/upstream.conf.tpl
index 6fe1d4113..2653e9ee0 100644
--- a/uidocker/upstream.conf.tpl
+++ b/uidocker/upstream.conf.tpl
@@ -1,12 +1,12 @@
 upstream rpmanage{
-    server ${manage_svc};
+    server ${MANAGE_SVC};
 }
 upstream rppaycenter{
-    server ${paycenter_svc};
+    server ${PAYCENTER_SVC};
 }
 upstream rptrans{
-    server ${trans_svc};
+    server ${TRANS_SVC};
 }
 upstream rpgateway{
-    server ${gtway_svc};
+    server ${GTWAY_SVC};
 }

From d36bb1a5cb6044e85b55504c6f75f9e78509deeb Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 13:12:06 +0800
Subject: [PATCH 13/26] feat(settle ui): ui dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 334996983..44d1a6226 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM nginx:alpine
 
-COPY uidocker/conf.d /etc/nginx/
+COPY uidocker/conf.d /etc/nginx/conf.d
 
 COPY src/main/ui /var/www/royalpay
 

From 6182f38468ec46f1140ae28efc0273c29414b379 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 13:34:33 +0800
Subject: [PATCH 14/26] feat(settle ui): ui dockerfile

---
 uidocker/conf.d/default.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uidocker/conf.d/default.conf b/uidocker/conf.d/default.conf
index 34eb9914c..e8dd7dba8 100644
--- a/uidocker/conf.d/default.conf
+++ b/uidocker/conf.d/default.conf
@@ -5,7 +5,6 @@ server {
     proxy_ignore_client_abort on;
     client_max_body_size 0;
 
-    access_log logs/mpay.log;
 
     location / {
         root /var/www/royalpay/;

From e51f7e84071b1c2664cc232686c97d5fee447c99 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 13:46:59 +0800
Subject: [PATCH 15/26] feat(settle ui): ui dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 44d1a6226..b42cb9074 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,6 @@ COPY src/main/ui /var/www/royalpay
 
 COPY uidocker/upstream.conf.tpl /opt/upstream.conf.tpl
 
-RUN apk add gettext
-
 EXPOSE 80
 
 CMD envsubst < /opt/upstream.conf.tpl > /etc/nginx/conf.d/upstream.conf && cat /etc/nginx/conf.d/upstream.conf && exec nginx -g 'daemon off;'
\ No newline at end of file

From 381e68467dd14a1d9bf682db4c09d535d086958f Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 14:26:32 +0800
Subject: [PATCH 16/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8B=BE=E9=80=89=E5=8F=91=E9=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=A0=87=E8=AE=B0=E5=B7=B2=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clearing/core/CleanService.java           |  6 +-
 .../clearing/core/impl/CleanServiceImpl.java  | 44 +++++++-------
 .../clearing/web/SettlementDevController.java |  3 +-
 .../manage/mappers/log/ClearingLogMapper.java |  2 +
 .../manage/mappers/log/ClearingLogMapper.xml  | 57 ++++++++++++-------
 src/main/ui/static/analysis/clearing-log.js   |  3 +-
 .../templates/settlement_send_check_code.html |  6 ++
 .../payment/manage/task/SettleMailTest.java   |  3 +-
 8 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
index 7d8560431..f482ed388 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
@@ -43,9 +43,9 @@ public interface CleanService {
 
     void settlementXlsx(Date date, HttpServletResponse response) throws IOException;
 
-    List<JSONObject> getXlsx(Date dt, String bank, List<String> clearIds) throws IOException;
+    List<JSONObject> getXlsx(Date dt, String bank, List<JSONObject> logs) throws IOException;
 
-    List<ABAFile> getAba(Date dt, String bank, List<String> clearIds) throws IOException;
+    List<ABAFile> getAba(Date dt, String bank, List<JSONObject> logs) throws IOException;
 
     void settlementAba(Date date, HttpServletResponse response) throws IOException;
 
@@ -79,7 +79,7 @@ public interface CleanService {
     void getTodaySettlementLogs();
 
 
-    JSONObject sendSettlementMail(Date date, List<String> clearIds);
+    JSONObject sendSettlementMail(Date date, List<String> clearIds, boolean autoMarkSent);
 
     void sendCheckCode(Date date, JSONObject manager);
 
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 448b871a8..68653b481 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
@@ -395,14 +395,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public List<JSONObject> getXlsx(Date dt, String bank, List<String> clearIds) throws IOException {
-        List<JSONObject> logs = clearingLogMapper.findByDate(dt);
-        logs = logs.stream().filter(log -> log.getBooleanValue("editable"))
-                .filter(log -> clearIds.isEmpty() || clearIds.contains(log.getString("clearing_id")))
-                .collect(Collectors.toList());
-        if (logs.isEmpty()) {
-            throw new NotFoundException();
-        }
+    public List<JSONObject> getXlsx(Date dt, String bank, List<JSONObject> logs) throws IOException {
         List<JSONObject> result = new ArrayList<>();
         int fileIndex = 1;
         if (logs.size() > 1) {
@@ -431,6 +424,17 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         return result;
     }
 
+    public List<JSONObject> getSettleLogs(Date dt, List<String> clearIds) {
+        List<JSONObject> logs = clearingLogMapper.findByDate(dt);
+        logs = logs.stream().filter(log -> log.getBooleanValue("editable"))
+                .filter(log -> clearIds.isEmpty() || clearIds.contains(log.getString("clearing_id")))
+                .collect(Collectors.toList());
+        if (logs.isEmpty()) {
+            throw new NotFoundException();
+        }
+        return logs;
+    }
+
     private List<JSONObject> mergeBatchSettleClients(List<JSONObject> details) {
         Map<String, List<JSONObject>> sameBankDetails = details.stream()
                 .filter(this::detailEnabledMergeSettle)
@@ -493,14 +497,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public List<ABAFile> getAba(Date dt, String bank, List<String> clearIds) {
-        List<JSONObject> logs = clearingLogMapper.findByDate(dt);
-        logs = logs.stream().filter(log -> log.getBooleanValue("editable"))
-                .filter(log -> clearIds.isEmpty() || clearIds.contains(log.getString("clearing_id")))
-                .collect(Collectors.toList());
-        if (logs.isEmpty()) {
-            throw new NotFoundException();
-        }
+    public List<ABAFile> getAba(Date dt, String bank, List<JSONObject> logs) {
         List<ABAFile> files = new ArrayList<>();
         for (JSONObject log : logs) {
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
@@ -1112,7 +1109,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     @Override
-    public JSONObject sendSettlementMail(Date date, List<String> clearIds) {
+    public JSONObject sendSettlementMail(Date date, List<String> clearIds, boolean autoMarkSent) {
         JSONObject result = new JSONObject();
         try {
             String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
@@ -1121,7 +1118,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd");
             List<JSONObject> attachList = new ArrayList<>();
             JSONObject attach1 = new JSONObject();
-            List<JSONObject> xlsxFileList = getXlsx(date, "CBA", clearIds);
+            List<JSONObject> clearLogs = getSettleLogs(date, clearIds);
+            List<JSONObject> xlsxFileList = getXlsx(date, "CBA", clearLogs);
             if (xlsxFileList.size() > 1) {
                 fileName1 += ".zip";
                 attach1.put("content", Base64.encodeBase64String(getZipByteArr(xlsxFileList)));
@@ -1133,7 +1131,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             attachList.add(attach1);
 
             JSONObject attach2 = new JSONObject();
-            List<ABAFile> abaFileList = getAba(date, "CBA", clearIds);
+            List<ABAFile> abaFileList = getAba(date, "CBA", clearLogs);
             String fileName2 = "Merchant_Settlement_Info_aba_" + DateFormatUtils.format(date, "yyyyMMdd");
             if (abaFileList.size() > 1) {
                 fileName2 += ".zip";
@@ -1182,7 +1180,13 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 logSettleMailMapper.save(settleMailRecord);
             }
             sendTaskFinishMessages(ManagerRole.FINANCIAL_STAFF, "清算文件已发送清算方", "发送清算通知");
-            clearingLogMapper.lockSettlements(date);
+            if (autoMarkSent) {
+                if (!clearIds.isEmpty()) {
+                    clearingLogMapper.lockSettlementsById(clearLogs.stream().map(log->log.getString("clearing_id")).collect(Collectors.toList()));
+                } else {
+                    clearingLogMapper.lockSettlements(date);
+                }
+            }
         } catch (IOException e) {
             logger.error("生成excel字节数组发生错误");
         } catch (URISyntaxException e) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
index 8a76ca76c..03a392d5b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java
@@ -129,7 +129,8 @@ public class SettlementDevController {
         } catch (ParseException e) {
         }
         List<String> clearIds = data.getJSONArray("clearing_ids").toJavaList(String.class);
-        return cleanService.sendSettlementMail(dt, clearIds);
+        boolean autoMarkSent = data.getBooleanValue("mark_sent");
+        return cleanService.sendSettlementMail(dt, clearIds, autoMarkSent);
     }
 
     @ManagerMapping(value = "/reports/send_checkcode", role = {ManagerRole.FINANCIAL_STAFF})
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java
index e6c3dbd14..8b6bbebfc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java
@@ -42,6 +42,8 @@ public interface ClearingLogMapper {
 
     void lockSettlements(@Param("date") Date date);
 
+    void lockSettlementsById(@Param("clearing_ids") List<String> clearingIds);
+
     @AutoSql(type = SqlType.SELECT)
     JSONObject findById(@Param("clearing_id") int clearingId);
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.xml
index cf8c2181a..75f117f77 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.xml
@@ -2,7 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper">
     <update id="lockSettlements">
-        update log_clearing set editable=0 where settle_date=#{date}
+        update log_clearing
+        set editable=0
+        where settle_date = #{date}
+    </update>
+    <update id="lockSettlementsById">
+        update log_clearing set editable=0
+        where clearing_id in
+        <foreach collection="clearing_ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
     </update>
     <select id="findByDate" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
@@ -15,7 +24,8 @@
         <![CDATA[
         SELECT settle_date
         FROM log_clearing
-        WHERE year(settle_date) = year(#{month}) AND month(settle_date) = month(#{month})
+        WHERE year(settle_date) = year(#{month})
+          AND month(settle_date) = month(#{month})
         ]]>
     </select>
     <select id="listLatestSettleDates" resultType="java.util.Date">
@@ -28,28 +38,33 @@
     </select>
     <select id="getSettlementMonthReport" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        SELECT
-            settle_date,
-            gross_amount,
-            gross_amount - wechat_charge wechat_settlement,
-            net_amount,
-            royalpay_charge
+        SELECT settle_date,
+               gross_amount,
+               gross_amount - wechat_charge wechat_settlement,
+               net_amount,
+               royalpay_charge
         FROM log_clearing
-        WHERE year(settle_date) = #{year} AND month(settle_date) = #{month}
+        WHERE year(settle_date) = #{year}
+          AND month(settle_date) = #{month}
         ORDER BY settle_date ASC
         ]]>
     </select>
     <select id="getSettlementChannelsMonthReport" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        select sum(a.royalpay_charge) charge,a.channel channel from log_clearing_detail_analysis a left join log_clearing_detail d on d.clear_detail_id = a.clearing_detail_id and a.channel !='System'
-        WHERE year(d.report_date) =  #{year} AND month(d.report_date) = #{month}
+        select sum(a.royalpay_charge) charge, a.channel channel
+        from log_clearing_detail_analysis a
+                 left join log_clearing_detail d on d.clear_detail_id = a.clearing_detail_id and a.channel != 'System'
+        WHERE year(d.report_date) = #{year}
+          AND month(d.report_date) = #{month}
         group by a.channel
         ]]>
     </select>
 
     <select id="getSettlementChannelsDailyReport" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        select sum(a.royalpay_charge) charge,a.channel channel from log_clearing_detail_analysis a left join log_clearing_detail d on d.clear_detail_id = a.clearing_detail_id and a.channel !='System'
+        select sum(a.royalpay_charge) charge, a.channel channel
+        from log_clearing_detail_analysis a
+                 left join log_clearing_detail d on d.clear_detail_id = a.clearing_detail_id and a.channel != 'System'
         WHERE d.report_date = #{date}
         group by a.channel
         ]]>
@@ -57,17 +72,21 @@
 
     <select id="getTotalPlatformCharge" resultType="com.alibaba.fastjson.JSONObject">
         SELECT SUM(royalpay_charge) royalpay_charge
-          FROM log_clearing
-         WHERE year(settle_date) = #{year}
-           AND month(settle_date) = #{month}
+        FROM log_clearing
+        WHERE year(settle_date) = #{year}
+          AND month(settle_date) = #{month}
     </select>
     <select id="getMondayClearing" resultType="com.alibaba.fastjson.JSONObject">
-        select DATE_FORMAT(operate_time,'%Y%m%d') operate_time,net_amount from log_clearing
-        where operate_time  &gt; #{begin} and operate_time &lt; #{end} and dayofweek(operate_time)=2
+        select DATE_FORMAT(operate_time, '%Y%m%d') operate_time, net_amount
+        from log_clearing
+        where operate_time &gt; #{begin}
+          and operate_time &lt; #{end}
+          and dayofweek(operate_time) = 2
     </select>
 
     <select id="getSettleDataDailyReport" resultType="com.alibaba.fastjson.JSONObject">
-        select ifnull(sum(net_amount),0) net_amount,ifnull(sum(royalpay_charge),0) royalpay_charge
-        FROM log_clearing WHERE settle_date = date(#{date})
+        select ifnull(sum(net_amount), 0) net_amount, ifnull(sum(royalpay_charge), 0) royalpay_charge
+        FROM log_clearing
+        WHERE settle_date = date(#{date})
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 7173f8632..8abf0f876 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -504,6 +504,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             };
             return info
         });
+        $scope.config = {mark_sent: true};
         $scope.switchSendFlag=function(info){
             info.send=!info.send
         };
@@ -514,7 +515,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             $scope.error_msg = '正在发送，请稍后。';
             $scope.sendMailButton = true;
             $http.post('/sys/settlement/reports/' + $stateParams.date + '/send_settlement_xlsx',
-                {clearing_ids:$scope.settleLogs.filter(log=>log.send).map(log=>log.clearing_id)}).then(function (resp) {
+                {clearing_ids:$scope.settleLogs.filter(log=>log.send).map(log=>log.clearing_id),mark_sent:$scope.config.mark_sent}).then(function (resp) {
                 $scope.error_msg = resp.data.msg;
                 $scope.sendMailButton = false;
                 if (resp.data.result == 0) {
diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 0d17de1de..d132ca4f7 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -11,6 +11,12 @@
                 </li>
             </ul>
         </div>
+        <div class="col-sm-12">
+            <label class="checkbox-inline">
+                <input type="checkbox" name="mark_sent" ng-value="config.mark_sent" class="checkbox">
+                同时标记为已发送
+            </label>
+        </div>
         <div class="col-sm-12">
             <button type="button" class="btn btn-primary" style="width: 100%; margin-top: 30px" data-dismiss="modal"
                     ng-click="sendSettlementMail()" ng-disabled="sendMailButton">发送清算邮件
diff --git a/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java b/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
index dfa5abc8b..57e03c72f 100644
--- a/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/task/SettleMailTest.java
@@ -34,7 +34,8 @@ public class SettleMailTest {
     @Test
     public void parse() throws IOException {
         Date date = DateUtils.truncate(new Date(), Calendar.DATE);
-        List<ABAFile> abaFileList = cleanService.getAba(date, "CBA", new ArrayList<>());
+        final ArrayList<String> clearIds = new ArrayList<>();
+        List<ABAFile> abaFileList = cleanService.getAba(date, "CBA", cleanService.getSettleLogs(date, clearIds));
 
         Context ctx = new Context();
         ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));

From 1df9609149f0f76b09479d00b8d314c463bce86d Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 14:29:43 +0800
Subject: [PATCH 17/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8B=BE=E9=80=89=E5=8F=91=E9=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=A0=87=E8=AE=B0=E5=B7=B2=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/management/clearing/core/CleanService.java   | 2 ++
 .../manage/management/clearing/core/impl/CleanServiceImpl.java  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
index f482ed388..254ef3f7d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java
@@ -45,6 +45,8 @@ public interface CleanService {
 
     List<JSONObject> getXlsx(Date dt, String bank, List<JSONObject> logs) throws IOException;
 
+    List<JSONObject> getSettleLogs(Date dt, List<String> clearIds);
+
     List<ABAFile> getAba(Date dt, String bank, List<JSONObject> logs) throws IOException;
 
     void settlementAba(Date date, HttpServletResponse response) throws IOException;
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 68653b481..4774431cd 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
@@ -424,6 +424,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         return result;
     }
 
+    @Override
     public List<JSONObject> getSettleLogs(Date dt, List<String> clearIds) {
         List<JSONObject> logs = clearingLogMapper.findByDate(dt);
         logs = logs.stream().filter(log -> log.getBooleanValue("editable"))

From 33bb32c8e935ca3f2bdb9ee84fe249bc1790e5a7 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 14:52:56 +0800
Subject: [PATCH 18/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E5=8F=91=E9=80=81UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/clearing-log.js                   | 1 -
 .../static/analysis/templates/settlement_send_check_code.html | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 8abf0f876..3003c50c5 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -327,7 +327,6 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 $uibModal.open({
                     templateUrl: '/static/analysis/templates/settlement_send_check_code.html',
                     controller: 'settlementSendCheckCodeCtrl',
-                    size: 'sm',
                     resolve: {
                         settleLogs: function () {
                             return $scope.detail.logs.filter(log => log.editable);
diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index d132ca4f7..a2f3efa6f 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -6,8 +6,8 @@
         <div class="col-sm-12">
             <ul class="list-group">
                 <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
-                    <span>[{{log.remark}}]log.clearing_id</span>
-                    <span class="pull-right" ng-bind="log.net_amount|currency:''"></span>
+                    <span class="pull-left">[{{log.remark}}]{{log.id}}</span>
+                    <span class="pull-right" ng-bind="log.amount|currency:''"></span>
                 </li>
             </ul>
         </div>

From ec2fff9cb4d8aec5f6f67038e32e230a05456317 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 14:56:40 +0800
Subject: [PATCH 19/26] =?UTF-8?q?feat(settle=20ui):=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=B8=85=E7=AE=97=E9=82=AE=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0TEST=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../management/clearing/core/impl/CleanServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4774431cd..21b54171e 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
@@ -1113,7 +1113,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     public JSONObject sendSettlementMail(Date date, List<String> clearIds, boolean autoMarkSent) {
         JSONObject result = new JSONObject();
         try {
-            String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
+            String title = (PlatformEnvironment.getEnv().isDebug() ? "[TEST]" : "") + "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
             JSONObject model = new JSONObject();
             model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
             String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd");
@@ -1183,7 +1183,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             sendTaskFinishMessages(ManagerRole.FINANCIAL_STAFF, "清算文件已发送清算方", "发送清算通知");
             if (autoMarkSent) {
                 if (!clearIds.isEmpty()) {
-                    clearingLogMapper.lockSettlementsById(clearLogs.stream().map(log->log.getString("clearing_id")).collect(Collectors.toList()));
+                    clearingLogMapper.lockSettlementsById(clearLogs.stream().map(log -> log.getString("clearing_id")).collect(Collectors.toList()));
                 } else {
                     clearingLogMapper.lockSettlements(date);
                 }

From 15e0d5262bef86f6dc786d53167cf5330d832f5f Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 14:57:58 +0800
Subject: [PATCH 20/26] feat(settle ui): ui update

---
 .../static/analysis/templates/settlement_send_check_code.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index a2f3efa6f..a94b49fbf 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -5,8 +5,8 @@
     <div class="text-center" >
         <div class="col-sm-12">
             <ul class="list-group">
-                <li class="list-group-item" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
-                    <span class="pull-left">[{{log.remark}}]{{log.id}}</span>
+                <li class="list-group-item text-left" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
+                    <span>[{{log.remark}}]{{log.id}}</span>
                     <span class="pull-right" ng-bind="log.amount|currency:''"></span>
                 </li>
             </ul>

From 160003e4d36e27c8d029833aa6c4bdfaf6deb488 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 15:06:19 +0800
Subject: [PATCH 21/26] feat(settle ui): ui update

---
 src/main/ui/static/analysis/clearing-log.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 3003c50c5..ab22ba781 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -514,7 +514,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             $scope.error_msg = '正在发送，请稍后。';
             $scope.sendMailButton = true;
             $http.post('/sys/settlement/reports/' + $stateParams.date + '/send_settlement_xlsx',
-                {clearing_ids:$scope.settleLogs.filter(log=>log.send).map(log=>log.clearing_id),mark_sent:$scope.config.mark_sent}).then(function (resp) {
+                {clearing_ids:$scope.settleLogs.filter(log=>log.send).map(log=>log.id),mark_sent:$scope.config.mark_sent}).then(function (resp) {
                 $scope.error_msg = resp.data.msg;
                 $scope.sendMailButton = false;
                 if (resp.data.result == 0) {

From 18bfcd4ca3f648c15f77c5cbb1984a7be5ff6456 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 15:10:45 +0800
Subject: [PATCH 22/26] feat(settle ui): ui update

---
 .../static/analysis/templates/settlement_send_check_code.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index a94b49fbf..9bdaf9469 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -13,7 +13,7 @@
         </div>
         <div class="col-sm-12">
             <label class="checkbox-inline">
-                <input type="checkbox" name="mark_sent" ng-value="config.mark_sent" class="checkbox">
+                <input type="checkbox" name="mark_sent" ng-checked="config.mark_sent" class="checkbox">
                 同时标记为已发送
             </label>
         </div>

From 0639015bbfe5ef2b3a4bfbd6529b6dc22fc6ede3 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 15:17:06 +0800
Subject: [PATCH 23/26] fix(settle ui): checkbox error

---
 .../static/analysis/templates/settlement_send_check_code.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 9bdaf9469..ea5001e86 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -13,7 +13,7 @@
         </div>
         <div class="col-sm-12">
             <label class="checkbox-inline">
-                <input type="checkbox" name="mark_sent" ng-checked="config.mark_sent" class="checkbox">
+                <input type="checkbox" name="mark_sent" ng-checked="config.mark_sent" ng-change="config.mark_sent=!config.mark_sent" class="checkbox">
                 同时标记为已发送
             </label>
         </div>

From 45fd54ee6f3ed34ec33b108fdb9345f715b05315 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 15:19:14 +0800
Subject: [PATCH 24/26] fix(settle ui): checkbox error

---
 .../static/analysis/templates/settlement_send_check_code.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index ea5001e86..998dbd80e 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -13,7 +13,7 @@
         </div>
         <div class="col-sm-12">
             <label class="checkbox-inline">
-                <input type="checkbox" name="mark_sent" ng-checked="config.mark_sent" ng-change="config.mark_sent=!config.mark_sent" class="checkbox">
+                <input type="checkbox" name="mark_sent" ng-model="config.mark_sent" class="checkbox">
                 同时标记为已发送
             </label>
         </div>

From 4fdbd23058a520b5017a4268c34a8b83296f6871 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Tue, 10 Mar 2020 15:25:24 +0800
Subject: [PATCH 25/26] fix(settle ui): title update

---
 .../static/analysis/templates/settlement_send_check_code.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_send_check_code.html b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
index 998dbd80e..16a683a05 100644
--- a/src/main/ui/static/analysis/templates/settlement_send_check_code.html
+++ b/src/main/ui/static/analysis/templates/settlement_send_check_code.html
@@ -1,5 +1,5 @@
 <div class="modal-header bg-success">
-    <h4>Send Check Code</h4>
+    <h4>Send Settlement Email</h4>
 </div>
 <div class="modal-body" style="height: 300px">
     <div class="text-center" >

From 04d44f8beffb2e627e4bad82ecdfb784199c1eb1 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 10 Mar 2020 16:56:49 +0800
Subject: [PATCH 26/26] =?UTF-8?q?add=20ka=E5=95=86=E6=88=B7=E5=AD=90?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=A3=80=E7=B4=A2=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 .../core/impls/DashboardServiceImpl.java      |   7 +
 .../manage/mappers/system/ClientMapper.java   |   5 +-
 .../manage/merchants/core/ClientManager.java  |   3 +-
 .../core/impls/ClientManagerImpl.java         |  52 ++++++-
 .../web/PartnerManageController.java          |   8 +-
 .../merchants/web/PartnerViewController.java  |   8 +
 .../manage/tradelog/core/TradeLogService.java |   1 +
 .../core/impls/TradeLogServiceImpl.java       |  14 ++
 src/main/resources/application-dev.properties |  16 +-
 .../mappers/payment/TransactionMapper.xml     |  10 +-
 .../manage/mappers/system/ClientMapper.xml    |  11 ++
 .../analysis/partner-customers-orders.js      |   5 +-
 .../static/analysis/partner-trans-analysis.js |   3 +
 .../ui/static/dashboard/partner-dashboard.js  |  26 +++-
 .../static/payment/partner/partner-manage.js  | 140 +++++++++++++----
 src/main/ui/static/payment/partner/partner.js |  11 +-
 .../templates/client_sub_partners.html        |  29 ++++
 .../partner/templates/partner_pay_logs.html   | 142 ++++++++++++++++-
 .../partner/templates/partner_settlement.html | 142 ++++++++++++++++-
 .../tradelog/partner-settlement-log.js        |  66 ++++++--
 .../tradelog/templates/balance_report.html    | 144 +++++++++++++++++-
 .../templates/partner_settlement_logs.html    | 140 ++++++++++++++++-
 .../templates/partner_trade_logs.html         | 140 ++++++++++++++++-
 .../ui/static/payment/tradelog/tradelog.js    |  68 ++++++++-
 .../ui/static/payment/tradelog/transflow.js   |  96 +++++++++---
 26 files changed, 1178 insertions(+), 111 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5242a10a6..8bb9d2e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.92</version>
+    <version>1.3.93</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 c5b5c0142..5071c1b04 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
@@ -155,6 +155,9 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         if(tradeInTypes != null){
             return tradeInTypes;
         }
+        if (params.containsKey("client_id")) {
+            clientManager.queryModifyClientIds(params.getInteger("client_id"), params);
+        }
         List<JSONObject> res = transactionAnalysisMapper.getTradeAmountInTypes(params);
         stringRedisTemplate.boundValueOps("tradeInTypes"+params.getString("org_id")+ params.getString("begin")).set(res.toString(), 5, TimeUnit.MINUTES);
         return res;
@@ -323,6 +326,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
         params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
         params.put("client_id", partner.getIntValue("client_id"));
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
         JSONObject today = getTransJSONO(params);
         params.put("begin",DateUtils.addDays(params.getDate("begin"),-1));
         params.put("end",DateUtils.addDays(params.getDate("end"),-1));
@@ -450,6 +454,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
             params.remove("client_ids");
         }
         params.put("client_id", partner.getIntValue("client_id"));
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
         return customerAndOrdersStatisticsMapper.getSumCustomersAnalysis(params);
     }
 
@@ -619,6 +624,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
             params.remove("client_ids");
         }
         params.put("client_id", partner.getIntValue("client_id"));
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
         return customerAndOrdersStatisticsMapper.getAvgOrderAndCustomerStatistics(params);
     }
 
@@ -633,6 +639,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
             params.remove("client_ids");
         }
         params.put("client_id", partner.getIntValue("client_id"));
+        clientManager.queryModifyClientIds(partner.getInteger("client_id"), params);
         return customerAndOrdersStatisticsMapper.getPartnerCustomerAndOrderStatistics(params);
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index a04ae4ca7..ab1c62220 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -82,10 +82,7 @@ public interface ClientMapper {
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     List<JSONObject> listChildClients(@Param("parent_client_id") int parentClientId);
 
-    @AutoSql(type = SqlType.SELECT)
-    @AdvanceSelect(addonWhereClause = "is_valid=1")
-    PageList<JSONObject> listChildClientsByPage(@Param("parent_client_id") int parentClientId, PageBounds pageBounds);
-
+    PageList<JSONObject> listChildClientsByPage(JSONObject params, PageBounds pageBounds);
 
     @AutoSql(type = SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index b3cb551ac..975e0cb13 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -173,7 +173,7 @@ public interface ClientManager {
 
     List<JSONObject> listSubClients(JSONObject manager, String clientMoniker);
 
-    JSONObject listSubClientsByPage(JSONObject manager, String clientMoniker,int page);
+    JSONObject listSubClientsByPage(JSONObject manager, String clientMoniker,String searchText, int page);
 
     List<JSONObject> listSubClients(int clientId);
 
@@ -557,4 +557,5 @@ public interface ClientManager {
 
     RSvcMchBean findSvcMchByAccountId(String accountId);
 
+    void queryModifyClientIds(int clientId, JSONObject params);
 }
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 c795264cb..83b28df4e 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
@@ -2097,7 +2097,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if(mchConfig.getBooleanValue("hide_sub_mch")){
             return new ArrayList<>();
         }
-        if (!mchConfig.getBooleanValue("disable_level3_mch")) {
+        if (!mchConfig.getBooleanValue("disable_level3_mch") && listChildClients.size()<100) {
             for (JSONObject partner : listChildClients) {
                 List<JSONObject> clients = clientMapper.listChildClients(partner.getIntValue("client_id"));
                 if (clients.size() > 0) {
@@ -2111,9 +2111,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return listChildClients;
     }
 
-
     @Override
-    public JSONObject listSubClientsByPage(JSONObject manager, String clientMoniker,int page) {
+    public JSONObject listSubClientsByPage(JSONObject manager, String clientMoniker,String searchText, int page) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
@@ -2121,9 +2120,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         checkOrgPermission(manager, client);
 
         PageBounds pageBounds;
-        pageBounds= new PageBounds(page, 5, Order.formString("create_time.desc"));
-
-        PageList<JSONObject> childClients = clientMapper.listChildClientsByPage(client.getIntValue("client_id"), pageBounds);
+        pageBounds= new PageBounds(page, 20, Order.formString("create_time.desc"));
+        JSONObject params = new JSONObject() {{
+            put("parent_client_id", client.getIntValue("client_id"));
+        }};
+        if (StringUtils.isNotBlank(searchText)) {
+            params.put("search_text", searchText);
+        }
+        PageList<JSONObject> childClients = clientMapper.listChildClientsByPage(params, pageBounds);
+        for (JSONObject partner : childClients) {
+            List<JSONObject> clients = clientMapper.listChildClients(partner.getIntValue("client_id"));
+            if (clients.size() > 0) {
+                partner.put("level3Clients", clients);
+                clients.forEach(e -> {
+                    e.put("parent_client_moniker", partner.getString("client_moniker"));
+                });
+            }
+        }
         return PageListUtils.buildPageListResult(childClients);
 
     }
@@ -2209,7 +2222,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                         throw new Exception("partner has no permission");
                     }
                 }
-
             }
         }
     }
@@ -2676,6 +2688,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client_ids != null) {
             params.put("client_ids", Arrays.asList(client_ids));
             params.remove("client_id");
+        }else {
+            queryModifyClientIds(client.getIntValue("client_id"), params);
         }
         PageList<JSONObject> devices = clientDeviceMapper.listClientDevices(params, new PageBounds(page, limit, Order.formString("create_time.desc")));
         return PageListUtils.buildPageListResult(devices);
@@ -2695,6 +2709,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client_ids != null) {
             params.put("client_ids", Arrays.asList(client_ids));
             params.remove("client_id");
+        }else {
+            queryModifyClientIds(client.getIntValue("client_id"), params);
         }
         List<JSONObject> deviceIds = clientDeviceMapper.listClientDeviceIds(params);
         return new JSONObject() {{
@@ -3969,6 +3985,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         JSONObject params = query.toParams(timezone);
         params.put("client_id", client_id);
+        queryModifyClientIds(client_id, params);
         PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
@@ -4011,6 +4028,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         JSONObject params = query.toParams(timezone);
         params.put("client_id", client_id);
+        queryModifyClientIds(client_id, params);
         PageList<JSONObject> logs = transactionMapper.listSettlementLog(params, new PageBounds(query.getPage(), 10000, Order.formString("clearing_time.desc")));
         //Excel 多sheet导出
         try (HSSFWorkbook workbook = new HSSFWorkbook()) {
@@ -6621,6 +6639,26 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return svcMchBean;
     }
 
+    @Override
+    public void queryModifyClientIds(int clientId, JSONObject params) {
+        if (StringUtils.isBlank(params.getString("client_ids"))) {
+            String[] clientIds = getChildClientIds(clientId);
+            if (clientIds.length > 1) {
+                params.put("client_ids", clientIds);
+            }
+        }
+    }
+
+    private String[] getChildClientIds(int clientId) {
+        List<String> clientIds = new ArrayList<>();
+        List<JSONObject> childs = clientMapper.listChildClients(clientId);
+        clientIds.add(String.valueOf(clientId));
+        childs.forEach(p -> {
+            clientIds.add(p.getString("client_id"));
+        });
+        return clientIds.toArray(new String[]{});
+    }
+
     private void clientApproveIdInfo(JSONObject params, JSONObject client) {
         if (StringUtils.isBlank(params.getString("id_type"))) {
             params.remove("id_type");
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index dbec29599..44467674a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -500,9 +500,11 @@ public class PartnerManageController {
         return clientManager.listSubClients(manager, clientMoniker);
     }
 
-    @ManagerMapping(value = "/{clientMoniker}/sub_clients/{page}", method = RequestMethod.GET)
-    public JSONObject listSubClientsByPage(@PathVariable String clientMoniker,@PathVariable int page, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        return clientManager.listSubClientsByPage(manager, clientMoniker,page);
+    @ManagerMapping(value = "/{clientMoniker}/sub_clients/page", method = RequestMethod.GET)
+    public JSONObject listSubClientsByPage(@PathVariable String clientMoniker,@RequestParam(defaultValue = "1") int page,
+                                           @RequestParam(required = false) String searchText,
+                                           @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        return clientManager.listSubClientsByPage(manager, clientMoniker,searchText,page);
     }
 
     //创建子商户
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index a69b63949..f8fa9b919 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -348,6 +348,14 @@ public class PartnerViewController {
         return clientManager.listSubClients(null, account.getString("client_moniker"));
     }
 
+    @PartnerMapping(value = "/sub_partners/page", method = RequestMethod.GET)
+    @ResponseBody
+    public JSONObject listSubPartnersByPage(@RequestParam(defaultValue = "1") int page,
+                                            @RequestParam(required = false) String searchText,
+                                            @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
+        return clientManager.listSubClientsByPage(null, account.getString("client_moniker"), searchText,page);
+    }
+
     @PartnerMapping(value = "/devices", method = RequestMethod.GET, roles = PartnerRole.ADMIN)
     @ResponseBody
     public JSONObject listClientDevices(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestParam(required = false) String remark,
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/TradeLogService.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/TradeLogService.java
index a325c662c..50703c227 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/TradeLogService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/TradeLogService.java
@@ -65,4 +65,5 @@ public interface TradeLogService {
     void exportPDFSettlement(TradeLogQuery query, JSONObject partner, HttpServletResponse response);
 
     void exportExcelAllPartner(TradeLogQuery query, JSONObject partner, HttpServletResponse httpResponse) throws Exception;
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 0e7bf4bd6..49f153ba1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -157,6 +157,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject params = query.toParams(timezone);
         clientManager.validateClients(client.getIntValue("client_id"), params);
         params.put("client_id", client.getIntValue("client_id"));
+        clientManager.queryModifyClientIds(client.getIntValue("client_id"), params);
         if (manager != null && manager.getInteger("org_id") != null) {
             params.put("org_id", manager.getIntValue("org_id"));
         }
@@ -529,9 +530,12 @@ public class TradeLogServiceImpl implements TradeLogService {
         String timezone = partner.getJSONObject("client").getString("timezone");
         JSONObject params = query.toParams(timezone);
         clientManager.validateClients(client_id, params);
+        clientManager.queryModifyClientIds(client_id, params);
+
         params.put("client_id", client_id);
         JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
         params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
+
         List<JSONObject> logs = transactionMapper.listTransFlow(params);
         TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time");
         Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size());
@@ -555,6 +559,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject params = query.toParams(timezone);
         clientManager.validateClients(clientId, params);
         params.put("client_id", clientId);
+        clientManager.queryModifyClientIds(clientId, params);
         List<JSONObject> logs = transactionMapper.listTransFlow(params);
         TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
         TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy", Collections.singletonList("clearing_time"));
@@ -998,6 +1003,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         String timezone = partner.getJSONObject("client").getString("timezone");
         JSONObject params = query.toParams(timezone);
         params.put("client_id", clientId);
+        clientManager.queryModifyClientIds(clientId, params);
         PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
@@ -1031,6 +1037,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         }
         JSONObject params = query.toParams(timezone);
         params.put("client_id", clientId);
+        clientManager.queryModifyClientIds(clientId, params);
         PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
                 new PageBounds(1, 100000000, Order.formString("clearing_time.desc")));
         try (HSSFWorkbook workbook = new HSSFWorkbook()) {
@@ -1465,6 +1472,8 @@ public class TradeLogServiceImpl implements TradeLogService {
         if (params.get("client_ids") == null) {
             params.put("client_id", partner.getJSONObject("client").getString("client_id"));
         }
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
+
         List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
         List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
         clientOrderList.parallelStream().forEach(p -> clientOrders.add(p.getInteger("clearing_order")));
@@ -1575,6 +1584,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         if (params.get("client_ids") == null) {
             params.put("client_id", partner.getJSONObject("client").getString("client_id"));
         }
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
         List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
         List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
         clientOrderList.parallelStream().forEach(p -> clientOrders.add(p.getInteger("clearing_order")));
@@ -1666,6 +1676,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         if (params.get("client_ids") == null) {
             params.put("client_id", client.getString("client_id"));
         }
+        clientManager.queryModifyClientIds(partner.getIntValue("client_id"), params);
         List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
         List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
         clientOrderList.parallelStream().forEach(p -> clientOrders.add(p.getInteger("clearing_order")));
@@ -1713,6 +1724,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject params = query.toParams(timezone);
         clientManager.validateClients(clientId1, params);
         params.put("client_id", clientId1);
+        clientManager.queryModifyClientIds(clientId1, params);
         List<JSONObject> logs = transactionMapper.listTransFlow(params);
 
         TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
@@ -1805,4 +1817,6 @@ public class TradeLogServiceImpl implements TradeLogService {
             }
         }
     }
+
+
 }
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 9ace52739..6f4d63ef2 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,15 +2,15 @@
 spring.datasource.type = com.zaxxer.hikari.HikariDataSource
 #数据源master
 
-spring.datasource.master.schema-name=royalpay_dev
-spring.datasource.master.host=127.0.0.1:3306
+spring.datasource.master.schema-name=royalpay_production
+spring.datasource.master.host=192.168.0.4:3306
 spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.master.username=root
-spring.datasource.master.password=root
+spring.datasource.master.username=taylor
+spring.datasource.master.password=taylor
 
 #数据源salve
-spring.datasource.slave.schema-name=royalpay_dev
-spring.datasource.slave.host=127.0.0.1:3306
+spring.datasource.slave.schema-name=royalpay_production
+spring.datasource.slave.host=192.168.0.4:3306
 spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.slave.username=root
-spring.datasource.slave.password=root
+spring.datasource.slave.username=taylor
+spring.datasource.slave.password=taylor
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 73dd48ed8..aff9a9845 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -359,8 +359,16 @@
          SUM(t.clearing_amount) total
         FROM pmt_transactions t
         WHERE t.channel='Settlement'
-        and t.client_id=#{client_id}
          ]]>
+        <if test="client_ids!=null">
+            AND t.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id != null">
+            and t.client_id=#{client_id}
+        </if>
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
     </select>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index a5a1804e7..5d79f6cf0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -555,6 +555,17 @@
             and contact_email = #{contact_email}
         </if>
     </select>
+    <select id="listChildClientsByPage" resultType="com.alibaba.fastjson.JSONObject">
+        select * from sys_clients
+        where
+        parent_client_id = #{parent_client_id}
+        and is_valid = 1
+        <if test="search_text!=null">
+            <bind name="name_pattern" value="'%'+search_text+'%'"/>
+            and (client_moniker=#{search_text} or short_name like #{name_pattern} or company_name like
+            #{name_pattern} or business_name like #{name_pattern}  or contact_email=#{search_text})
+        </if>
+    </select>
     <select id="listClientsWithTransactionsSettled" resultType="int">
         select distinct t.client_id
         from pmt_transactions t
diff --git a/src/main/ui/static/analysis/partner-customers-orders.js b/src/main/ui/static/analysis/partner-customers-orders.js
index 8da0f613c..78a97a53d 100644
--- a/src/main/ui/static/analysis/partner-customers-orders.js
+++ b/src/main/ui/static/analysis/partner-customers-orders.js
@@ -104,6 +104,9 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
                 } else {
                     params.end = $filter('date')(new Date(), 'yyyyMMdd');
                 }
+                if ($scope.chooseShow === 'All') {
+                    delete params.client_ids;
+                }
                 $http.get('/dashboard/partner/customers', {params: params}).then(function (resp) {
                     var dates = [];
                     var new_customers = [];
@@ -118,7 +121,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
                     // $scope.customersHistory = chartParser.parse(customersHistoryConfig, resp.data.reverse());
                     $scope.perCustomerTransactionHistory = chartParser.parse(perCustomerTransactionHistoryConfig, resp.data);
                     //$scope.ordersHistory = chartParser.parse(ordersHistoryConfig, resp.data);
-                })
+                });
             };
             $scope.chooseLast7Days();
 
diff --git a/src/main/ui/static/analysis/partner-trans-analysis.js b/src/main/ui/static/analysis/partner-trans-analysis.js
index d48990998..ed8185c3f 100644
--- a/src/main/ui/static/analysis/partner-trans-analysis.js
+++ b/src/main/ui/static/analysis/partner-trans-analysis.js
@@ -104,6 +104,9 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
                 } else {
                     params.end = $filter('date')(new Date(), 'yyyyMMdd');
                 }
+                if ($scope.chooseShow === 'All') {
+                    delete params.client_ids;
+                }
                 $http.get('/dashboard/partner/customers', {params: params}).then(function (resp) {
                     $scope.transactionAmountHistory = chartParser.parse(transactionAmountHistoryConfig, resp.data.reverse());
                     $scope.ordersHistory = chartParser.parse(ordersHistoryConfig, resp.data);
diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js
index df49cd683..2e5cf5cc7 100644
--- a/src/main/ui/static/dashboard/partner-dashboard.js
+++ b/src/main/ui/static/dashboard/partner-dashboard.js
@@ -651,8 +651,12 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
             $scope.loadDashboard();
         };
         $scope.loadSettlementLogs = function (page) {
-            var params = {limit:10};
-            $http.get('/client/trans_flow/settlement/log', {params: angular.merge(params,$scope.params)}).then(function (resp) {
+            var params = angular.copy($scope.params);
+            params.limit = 10;
+            if ($scope.chooseShow = 'All') {
+                delete params.client_ids;
+            }
+            $http.get('/client/trans_flow/settlement/log', {params: params}).then(function (resp) {
                 $scope.settlementLogs = resp.data.data;
             });
         };
@@ -671,6 +675,9 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
         function loadTransCommon() {
             var params = angular.copy($scope.params);
             params = angular.merge(params, $scope.scales[0].params());
+            if ($scope.chooseShow === 'All') {
+                delete params.client_ids;
+            }
             $http.get('/dashboard/partner/common_analysis',{params:params}).then(function (resp) {
                 $scope.transcommon = resp.data;
             });
@@ -733,6 +740,9 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
                     column: {key: 'aud_fee', name: 'gateway_label'}
                 }]
             };
+            if ($scope.chooseShow === 'All') {
+                delete params.client_ids;
+            }
             $http.get('/dashboard/partner/trans_type_analysis',{params:params}).then(function (resp) {
                 $scope.trade_type_chart = chartParser.parse(tradeInTypeConfig, resp.data);
             });
@@ -792,6 +802,9 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
                     }
                 ]
             };
+            if ($scope.chooseShow === 'All') {
+                delete params.client_ids;
+            }
             $http.get('/dashboard/partner/fee_analysis', {params: params}).then(function (resp) {
                 $scope.trade_line = chartParser.parse(analysisConfig, resp.data);
             })
@@ -799,10 +812,17 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
 
 
         function getOrderCustomerChartAnalysis(params) {
+            if ($scope.chooseShow === 'All') {
+                delete params.client_ids;
+            }
             $http.get('/dashboard/partner/avg_order_customer',{params:params}).then(function (resp) {
                 $scope.avgOrderAndCustomer = resp.data;
             });
-            $http.get('/dashboard/partner/fee_analysis',{params:angular.merge(params,$scope.params)}).then(function (resp) {
+            params = angular.merge(params, $scope.params);
+            if ($scope.chooseShow === 'All') {
+                delete params.client_ids;
+            }
+            $http.get('/dashboard/partner/fee_analysis',{params:params}).then(function (resp) {
                 var dates = [];
                 var new_customers = [];
                 var old_customers = [];
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index c766df9c0..48b4ce9ba 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2470,8 +2470,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
 
         $scope.loadSubClients = function (page) {
-            $scope.page = page || $scope.pagination.page || 1;
-            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/'+$scope.page).then(function (resp) {
+            var params = {};
+            params.page = page || $scope.pagination.page || 1;
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page',{params : params}).then(function (resp) {
                 $scope.subPartners = resp.data.data;
                 $scope.pagination = resp.data.pagination;
             });
@@ -3383,6 +3384,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.isLevel3All = true;
         $scope.clients = [$scope.partner];
         $scope.showLevel3Clients = false;
+        $scope.subClientTable1 = [$scope.partner];
+        $scope.subClientTable2 = [];
+        $scope.choseSubClientNow = 'chose';
+        $scope.more20ChoseSubClient = false;
+        $scope.subSearchText = '';
 
         $scope.today = new Date();
         $scope.chooseToday = function () {
@@ -3450,6 +3456,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 delete params.gatewayChilds;
                 delete params.gatewayChild;
             }
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', {params: params}).then(function (resp) {
                 $scope.tradeLogs = resp.data.data;
                 $scope.pagination = resp.data.pagination;
@@ -3484,6 +3493,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         });
         $scope.chooseClient = function (client) {
             if (client == 'all') {
+                $scope.choseSubClientNow = 'chose';
                 $scope.params.client_ids = angular.copy($scope.clientIds);
                 $scope.isAll = true;
                 $scope.chooseClientId = '';
@@ -3520,10 +3530,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
             $scope.loadTradeLogs();
         };
-        if ($scope.partner.has_children && !$scope.partner.hide_sub_mch) {
-            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients').then(function (resp) {
-                var clientList = resp.data;
+        $scope.searchSubClients = function (subSearchText,page) {
+            $scope.subClientTable1 = [$scope.partner];
+            $scope.subClientTable2 = [];
+            var params = {};
+            params.page = page || $scope.subClientPagination.page || 1;
+            if (subSearchText != '') {
+                $scope.subSearchText = subSearchText;
+                params.searchText = subSearchText;
+            }
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page',{params: params}).then(function (resp) {
+                var clientList = resp.data.data;
+                $scope.subClientPagination = resp.data.pagination;
                 clientList.forEach(function (client) {
+                    if ($scope.subClientTable1.length < 11) {
+                        $scope.subClientTable1.push(client);
+                    }else {
+                        $scope.subClientTable2.push(client);
+                    }
                     $scope.clients.push(client);
                 });
                 $scope.clientIds = [];
@@ -3536,12 +3560,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 });
                 $scope.params.client_ids = angular.copy($scope.clientIds);
-                //console.log($rootScope.currentUser.client.clientList);
-                $scope.loadTradeLogs(1);
-            })
+            });
+        };
+
+        if ($scope.partner.has_children && !$scope.partner.hide_sub_mch) {
+            $scope.searchSubClients('',1);
+            $scope.loadTradeLogs(1);
         } else {
             $scope.loadTradeLogs(1);
         }
+        $scope.checkSubClientChoseShow = function (client) {
+            $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient;
+            if (client != '') {
+                $scope.choseSubClientNow = client.short_name;
+            }
+        }
+        $scope.clickDisplayChoseDiv = function (event) {
+            $scope.more20ChoseSubClient = false;
+        }
+        $scope.choseDivStopPropagation = function (event) {
+            event.stopPropagation()
+        };
     }]);
     app.controller('partnerPluginsCtrl', ['$scope', '$uibModal', function ($scope, $uibModal) {
         $scope.configRedpack = function () {
@@ -4355,29 +4394,58 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.isLevel3All = true;
         $scope.clinet = {};
         $scope.isAll = true;
+        $scope.more20ChoseSubClient = false;
+        $scope.choseSubClientNow = 'chose';
+        $scope.searchSubClients = function (subSearchText,page) {
+
+            $scope.subClientTable1 = [$scope.partner];
+            $scope.subClientTable2 = [];
+            var params = {};
+            params.page = page || $scope.subClientPagination.page || 1;
+            if (subSearchText != '') {
+                $scope.subSearchText = subSearchText;
+                params.searchText = subSearchText;
+            }
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/sub_clients/page',{params: params}).then(function (resp) {
+                var clientList = resp.data.data;
+                $scope.subClientPagination = resp.data.pagination;
+                clientList.forEach(function (client) {
+                    if ($scope.subClientTable1.length < 11) {
+                        $scope.subClientTable1.push(client);
+                    }else {
+                        $scope.subClientTable2.push(client);
+                    }
+                    $scope.clients.push(client);
+                });
+                $scope.clientIds = [];
+                $scope.clients.forEach(function (client) {
+                    $scope.clientIds.push(client.client_id);
+                    if (client.level3Clients) {
+                        client.level3Clients.forEach(function (level3Client) {
+                            $scope.clientIds.push(level3Client.client_id);
+                        });
+                    }
+                });
+                $scope.params.client_ids = angular.copy($scope.clientIds);
+            });
+        };
         $scope.initClientInfo = function(){
             $http.get('/sys/partners/'+clientMoniker).then(function (resp) {
                 $scope.client = resp.data;
                 $scope.clients = [$scope.client];
                 if ($scope.client.has_children && !$scope.client.hide_sub_mch) {
-                    $scope.params.client_ids = [$scope.client.client_id];
-                    $http.get('/sys/partners/'+clientMoniker+'/sub_clients').then(function (resp) {
-                        var clientList = resp.data;
-                        clientList.forEach(function (client) {
-                            $scope.clients.push(client);
-                        });
-                        $scope.clientIds = [];
-                        $scope.clients.forEach(function (client) {
-                            $scope.clientIds.push(client.client_id);
-                            if (client.level3Clients) {
-                                client.level3Clients.forEach(function (level3Client) {
-                                    $scope.clientIds.push(level3Client.client_id);
-                                });
-                            }
-                        });
-                        $scope.params.client_ids = angular.copy($scope.clientIds);
-                        $scope.loadSettlementLogs(1);
-                    })
+                    $scope.searchSubClients('',1);
+                    $scope.params.dateto = new Date();
+                    var day = new Date();
+                    day.setDate(day.getDate() - 7);
+                    $scope.params.datefrom = day;
+                    $scope.chooseClient('all');
+                }else {
+                    $scope.params.dateto = new Date();
+                    var day = new Date();
+                    day.setDate(day.getDate() - 7);
+                    $scope.params.datefrom = day;
+                    $scope.chooseClient('all');
                 }
             });
         }
@@ -4396,7 +4464,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 url += connectSymbol + 'dateto=' + params.dateto;
             }
-            if (params.client_ids){
+            if (params.client_ids && !$scope.isAll){
                 params.client_ids.forEach(function (i) {
                     url += connectSymbol + 'client_ids=' + i;
                     connectSymbol = '&';
@@ -4407,6 +4475,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
         $scope.chooseClient = function (client) {
             if (client == 'all') {
+                $scope.choseSubClientNow = 'chose';
                 $scope.params.client_ids = angular.copy($scope.clientIds);
                 $scope.isAll = true;
                 $scope.chooseClientId = '';
@@ -4477,6 +4546,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
             params.page = page || $scope.pagination.page || 1;
             params.limit = 10;
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             $http.get('/sys/partners/' + clientMoniker + '/lists_settlements', {params: params}).then(function (resp) {
                 $scope.settlementLogs = resp.data.data;
                 $scope.padding = resp.data.padding;
@@ -4496,7 +4568,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 size: 'lg'
             });
         };
-        $scope.chooseLast7Days();
+
+        $scope.checkSubClientChoseShow = function (client) {
+            $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient;
+            if (client != '') {
+                $scope.choseSubClientNow = client.short_name;
+            }
+        }
+        $scope.clickDisplayChoseDiv = function (event) {
+            $scope.more20ChoseSubClient = false;
+        }
+        $scope.choseDivStopPropagation = function (event) {
+            event.stopPropagation()
+        };
     }]);
     app.controller('partnerSurchargeAccountCtrl', ['$scope', '$uibModal', '$http', 'clientMoniker', '$filter', function ($scope, $uibModal, $http, clientMoniker, $filter) {
         $scope.params = {};
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 402145648..2fafc379d 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -1930,9 +1930,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
     }]);
     app.controller('clientSubPartnersCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) {
         $scope.partner = partner.data;
-        $scope.loadSubPartners = function () {
-            $http.get('/client/partner_info/sub_partners').then(function (resp) {
-                $scope.subPartners = resp.data;
+        $scope.pagination = {};
+        $scope.params = {};
+        $scope.loadSubPartners = function (page) {
+            var params = angular.copy($scope.params);
+            params.page = page || $scope.pagination.page || 1;
+            $http.get('/client/partner_info/sub_partners/page',{params: params}).then(function (resp) {
+                $scope.subPartners = resp.data.data;
+                $scope.pagination = resp.data.pagination;
                 $scope.subPartners.forEach(function (client) {
                     if (client.level3Clients) {
                         client.level3Clients.forEach(function (level3Client) {
diff --git a/src/main/ui/static/payment/partner/templates/client_sub_partners.html b/src/main/ui/static/payment/partner/templates/client_sub_partners.html
index 295ce7410..0ad29f0f8 100644
--- a/src/main/ui/static/payment/partner/templates/client_sub_partners.html
+++ b/src/main/ui/static/payment/partner/templates/client_sub_partners.html
@@ -9,6 +9,17 @@
 </section>
 <section class="content">
     <div class="row">
+        <div class="row" style="margin-bottom: 30px;">
+            <div class="col-sm-4 col-xs-8" style="margin-left: 30%">
+                <input class="form-control" placeholder="Keyword"
+                       ng-model="params.searchText">
+            </div>
+            <div class="col-sm-3">
+                <button class="btn btn-success" type="button" ng-click="loadSubPartners()">
+                    <i class="fa fa-search"></i> Search
+                </button>
+            </div>
+        </div>
         <div class="col-sm-12 table-responsive">
             <table class="table table-bordered table-striped table-hover">
                 <thead>
@@ -34,6 +45,24 @@
                 </tr>
                 </tbody>
             </table>
+            <div class="box-footer" ng-if="subPartners.length" style="float: right;background-color: #efefef00;">
+                <uib-pagination class="pagination"
+                                total-items="pagination.totalCount"
+                                boundary-links="true"
+                                ng-model="pagination.page"
+                                items-per-page="pagination.limit"
+                                max-size="10"
+                                ng-change="loadSubPartners(pagination.page)"
+                                previous-text="&lsaquo;"
+                                next-text="&rsaquo;"
+                                first-text="&laquo;"
+                                last-text="&raquo;"></uib-pagination>
+                <div class="row">
+                    <div class="col-xs-12">
+                        Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </section>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 1b269b062..311ed6a48 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -1,4 +1,45 @@
-<div class="row margin-bottom">
+<style>
+    .white_content {
+        display: none;
+        position: absolute;
+        width: 80%;
+        height: 400px;
+        padding: 20px;
+        border: 1px solid orange;
+        background-color: white;
+        z-index:1002;
+        overflow: auto;
+    }
+    .white_content::-webkit-scrollbar:vertical {
+        width: 11px;
+    }
+    /*定义滚动条高宽及背景
+    高宽分别对应横竖滚动条的尺寸*/
+    .white_content::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        width:16px;
+        height:16px;
+        background-color:#F5F5F5;
+    }
+    /*定义滚动条轨道
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-track
+    {
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+        border-radius:10px;
+        background-color:#F5F5F5;
+    }
+    /*定义滑块
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-thumb
+    {
+        border-radius:10px;
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+        background-color:#555;
+    }
+</style>
+<div class="row margin-bottom" ng-click="clickDisplayChoseDiv($event)">
     <div class="col-sm-12">
         <div class="form-horizontal">
             <div class="form-group col-xs-12">
@@ -164,13 +205,110 @@
             <div class="form-group col-xs-12" ng-if="partner.has_children && !partner.hide_sub_mch">
                 <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                 <div class="col-sm-10 col-xs-8">
-                    <p class="form-control-static">
+                    <p class="form-control-static" ng-if="clients.length<50">
                         <a role="button" ng-class="{'bg-primary':isAll}" ng-click="chooseClient('all')">All</a>
                         <label ng-repeat="sub in clients">
                             |&nbsp;<a role="button" ng-class="{'bg-primary':sub.client_id==chooseClientId}"
                                       ng-click="chooseClient(sub)">{{sub.short_name}}</a>&nbsp;
                         </label>
                     </p>
+                    <p class="form-control-static" ng-if="clients.length>=50">
+                        <a role="button" ng-class="{'bg-primary':isAll}"
+                           ng-click="chooseClient('all')">All</a>
+                        <label ng-click="checkSubClientChoseShow('');choseDivStopPropagation($event)" style="cursor: pointer;">
+                            ｜ <input ng-model="choseSubClientNow" style="border:none;cursor: pointer;" readonly>
+                        </label>
+                    </p>
+                    <div id="light" class="white_content"  ng-if="more20ChoseSubClient" style="display: block;" ng-click="choseDivStopPropagation($event)">
+                        <div class="row">
+                            <div class="form-group col-xs-12">
+                                <div class="col-sm-8 col-xs-8">
+                                    <input class="form-control" placeholder="Keyword"
+                                           ng-model="subSearchText">
+                                </div>
+                                <div class="col-sm-3">
+                                    <button class="btn btn-success" type="button" ng-click="searchSubClients(subSearchText,1)">
+                                        <i class="fa fa-search"></i> Search
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 table-responsive">
+                                <div class="col-sm-6" style="padding: 0 2px">
+                                    <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                        <thead>
+                                        <tr>
+                                            <th>Partner Code</th>
+                                            <th>Partner Name</th>
+                                            <th>Operation</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="subPartner in subClientTable1">
+                                            <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                {{subPartner.client_moniker}}
+                                            </td>
+                                            <td ng-bind="subPartner.short_name"></td>
+                                            <td>
+                                                <button role="button" class="btn btn-info" title="Add Search"
+                                                        style="padding: 1px 6px;"
+                                                        ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                    <i class="fa fa-plus"></i>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="col-sm-6" style="padding: 0 2px">
+                                    <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                        <thead>
+                                        <tr>
+                                            <th>Partner Code</th>
+                                            <th>Partner Name</th>
+                                            <th>Operation</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="subPartner in subClientTable2">
+                                            <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                {{subPartner.client_moniker}}
+                                            </td>
+                                            <td ng-bind="subPartner.short_name"></td>
+                                            <td>
+                                                <button role="button" class="btn btn-info" title="Add Search"
+                                                        style="padding: 1px 6px;"
+                                                        ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                    <i class="fa fa-plus"></i>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <div class="box-footer" ng-if="clients.length" style="float: right;">
+                                <uib-pagination class="pagination"
+                                                total-items="subClientPagination.totalCount"
+                                                boundary-links="true"
+                                                ng-model="subClientPagination.page"
+                                                items-per-page="subClientPagination.limit"
+                                                max-size="10"
+                                                ng-change="searchSubClients('',subClientPagination.page)"
+                                                previous-text="&lsaquo;"
+                                                next-text="&rsaquo;"
+                                                first-text="&laquo;"
+                                                last-text="&raquo;"></uib-pagination>
+                                <div class="row">
+                                    <div class="col-xs-12">
+                                        Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-danger" ng-click="checkSubClientChoseShow('')">Cancel</button>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="form-group col-xs-12" ng-if="level3Clients && showLevel3Clients">
diff --git a/src/main/ui/static/payment/partner/templates/partner_settlement.html b/src/main/ui/static/payment/partner/templates/partner_settlement.html
index 068607521..4ecc13fbe 100644
--- a/src/main/ui/static/payment/partner/templates/partner_settlement.html
+++ b/src/main/ui/static/payment/partner/templates/partner_settlement.html
@@ -1,4 +1,45 @@
-<div class="content">
+<style>
+    .white_content {
+        display: none;
+        position: absolute;
+        width: 80%;
+        height: 400px;
+        padding: 20px;
+        border: 1px solid orange;
+        background-color: white;
+        z-index:1002;
+        overflow: auto;
+    }
+    .white_content::-webkit-scrollbar:vertical {
+        width: 11px;
+    }
+    /*定义滚动条高宽及背景
+    高宽分别对应横竖滚动条的尺寸*/
+    .white_content::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        width:16px;
+        height:16px;
+        background-color:#F5F5F5;
+    }
+    /*定义滚动条轨道
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-track
+    {
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+        border-radius:10px;
+        background-color:#F5F5F5;
+    }
+    /*定义滑块
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-thumb
+    {
+        border-radius:10px;
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+        background-color:#555;
+    }
+</style>
+<div class="content" ng-click="clickDisplayChoseDiv($event)">
     <div class="row">
         <div class="col-md-12">
             <div class="box-solid">
@@ -53,7 +94,7 @@
                                     <div class="form-group col-xs-12" ng-if="client.has_children  && !client.hide_sub_mch">
                                         <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                                         <div class="col-sm-10 col-xs-8">
-                                            <p class="form-control-static">
+                                            <p class="form-control-static" ng-if="clients.length<50">
                                                 <a role="button" ng-class="{'bg-primary':isAll}"
                                                    ng-click="chooseClient('all')">All</a>
                                                 <label ng-repeat="sub in clients">
@@ -62,6 +103,103 @@
                                                               ng-click="chooseClient(sub)">{{sub.short_name}}</a>&nbsp;
                                                 </label>
                                             </p>
+                                            <p class="form-control-static" ng-if="clients.length>=50">
+                                                <a role="button" ng-class="{'bg-primary':isAll}"
+                                                   ng-click="chooseClient('all')">All</a>
+                                                <label ng-click="checkSubClientChoseShow('');choseDivStopPropagation($event)" style="cursor: pointer;">
+                                                    ｜ <input ng-model="choseSubClientNow" style="border:none;cursor: pointer;" readonly>
+                                                </label>
+                                            </p>
+                                            <div id="light" class="white_content"  ng-if="more20ChoseSubClient" style="display: block;" ng-click="choseDivStopPropagation($event)">
+                                                <div class="row">
+                                                    <div class="form-group col-xs-12">
+                                                        <div class="col-sm-8 col-xs-8">
+                                                            <input class="form-control" placeholder="Keyword"
+                                                                   ng-model="subSearchText">
+                                                        </div>
+                                                        <div class="col-sm-3">
+                                                            <button class="btn btn-success" type="button" ng-click="searchSubClients(subSearchText,1)">
+                                                                <i class="fa fa-search"></i> Search
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-12 table-responsive">
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable1">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable2">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                    <div class="box-footer" ng-if="clients.length" style="float: right;">
+                                                        <uib-pagination class="pagination"
+                                                                        total-items="subClientPagination.totalCount"
+                                                                        boundary-links="true"
+                                                                        ng-model="subClientPagination.page"
+                                                                        items-per-page="subClientPagination.limit"
+                                                                        max-size="10"
+                                                                        ng-change="searchSubClients('',subClientPagination.page)"
+                                                                        previous-text="&lsaquo;"
+                                                                        next-text="&rsaquo;"
+                                                                        first-text="&laquo;"
+                                                                        last-text="&raquo;"></uib-pagination>
+                                                        <div class="row">
+                                                            <div class="col-xs-12">
+                                                                Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-danger" ng-click="checkSubClientChoseShow('')">Cancel</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <button class="btn btn-success" type="button" ng-click="loadSettlementLogs(1)">
diff --git a/src/main/ui/static/payment/tradelog/partner-settlement-log.js b/src/main/ui/static/payment/tradelog/partner-settlement-log.js
index 4979780a5..7016b7a4d 100644
--- a/src/main/ui/static/payment/tradelog/partner-settlement-log.js
+++ b/src/main/ui/static/payment/tradelog/partner-settlement-log.js
@@ -25,12 +25,29 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         $scope.clients = [$scope.currentUser.client];
         $scope.showLevel3Clients = false;
         $scope.isLevel3All = true;
+        $scope.subClientTable1 = [$scope.currentUser.client];
+        $scope.subClientTable2 = [];
+        $scope.choseSubClientNow = 'chose';
+        $scope.subSearchText = '';
+        $scope.searchSubClients = function (subSearchText,page) {
 
-        if ($scope.currentUser.client.has_children && !$scope.currentUser.client.hide_sub_mch) {
-            $scope.params.client_ids = [$scope.currentUser.client.client_id];
-            $http.get('/client/partner_info/sub_partners').then(function (resp) {
-                var clientList = resp.data;
+            $scope.subClientTable1 = [$scope.currentUser.client];
+            $scope.subClientTable2 = [];
+            var params = {};
+            params.page = page || $scope.subClientPagination.page || 1;
+            if (subSearchText != '') {
+                $scope.subSearchText = subSearchText;
+                params.searchText = subSearchText;
+            }
+            $http.get('/client/partner_info/sub_partners/page',{params: params}).then(function (resp) {
+                var clientList = resp.data.data;
+                $scope.subClientPagination = resp.data.pagination;
                 clientList.forEach(function (client) {
+                    if ($scope.subClientTable1.length < 11) {
+                        $scope.subClientTable1.push(client);
+                    }else {
+                        $scope.subClientTable2.push(client);
+                    }
                     $scope.clients.push(client);
                 });
                 $scope.clientIds = [];
@@ -43,9 +60,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     }
                 });
                 $scope.params.client_ids = angular.copy($scope.clientIds);
-            })
-        }
-
+            });
+        };
         $scope.today = new Date();
         $scope.chooseToday = function () {
             $scope.params.datefrom = $scope.params.dateto = new Date();
@@ -90,6 +106,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
             }
             params.page = page || $scope.pagination.page || 1;
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             $http.get('/client/trans_flow/settlement/log', {params: params}).then(function (resp) {
                 $scope.settlementLogs = resp.data.data;
                 $scope.pagination = resp.data.pagination;
@@ -110,7 +129,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 url += connectSymbol + 'dateto=' + params.dateto;
             }
-            if (params.client_ids) {
+            if (params.client_ids && !$scope.isAll) {
                 params.client_ids.forEach(function (i) {
                     url += connectSymbol + 'client_ids=' + i;
                     connectSymbol = '&';
@@ -118,7 +137,6 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             }
             return url;
         };
-        $scope.chooseLast7Days();
 
         $scope.exportSettlementLogs = function (pattern) {
             let params = angular.copy($scope.params);
@@ -138,7 +156,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 url += connectSymbol + 'dateto=' + params.dateto;
             }
-            if (params.client_ids) {
+            if (params.client_ids && !$scope.isAll) {
                 params.client_ids.forEach(function (i) {
                     url += connectSymbol + 'client_ids=' + i;
                     connectSymbol = '&';
@@ -157,6 +175,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
         $scope.chooseClient = function (client) {
             if (client == 'all') {
+                $scope.choseSubClientNow = 'chose';
                 $scope.params.client_ids = angular.copy($scope.clientIds);
                 $scope.isAll = true;
                 $scope.chooseClientId = '';
@@ -182,6 +201,21 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             $scope.loadSettlementLogs(1);
         };
 
+        if ($scope.currentUser.client.has_children && !$scope.currentUser.client.hide_sub_mch) {
+            $scope.searchSubClients('',1);
+            $scope.params.dateto = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            $scope.params.datefrom = day;
+            $scope.chooseClient('all');
+        }else {
+            $scope.params.dateto = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            $scope.params.datefrom = day;
+            $scope.chooseClient('all');
+        }
+
         $scope.chooseLevel3Client = function (client) {
             if (client == 'all') {
                 $scope.params.client_ids = angular.copy($scope.level3ClientIds);
@@ -198,6 +232,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         $scope.getClearingTransactions = function (client_id, detailId) {
             clearingDetailService.clientClearingDetail(client_id, detailId, true)
         }
+        $scope.checkSubClientChoseShow = function (client) {
+            $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient;
+            if (client != '') {
+                $scope.choseSubClientNow = client.short_name;
+            }
+        }
+        $scope.clickDisplayChoseDiv = function (event) {
+            $scope.more20ChoseSubClient = false;
+        }
+        $scope.choseDivStopPropagation = function (event) {
+            event.stopPropagation()
+        };
     }]);
     return app;
 });
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 91060dfbd..e6b331713 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -34,6 +34,45 @@
     .line_height_ {
         line-height: 22px;
     }
+    .white_content {
+        display: none;
+        position: absolute;
+        width: 80%;
+        height: 400px;
+        padding: 20px;
+        border: 1px solid orange;
+        background-color: white;
+        z-index:1002;
+        overflow: auto;
+    }
+    .white_content::-webkit-scrollbar:vertical {
+        width: 11px;
+    }
+    /*定义滚动条高宽及背景
+    高宽分别对应横竖滚动条的尺寸*/
+    .white_content::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        width:16px;
+        height:16px;
+        background-color:#F5F5F5;
+    }
+    /*定义滚动条轨道
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-track
+    {
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+        border-radius:10px;
+        background-color:#F5F5F5;
+    }
+    /*定义滑块
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-thumb
+    {
+        border-radius:10px;
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+        background-color:#555;
+    }
 </style>
 <section class="content-header">
     <h1>Transactions</h1>
@@ -44,7 +83,7 @@
         <li class="active">Transactions</li>
     </ol>
 </section>
-<div class="content">
+<div class="content" ng-click="clickDisplayChoseDiv($event)">
     <div class="row">
         <div class="col-sm-12">
             <div class="box-solid">
@@ -208,15 +247,113 @@
                                          ng-if="currentUser.client.has_children && !currentUser.client.hide_sub_mch">
                                         <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                                         <div class="col-sm-10 col-xs-8">
-                                            <p class="form-control-static">
+                                            <p class="form-control-static" ng-if="clients.length<50">
                                                 <a role="button" ng-class="{'bg-primary':isAll}"
                                                    ng-click="chooseClient('all')">All</a>
+
                                                 <label ng-repeat="sub in clients">
                                                     |&nbsp;<a role="button"
                                                               ng-class="{'bg-primary':sub.client_id==chooseClientId}"
                                                               ng-click="chooseClient(sub)">{{sub.short_name}}</a>&nbsp;
                                                 </label>
                                             </p>
+                                            <p class="form-control-static" ng-if="clients.length>=50">
+                                                <a role="button" ng-class="{'bg-primary':isAll}"
+                                                   ng-click="chooseClient('all')">All</a>
+                                                <label ng-click="checkSubClientChoseShow('');choseDivStopPropagation($event)" style="cursor: pointer;">
+                                                    ｜ <input ng-model="choseSubClientNow" style="border:none;cursor: pointer;" readonly>
+                                                </label>
+                                            </p>
+                                            <div id="light" class="white_content"  ng-if="more20ChoseSubClient" style="display: block;" ng-click="choseDivStopPropagation($event)">
+                                                <div class="row">
+                                                    <div class="form-group col-xs-12">
+                                                        <div class="col-sm-8 col-xs-8">
+                                                            <input class="form-control" placeholder="Keyword"
+                                                                   ng-model="subSearchText">
+                                                        </div>
+                                                        <div class="col-sm-3">
+                                                            <button class="btn btn-success" type="button" ng-click="searchSubClients(subSearchText,1)">
+                                                                <i class="fa fa-search"></i> Search
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-12 table-responsive">
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable1">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable2">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                    <div class="box-footer" ng-if="clients.length" style="float: right;">
+                                                        <uib-pagination class="pagination"
+                                                                        total-items="subClientPagination.totalCount"
+                                                                        boundary-links="true"
+                                                                        ng-model="subClientPagination.page"
+                                                                        items-per-page="subClientPagination.limit"
+                                                                        max-size="10"
+                                                                        ng-change="searchSubClients('',subClientPagination.page)"
+                                                                        previous-text="&lsaquo;"
+                                                                        next-text="&rsaquo;"
+                                                                        first-text="&laquo;"
+                                                                        last-text="&raquo;"></uib-pagination>
+                                                        <div class="row">
+                                                            <div class="col-xs-12">
+                                                                Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-danger" ng-click="checkSubClientChoseShow('')">Cancel</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="form-group col-xs-12"
@@ -240,8 +377,6 @@
                                     <button class="btn btn-success" type="button" ng-click="loadTradeLogs()">
                                         <i class="fa fa-search"></i> Search
                                     </button>
-                                    <!--<a ng-if="pagination.totalCount>0" class="btn btn-success" style="float: right"-->
-                                    <!--target="_blank" ng-href="{{export()}}">Export</a>-->
                                     <div class="btn-group" uib-dropdown ng-if="pagination.totalCount>0"
                                          style="float: right;right: 20px;">
                                         <button id="single-button" type="button" class="btn btn-primary"
@@ -258,7 +393,6 @@
                                                 Partner Detail)</a></li>
                                         </ul>
                                     </div>
-
                                 </div>
                             </div>
                         </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
index cb24010e1..355d14fbe 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
@@ -9,6 +9,45 @@
     .alignCen,.alignCen th{
         text-align: center;
     }
+    .white_content {
+        display: none;
+        position: absolute;
+        width: 80%;
+        height: 400px;
+        padding: 20px;
+        border: 1px solid orange;
+        background-color: white;
+        z-index:1002;
+        overflow: auto;
+    }
+    .white_content::-webkit-scrollbar:vertical {
+        width: 11px;
+    }
+    /*定义滚动条高宽及背景
+    高宽分别对应横竖滚动条的尺寸*/
+    .white_content::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        width:16px;
+        height:16px;
+        background-color:#F5F5F5;
+    }
+    /*定义滚动条轨道
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-track
+    {
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+        border-radius:10px;
+        background-color:#F5F5F5;
+    }
+    /*定义滑块
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-thumb
+    {
+        border-radius:10px;
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+        background-color:#555;
+    }
 </style>
 <section class="content-header">
     <h1>Settlement</h1>
@@ -19,7 +58,7 @@
         <li class="active">Settlement</li>
     </ol>
 </section>
-<div class="content">
+<div class="content" ng-click="clickDisplayChoseDiv($event)">
     <div class="row">
         <div class="col-sm-12">
             <div class="box-solid">
@@ -74,7 +113,7 @@
                                     <div class="form-group col-xs-12" ng-if="currentUser.client.has_children && !currentUser.client.hide_sub_mch">
                                         <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                                         <div class="col-sm-10 col-xs-8">
-                                            <p class="form-control-static">
+                                            <p class="form-control-static" ng-if="clients.length<50">
                                                 <a role="button" ng-class="{'bg-primary':isAll}"
                                                    ng-click="chooseClient('all')">All</a>
                                                 <label ng-repeat="sub in clients">
@@ -83,6 +122,103 @@
                                                               ng-click="chooseClient(sub)">{{sub.short_name}}</a>&nbsp;
                                                 </label>
                                             </p>
+                                            <p class="form-control-static" ng-if="clients.length>=50">
+                                                <a role="button" ng-class="{'bg-primary':isAll}"
+                                                   ng-click="chooseClient('all')">All</a>
+                                                <label ng-click="checkSubClientChoseShow('');choseDivStopPropagation($event)" style="cursor: pointer;">
+                                                    ｜ <input ng-model="choseSubClientNow" style="border:none;cursor: pointer;" readonly>
+                                                </label>
+                                            </p>
+                                            <div id="light" class="white_content"  ng-if="more20ChoseSubClient" style="display: block;" ng-click="choseDivStopPropagation($event)">
+                                                <div class="row">
+                                                    <div class="form-group col-xs-12">
+                                                        <div class="col-sm-8 col-xs-8">
+                                                            <input class="form-control" placeholder="Keyword"
+                                                                   ng-model="subSearchText">
+                                                        </div>
+                                                        <div class="col-sm-3">
+                                                            <button class="btn btn-success" type="button" ng-click="searchSubClients(subSearchText,1)">
+                                                                <i class="fa fa-search"></i> Search
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-12 table-responsive">
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable1">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable2">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                    <div class="box-footer" ng-if="clients.length" style="float: right;">
+                                                        <uib-pagination class="pagination"
+                                                                        total-items="subClientPagination.totalCount"
+                                                                        boundary-links="true"
+                                                                        ng-model="subClientPagination.page"
+                                                                        items-per-page="subClientPagination.limit"
+                                                                        max-size="10"
+                                                                        ng-change="searchSubClients('',subClientPagination.page)"
+                                                                        previous-text="&lsaquo;"
+                                                                        next-text="&rsaquo;"
+                                                                        first-text="&laquo;"
+                                                                        last-text="&raquo;"></uib-pagination>
+                                                        <div class="row">
+                                                            <div class="col-xs-12">
+                                                                Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-danger" ng-click="checkSubClientChoseShow('')">Cancel</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="form-group col-xs-12" ng-if="level3Clients && showLevel3Clients">
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index f283ffee2..a6b9760d8 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -78,6 +78,45 @@
     .line_height_ {
         line-height: 22px;
     }
+    .white_content {
+        display: none;
+        position: absolute;
+        width: 80%;
+        height: 400px;
+        padding: 20px;
+        border: 1px solid orange;
+        background-color: white;
+        z-index:1002;
+        overflow: auto;
+    }
+    .white_content::-webkit-scrollbar:vertical {
+        width: 11px;
+    }
+    /*定义滚动条高宽及背景
+    高宽分别对应横竖滚动条的尺寸*/
+    .white_content::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        width:16px;
+        height:16px;
+        background-color:#F5F5F5;
+    }
+    /*定义滚动条轨道
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-track
+    {
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+        border-radius:10px;
+        background-color:#F5F5F5;
+    }
+    /*定义滑块
+     内阴影+圆角*/
+    .white_content::-webkit-scrollbar-thumb
+    {
+        border-radius:10px;
+        -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+        background-color:#555;
+    }
 </style>
 <section class="content-header">
     <h1>Orders</h1>
@@ -88,7 +127,7 @@
         <li class="active">Orders</li>
     </ol>
 </section>
-<div class="content">
+<div class="content" ng-click="clickDisplayChoseDiv($event)">
     <div class="callout callout-info" ng-repeat="order in alerts">
         <h4><span style="font-size: 22px">{{order.display_amount|currency:order.currency+' '}}</span> Paid
             Success!</h4>
@@ -290,7 +329,7 @@
                                          ng-if="currentUser.client.has_children && !currentUser.client.hide_sub_mch">
                                         <label class="control-label col-xs-4 col-sm-2">Sub Partner</label>
                                         <div class="col-sm-10 col-xs-8">
-                                            <p class="form-control-static">
+                                            <p class="form-control-static" ng-if="clients.length<50">
                                                 <a role="button" ng-class="{'bg-primary':isAll}"
                                                    ng-click="chooseClient('all')">All</a>
                                                 <label ng-repeat="sub in clients">
@@ -301,6 +340,103 @@
                                                     &nbsp;
                                                 </label>
                                             </p>
+                                            <p class="form-control-static" ng-if="clients.length>=50">
+                                                <a role="button" ng-class="{'bg-primary':isAll}"
+                                                   ng-click="chooseClient('all')">All</a>
+                                                <label ng-click="checkSubClientChoseShow('');choseDivStopPropagation($event)" style="cursor: pointer;">
+                                                    ｜ <input ng-model="choseSubClientNow" style="border:none;cursor: pointer;" readonly>
+                                                </label>
+                                            </p>
+                                            <div id="light" class="white_content"  ng-if="more20ChoseSubClient" style="display: block;" ng-click="choseDivStopPropagation($event)">
+                                                <div class="row">
+                                                    <div class="form-group col-xs-12">
+                                                        <div class="col-sm-8 col-xs-8">
+                                                            <input class="form-control" placeholder="Keyword"
+                                                                   ng-model="subSearchText">
+                                                        </div>
+                                                        <div class="col-sm-3">
+                                                            <button class="btn btn-success" type="button" ng-click="searchSubClients(subSearchText,1)">
+                                                                <i class="fa fa-search"></i> Search
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-12 table-responsive">
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable1">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        <div class="col-sm-6" style="padding: 0 2px">
+                                                            <table class="table table-bordered table-striped table-hover" style="padding: 6px">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Partner Code</th>
+                                                                    <th>Partner Name</th>
+                                                                    <th>Operation</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                <tr ng-repeat="subPartner in subClientTable2">
+                                                                    <td ng-click="showClient(subPartner); toShow = !toShow" style="cursor:pointer">
+                                                                        {{subPartner.client_moniker}}
+                                                                    </td>
+                                                                    <td ng-bind="subPartner.short_name"></td>
+                                                                    <td>
+                                                                        <button role="button" class="btn btn-info" title="Add Search"
+                                                                                style="padding: 1px 6px;"
+                                                                                ng-click="chooseClient(subPartner);checkSubClientChoseShow(subPartner)">
+                                                                            <i class="fa fa-plus"></i>
+                                                                        </button>
+                                                                    </td>
+                                                                </tr>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                    <div class="box-footer" ng-if="clients.length" style="float: right;">
+                                                        <uib-pagination class="pagination"
+                                                                        total-items="subClientPagination.totalCount"
+                                                                        boundary-links="true"
+                                                                        ng-model="subClientPagination.page"
+                                                                        items-per-page="subClientPagination.limit"
+                                                                        max-size="10"
+                                                                        ng-change="searchSubClients('',subClientPagination.page)"
+                                                                        previous-text="&lsaquo;"
+                                                                        next-text="&rsaquo;"
+                                                                        first-text="&laquo;"
+                                                                        last-text="&raquo;"></uib-pagination>
+                                                        <div class="row">
+                                                            <div class="col-xs-12">
+                                                                Total Records:{{subClientPagination.totalCount}};Total Pages:{{subClientPagination.totalPages}}
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-danger" ng-click="checkSubClientChoseShow('')">Cancel</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="form-group col-xs-12"
diff --git a/src/main/ui/static/payment/tradelog/tradelog.js b/src/main/ui/static/payment/tradelog/tradelog.js
index 703aeaaa8..155288858 100644
--- a/src/main/ui/static/payment/tradelog/tradelog.js
+++ b/src/main/ui/static/payment/tradelog/tradelog.js
@@ -28,6 +28,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             $scope.dev_params = {client_type:'sunmi',limit:100};
             $scope.clients = [$scope.currentUser.client];
             $scope.showLevel3Clients = false;
+            $scope.subClientTable1 = [$scope.currentUser.client];
+            $scope.subClientTable2 = [];
+            $scope.choseSubClientNow = 'chose';
+            $scope.subSearchText = '';
 
 
             $scope.chooseToday = function () {
@@ -72,6 +76,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 if (params.dateto) {
                     params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 }
+                if ($scope.isAll) {
+                    delete params.client_ids;
+                }
                 params.page = page || $scope.pagination.page || 1;
                 if(params.gateway){
                     if((params.gateway.sort().toString()!=[0,1].toString()) && (params.gateway.sort().toString()!=[5,6].toString())){
@@ -183,6 +190,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             });
             $scope.chooseClient = function (client) {
                 if (client == 'all') {
+                    $scope.choseSubClientNow = 'chose';
                     $scope.params.client_ids = angular.copy($scope.clientIds);
                     $scope.isAll = true;
                     $scope.chooseClientId = '';
@@ -235,12 +243,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
             $scope.listDevices = function () {
                 var params = angular.copy($scope.dev_params)
+                if ($scope.isAll) {
+                    delete params.client_ids;
+                }
                 $http.get('/client/partner_info/devices', {params: params}).then(function (resp) {
                     $scope.devices = resp.data.data;
                 })
             };
             $scope.listDevicesIds = function () {
                 var params = angular.copy($scope.params)
+                if ($scope.isAll) {
+                    delete params.client_ids;
+                }
                 $http.get('/client/partner_info/device_ids',{params: params}).then(function (resp) {
                     $scope.deviceIds = resp.data.data;
                 })
@@ -278,10 +292,25 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             $scope.listDevices();
             $scope.listDevicesIds();
 
-            if ($scope.currentUser.client.has_children && !$scope.currentUser.client.hide_sub_mch) {
-                $http.get('/client/partner_info/sub_partners').then(function (resp) {
-                    var clientList = resp.data;
+            $scope.searchSubClients = function (subSearchText,page) {
+
+                $scope.subClientTable1 = [$scope.currentUser.client];
+                $scope.subClientTable2 = [];
+                var params = {};
+                params.page = page || $scope.subClientPagination.page || 1;
+                if (subSearchText != '') {
+                    $scope.subSearchText = subSearchText;
+                    params.searchText = subSearchText;
+                }
+                $http.get('/client/partner_info/sub_partners/page',{params: params}).then(function (resp) {
+                    var clientList = resp.data.data;
+                    $scope.subClientPagination = resp.data.pagination;
                     clientList.forEach(function (client) {
+                        if ($scope.subClientTable1.length < 11) {
+                            $scope.subClientTable1.push(client);
+                        }else {
+                            $scope.subClientTable2.push(client);
+                        }
                         $scope.clients.push(client);
                     });
                     $scope.clientIds = [];
@@ -294,12 +323,22 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                         }
                     });
                     $scope.params.client_ids = angular.copy($scope.clientIds);
-                    $scope.loadTradeLogs(1);
-                    $scope.listDevicesIds();
-                    //console.log($rootScope.currentUser.client.clientList);
-                })
+                });
+            };
+
+            if ($scope.currentUser.client.has_children && !$scope.currentUser.client.hide_sub_mch) {
+                $scope.searchSubClients('',1);
+                $scope.params.dateto = new Date();
+                var day = new Date();
+                day.setDate(day.getDate() - 7);
+                $scope.params.datefrom = day;
+                $scope.chooseClient('all')
             }else{
-                $scope.loadTradeLogs(1);
+                $scope.params.dateto = new Date();
+                var day = new Date();
+                day.setDate(day.getDate() - 7);
+                $scope.params.datefrom = day;
+                $scope.chooseClient('all');
             }
 
             $scope.fullReleasePreAuth = function (){
@@ -322,6 +361,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     })
                 });
             }
+            $scope.checkSubClientChoseShow = function (client) {
+                $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient;
+                if (client != '') {
+                    $scope.choseSubClientNow = client.short_name;
+                }
+            }
+            $scope.clickDisplayChoseDiv = function (event) {
+                $scope.more20ChoseSubClient = false;
+            }
+            $scope.choseDivStopPropagation = function (event) {
+                event.stopPropagation()
+            };
         }]);
 
     app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog',
@@ -426,6 +477,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             });
             $scope.chooseClient = function (client) {
                 if (client == 'all') {
+                    $scope.choseSubClientNow = 'chose';
                     $scope.params.client_ids = angular.copy($scope.clientIds);
                     $scope.isAll = true;
                     $scope.chooseClientId = '';
diff --git a/src/main/ui/static/payment/tradelog/transflow.js b/src/main/ui/static/payment/tradelog/transflow.js
index 58b211d21..6bd6bb890 100644
--- a/src/main/ui/static/payment/tradelog/transflow.js
+++ b/src/main/ui/static/payment/tradelog/transflow.js
@@ -15,6 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
     app.controller('balanceListCtrl', ['$scope', '$http', '$filter', '$timeout', 'refunder', 'orderService','$sce', function ($scope, $http, $filter, $timeout, refunder,orderService,$sce) {
         $scope.params = {textType: 'all'};
         $scope.pagination = {};
+        $scope.subClientPagination = {};
         $scope.params.clearing_status = -1;
         $scope.params.channel = 'ALL'
         $scope.dev_params = {client_type:'sunmi',limit:100};
@@ -22,9 +23,14 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         $scope.order_device_isAll = true;
         $scope.params.trans_type = 0;
         $scope.isAll = true;
+        $scope.more20ChoseSubClient = false;
         $scope.clients = [$scope.currentUser.client];
         $scope.params.client_ids = [$scope.currentUser.client.client_id];
         $scope.showLevel3Clients = false;
+        $scope.subClientTable1 = [$scope.currentUser.client];
+        $scope.subClientTable2 = [];
+        $scope.choseSubClientNow = 'chose';
+        $scope.subSearchText = '';
 
         $scope.today = new Date();
         $scope.chooseToday = function () {
@@ -42,7 +48,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             var day = new Date();
             day.setDate(day.getDate() - 7);
             $scope.params.datefrom = day;
-            $scope.chooseClient('all');
+            $scope.loadTradeLogs(1);
         };
         $scope.thisMonth = function () {
             $scope.params.dateto = new Date();
@@ -63,12 +69,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         };
         $scope.listDevices = function () {
             var params = angular.copy($scope.dev_params)
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             $http.get('/client/partner_info/devices', {params: params}).then(function (resp) {
                 $scope.devices = resp.data.data;
             })
         };
         $scope.listDevicesIds = function () {
             var params = angular.copy($scope.params)
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             $http.get('/client/partner_info/device_ids',{params: params}).then(function (resp) {
                 $scope.deviceIds = resp.data.data;
             })
@@ -104,8 +116,46 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         };
         $scope.listDevices();
         $scope.listDevicesIds();
+
+        $scope.searchSubClients = function (subSearchText,page) {
+
+            $scope.subClientTable1 = [$scope.currentUser.client];
+            $scope.subClientTable2 = [];
+            var params = {};
+            params.page = page || $scope.subClientPagination.page || 1;
+            if (subSearchText != '') {
+                $scope.subSearchText = subSearchText;
+                params.searchText = subSearchText;
+            }
+            $http.get('/client/partner_info/sub_partners/page',{params: params}).then(function (resp) {
+                var clientList = resp.data.data;
+                $scope.subClientPagination = resp.data.pagination;
+                clientList.forEach(function (client) {
+                    if ($scope.subClientTable1.length < 11) {
+                        $scope.subClientTable1.push(client);
+                    }else {
+                        $scope.subClientTable2.push(client);
+                    }
+                    $scope.clients.push(client);
+                });
+                $scope.clientIds = [];
+                $scope.clients.forEach(function (client) {
+                    $scope.clientIds.push(client.client_id);
+                    if (client.level3Clients) {
+                        client.level3Clients.forEach(function (level3Client) {
+                            $scope.clientIds.push(level3Client.client_id);
+                        });
+                    }
+                });
+                $scope.params.client_ids = angular.copy($scope.clientIds);
+            });
+        };
+
         $scope.loadTradeLogs = function (page) {
             var params = angular.copy($scope.params);
+            if ($scope.isAll) {
+                delete params.client_ids;
+            }
             if (params.datefrom) {
                 params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd');
             }
@@ -124,6 +174,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         };
         $scope.chooseClient = function (client) {
             if (client == 'all') {
+                $scope.choseSubClientNow = 'chose';
                 $scope.params.client_ids = angular.copy($scope.clientIds);
                 $scope.isAll = true;
                 $scope.chooseClientId = '';
@@ -200,7 +251,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
               url += connectSymbol + 'dev_id=' + params.dev_id;
               connectSymbol = '&'
             }
-            if (params.client_ids) {
+            if (params.client_ids && !$scope.isAll) {
                 params.client_ids.forEach(function (i) {
                     url += connectSymbol + 'client_ids=' + i;
                     connectSymbol = '&';
@@ -223,25 +274,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
         }
         if ($scope.currentUser.client.has_children && !$scope.currentUser.client.hide_sub_mch) {
-            $http.get('/client/partner_info/sub_partners').then(function (resp) {
-                var clientList = resp.data;
-                clientList.forEach(function (client) {
-                    $scope.clients.push(client);
-                });
-                $scope.clientIds = [];
-                $scope.clients.forEach(function (client) {
-                    $scope.clientIds.push(client.client_id);
-                    if (client.level3Clients) {
-                        client.level3Clients.forEach(function (level3Client) {
-                            $scope.clientIds.push(level3Client.client_id);
-                        });
-                    }
-                });
-                $scope.params.client_ids = angular.copy($scope.clientIds);
-                $scope.chooseLast7Days();
-            })
+            $scope.searchSubClients('',1);
+            $scope.params.dateto = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            $scope.params.datefrom = day;
+            $scope.chooseClient('all');
         }else {
-            $scope.chooseLast7Days();
+            $scope.params.dateto = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            $scope.params.datefrom = day;
+            $scope.chooseClient('all');
         }
 
         $scope.htmlToolst = function(){
@@ -264,6 +308,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 $scope.tradeLogs[i].htmlTooltip = $sce.trustAsHtml(tip);
             }
         };
+        $scope.checkSubClientChoseShow = function (client) {
+            $scope.more20ChoseSubClient = !$scope.more20ChoseSubClient;
+            if (client != '') {
+                $scope.choseSubClientNow = client.short_name;
+            }
+        }
+        $scope.clickDisplayChoseDiv = function (event) {
+            $scope.more20ChoseSubClient = false;
+        }
+        $scope.choseDivStopPropagation = function (event) {
+            event.stopPropagation()
+        };
 
     }]);