From c0e7541185e94eeeba525e95947896efa692d58d Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Sat, 12 Oct 2019 10:19:05 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E7=AE=A1=E7=90=86=E7=AB=AFBD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=86=E6=9E=90,=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=95=86=E6=88=B7=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=BA:=E7=BB=9F=E8=AE=A1BD=E4=B8=8B=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E6=96=B0=E5=A2=9E=E5=95=86=E6=88=B7,?=
 =?UTF-8?q?=E6=96=B0=E8=BD=AC=E5=85=A5=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impls/BDAnalysisServiceImpl.java     |  2 +-
 .../analysis/mappers/BDAnalysisMapper.java    |  3 ++
 .../analysis/mappers/BDAnalysisMapper.xml     | 23 +++++++++
 .../manage/mappers/system/ClientMapper.xml    | 51 +++++++++++++------
 5 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index a07438a41..ed8df5983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.28</version>
+    <version>1.2.29</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java
index 6750378d3..65f971984 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java
@@ -51,7 +51,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
     }
 
     private List<JSONObject> listSalesAnalysis(JSONObject jsonObject) {
-        List<JSONObject> listCountApproved = bdAnalysisMapper.countApproved(jsonObject);
+        List<JSONObject> listCountApproved = bdAnalysisMapper.queryBDNewMerchants(jsonObject);
         List<JSONObject> bdSaleList = bdSalesReportMapper.getBDSaleList(jsonObject);
         for (JSONObject countApproved : listCountApproved) {
             for (JSONObject saleList : bdSaleList) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
index c3cc1400c..b705509f5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java
@@ -29,4 +29,7 @@ public interface BDAnalysisMapper {
 
     //获取指定一天销售数据
     List<JSONObject> getOneDayBDSaleList(JSONObject params);
+
+    //查询时间段范围BD新增商户
+    List<JSONObject> queryBDNewMerchants(JSONObject params);
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index 24e059359..2efa2d358 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -249,4 +249,27 @@
         ORDER BY pay_amount DESC
     </select>
 
+    <!--此处多分组一次t表，是因为查询的结果会存在误操作的记录-->
+    <select id="queryBDNewMerchants" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT t.bd_id,t.bd_name,count(t.client_id) num FROM (
+             SELECT bd_id,bd_name,client_id
+             FROM sys_client_bd
+             WHERE
+                    is_valid = 1
+             AND create_time &gt;= #{begin}
+             AND create_time &lt; #{end}
+             AND client_id IN (
+                SELECT client_id FROM sys_clients
+                WHERE is_valid = 1
+                AND approve_result = 1
+                <if test="org_id != null">
+                    AND org_id = #{org_id}
+                </if>
+              )
+              GROUP BY client_id,bd_id
+        ) t
+        GROUP BY t.bd_id
+        ORDER BY num DESC
+    </select>
+
 </mapper>
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 7fcb9c768..e0f0e01d3 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
@@ -675,24 +675,43 @@
 
     </select>
 
+    <!--此处多分组一次t表，是因为查询的结果会存在误操作的记录-->
     <select id="findCountByBd" resultType="com.alibaba.fastjson.JSONObject">
         SELECT *
         FROM (
-                 SELECT count(*) yesterday_count
-                 FROM sys_clients
-                 WHERE creator = #{bd_group}
-                   AND create_time &gt;= #{yesterday}
-                   AND create_time &lt; #{today}
-                   AND is_valid = 1
-             ) a,
-             (
-                 SELECT count(*) month_count
-                 FROM sys_clients
-                 WHERE creator = #{bd_group}
-                   AND create_time &gt;= #{month}
-                   AND create_time &lt; #{today}
-                   AND is_valid = 1
-             ) b
+           SELECT count(client_id) yesterday_count
+            FROM (
+                SELECT bd.client_id
+                FROM sys_client_bd AS bd
+                WHERE
+                bd.is_valid = 1
+                AND bd.bd_id = #{bd_group}
+                AND bd.create_time &gt;= #{yesterday}
+                AND bd.create_time &lt; #{today}
+                AND bd.client_id IN (
+                        SELECT client_id FROM sys_clients
+                        WHERE is_valid = 1
+                        AND approve_result = 1)
+                GROUP BY bd.client_id,bd_id
+            ) t
+        ) a,
+        (
+           SELECT count(client_id) yesterday_count
+            FROM (
+                SELECT bd.client_id
+                FROM sys_client_bd AS bd
+                WHERE
+                bd.is_valid = 1
+              AND bd.bd_id = #{bd_group}
+                AND bd.create_time &gt;= #{month}
+                AND bd.create_time &lt; #{today}
+                AND bd.client_id IN (
+                        SELECT client_id FROM sys_clients
+                        WHERE is_valid = 1
+                        AND approve_result = 1)
+                GROUP BY bd.client_id,bd_id
+            ) t
+        ) b
     </select>
 
     <select id="findSamePhone" resultType="com.alibaba.fastjson.JSONObject">
@@ -738,4 +757,6 @@
           and client_id >= #{start}
           and client_id &lt; #{end}
     </select>
+
+
 </mapper>