From 131d88fe1b4bc470702650bd7b5c3df0d274196e Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Tue, 28 Oct 2025 15:02:57 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=9A=E5=91=98=E6=95=B0=E6=8D=AE=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/board/BoardMapper.xml       | 143 ++++++++----------
 1 file changed, 63 insertions(+), 80 deletions(-)

diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
index 69142d8e..e72e7579 100644
--- a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
+++ b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
@@ -12,16 +12,14 @@
                 and cm.pay_status = 1
                 and cm.category = 0
                 and cm.customer_type != 1) a
-                 left join (
-            select count(1) member_today
-            from cu_member cm
-            where cm.del_flag = 0
-              and cm.pay_status = 1
-              and cm.category = 0
-              and to_char(cm.pay_time, 'yyyy-mm-dd') =
-                  to_char(sysdate, 'yyyy-mm-dd')
-              and cm.customer_type != 1
-        ) b on 1 = 1
+                 left join (select count(1) member_today
+                            from cu_member cm
+                            where cm.del_flag = 0
+                              and cm.pay_status = 1
+                              and cm.category = 0
+                              and to_char(cm.pay_time, 'yyyy-mm-dd') =
+                                  to_char(sysdate, 'yyyy-mm-dd')
+                              and cm.customer_type != 1) b on 1 = 1
                  left join (select count(1) member_yesterday
                             from cu_member cm
                             where cm.del_flag = 0
@@ -29,8 +27,7 @@
                               and cm.category = 0
                               and to_char(cm.pay_time, 'yyyy-mm-dd') =
                                   to_char(sysdate - 1, 'yyyy-mm-dd')
-                              and cm.customer_type != 1
-        ) c
+                              and cm.customer_type != 1) c
                            on 1 = 1
                  left join (select count(1) member_month
                             from cu_member cm
@@ -39,8 +36,7 @@
                               and cm.category = 0
                               and to_char(cm.pay_time, 'yyyy-mm') =
                                   to_char(sysdate, 'yyyy-mm')
-                              and cm.customer_type != 1
-        ) d on 1 = 1
+                              and cm.customer_type != 1) d on 1 = 1
     </select>
 
     <!-- 会员各等级数据 -->
@@ -51,11 +47,10 @@
                0                      sort
         from (select cm.PK_SETTLE_GRADE, count(1) member_total
               from cu_member cm
-              where cm.del_flag = 0
-                and cm.category = 0
-                and to_char(cm.CREATION_TIME, 'yyyy-mm-dd') =
-                    to_char(sysdate, 'yyyy-mm-dd')
-                and cm.customer_type != 1
+              WHERE cm.del_flag = 0
+                AND cm.category = 0
+                AND cm.PAY_TIME IS NOT NULL
+                AND to_char(cm.PAY_TIME, 'yyyy-mm-dd') = to_char(SYSDATE, 'yyyy-mm-dd')
               group by cm.PK_SETTLE_GRADE
               order by cm.PK_SETTLE_GRADE) a
                  right join bd_grade bg
@@ -68,11 +63,10 @@
                1                      sort
         from (select cm.PK_SETTLE_GRADE, count(1) member_total
               from cu_member cm
-              where cm.del_flag = 0
-                and cm.category = 0
-                and to_char(cm.CREATION_TIME, 'yyyy-mm-dd') =
-                    to_char(sysdate - 1, 'yyyy-mm-dd')
-                and cm.customer_type != 1
+              WHERE cm.del_flag = 0
+                AND cm.category = 0
+                AND cm.PAY_TIME IS NOT NULL
+                AND to_char(cm.PAY_TIME, 'yyyy-mm-dd') = to_char(SYSDATE - 1, 'yyyy-mm-dd')
               group by cm.PK_SETTLE_GRADE
               order by cm.PK_SETTLE_GRADE) a
                  right join bd_grade bg
@@ -85,10 +79,10 @@
                2                      sort
         from (select cm.PK_SETTLE_GRADE, count(1) member_total
               from cu_member cm
-              where cm.del_flag = 0
-                and cm.category = 0
-                and to_char(cm.CREATION_TIME, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm')
-                and cm.customer_type != 1
+              WHERE cm.del_flag = 0
+                AND cm.category = 0
+                AND cm.PAY_TIME IS NOT NULL
+                AND to_char(cm.PAY_TIME, 'yyyy-mm') = to_char(SYSDATE, 'yyyy-mm')
               group by cm.PK_SETTLE_GRADE
               order by cm.PK_SETTLE_GRADE) a
                  right join bd_grade bg
@@ -100,48 +94,40 @@
     <!-- 查询日业绩汇总数据 -->
     <select id="getDayAchieve" resultType="com.hzs.system.board.vo.BoardAchieveVO">
         select a.*, b.*, 0 sort
-        from (
-                 select nvl(sum(so.order_achieve), 0) first_achieve,
-                        nvl(sum(so.order_amount), 0)  first_amount
-                 from sa_order so
-                 where so.del_flag = 0
-                   and so.order_status = 1
-                   and so.order_type in (41, 42)
-                   and to_char(so.pay_time, 'yyyy-mm-dd') =
-                       to_char(sysdate, 'yyyy-mm-dd')
-             ) a
-                 left join (
-            select nvl(sum(so.order_achieve), 0) rep_achieve,
-                   nvl(sum(so.order_amount), 0)  rep_amount
-            from sa_order so
-            where so.del_flag = 0
-              and so.order_status = 1
-              and so.order_type in (43, 44, 47)
-              and to_char(so.pay_time, 'yyyy-mm-dd') =
-                  to_char(sysdate, 'yyyy-mm-dd')
-        ) b on 1 = 1
+        from (select nvl(sum(so.order_achieve), 0) first_achieve,
+                     nvl(sum(so.order_amount), 0)  first_amount
+              from sa_order so
+              where so.del_flag = 0
+                and so.order_status = 1
+                and so.order_type in (41, 42)
+                and to_char(so.pay_time, 'yyyy-mm-dd') =
+                    to_char(sysdate, 'yyyy-mm-dd')) a
+                 left join (select nvl(sum(so.order_achieve), 0) rep_achieve,
+                                   nvl(sum(so.order_amount), 0)  rep_amount
+                            from sa_order so
+                            where so.del_flag = 0
+                              and so.order_status = 1
+                              and so.order_type in (43, 44, 47)
+                              and to_char(so.pay_time, 'yyyy-mm-dd') =
+                                  to_char(sysdate, 'yyyy-mm-dd')) b on 1 = 1
         union all
         select a.*, b.*, 1 sort
-        from (
-                 select nvl(sum(so.order_achieve), 0) first_achieve,
-                        nvl(sum(so.order_amount), 0)  first_amount
-                 from sa_order so
-                 where so.del_flag = 0
-                   and so.order_status = 1
-                   and so.order_type in (41, 42)
-                   and to_char(so.pay_time, 'yyyy-mm-dd') =
-                       to_char(sysdate - 1, 'yyyy-mm-dd')
-             ) a
-                 left join (
-            select nvl(sum(so.order_achieve), 0) rep_achieve,
-                   nvl(sum(so.order_amount), 0)  rep_amount
-            from sa_order so
-            where so.del_flag = 0
-              and so.order_status = 1
-              and so.order_type in (43, 44, 47)
-              and to_char(so.pay_time, 'yyyy-mm-dd') =
-                  to_char(sysdate - 1, 'yyyy-mm-dd')
-        ) b on 1 = 1
+        from (select nvl(sum(so.order_achieve), 0) first_achieve,
+                     nvl(sum(so.order_amount), 0)  first_amount
+              from sa_order so
+              where so.del_flag = 0
+                and so.order_status = 1
+                and so.order_type in (41, 42)
+                and to_char(so.pay_time, 'yyyy-mm-dd') =
+                    to_char(sysdate - 1, 'yyyy-mm-dd')) a
+                 left join (select nvl(sum(so.order_achieve), 0) rep_achieve,
+                                   nvl(sum(so.order_amount), 0)  rep_amount
+                            from sa_order so
+                            where so.del_flag = 0
+                              and so.order_status = 1
+                              and so.order_type in (43, 44, 47)
+                              and to_char(so.pay_time, 'yyyy-mm-dd') =
+                                  to_char(sysdate - 1, 'yyyy-mm-dd')) b on 1 = 1
         order by sort
     </select>
 
@@ -154,18 +140,15 @@
               where so.del_flag = 0
                 and so.order_status = 1
                 and so.order_type in (41, 42)
-                and to_char(so.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm')
-             ) a
-                 left join (
-            select nvl(sum(so.order_achieve), 0)                            rep_achieve,
-                   nvl(sum(so.order_amount - nvl(so.CONSUME_AMOUNT, 0)), 0) rep_amount
-            from sa_order so
-            where so.del_flag = 0
-              and so.order_status = 1
-              and so.order_type in (43, 44, 47)
-              and to_char(so.pay_time, 'yyyy-mm') =
-                  to_char(sysdate, 'yyyy-mm')
-        ) b on 1 = 1
+                and to_char(so.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm')) a
+                 left join (select nvl(sum(so.order_achieve), 0)                            rep_achieve,
+                                   nvl(sum(so.order_amount - nvl(so.CONSUME_AMOUNT, 0)), 0) rep_amount
+                            from sa_order so
+                            where so.del_flag = 0
+                              and so.order_status = 1
+                              and so.order_type in (43, 44, 47)
+                              and to_char(so.pay_time, 'yyyy-mm') =
+                                  to_char(sysdate, 'yyyy-mm')) b on 1 = 1
     </select>
 
     <!-- 各币种充值数据 -->