From f669b3ffda72fd3cc6577532f19bae44775346e7 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 23 Sep 2025 11:04:42 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A00=E5=85=83=E4=BC=9A=E5=91=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/system/board/BoardMapper.xml | 72 ++++++++++--------- 1 file changed, 40 insertions(+), 32 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 3f266cda..89815721 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 @@ -9,38 +9,42 @@ from (select count(1) member_total from cu_member cm where cm.del_flag = 0 - and cm.pay_status = 1 and cm.category = 0 + and (cm.pay_status = 1 or + (cm.pay_status = 0 and cm.pk_settle_grade = 1)) 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.category = 0 + and ((to_char(cm.pay_time, 'yyyy-mm-dd') = + to_char(sysdate, 'yyyy-mm-dd') and cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm-dd') = + to_char(sysdate, 'yyyy-mm-dd') and cm.pay_status = 0)) + 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 - and cm.pay_status = 1 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 ((to_char(cm.pay_time, 'yyyy-mm-dd') = + to_char(sysdate - 1, 'yyyy-mm-dd') and + cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm-dd') = + to_char(sysdate - 1, 'yyyy-mm-dd') and + cm.pay_status = 0)) + and cm.customer_type != 1) c on 1 = 1 left join (select count(1) member_month 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') = - to_char(sysdate, 'yyyy-mm') - and cm.customer_type != 1 - ) d on 1 = 1 + and ((to_char(cm.pay_time, 'yyyy-mm') = + to_char(sysdate, 'yyyy-mm') and cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm') = + to_char(sysdate, 'yyyy-mm') and cm.pay_status = 0)) + and cm.customer_type != 1) d + on 1 = 1 @@ -48,14 +52,15 @@ select bg.grade_name, bg.grade_value, nvl(a.member_total, 0) member_total, - 0 sort + 0 sort from (select cm.PK_REGISTER_GRADE, count(1) member_total 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 ((to_char(cm.pay_time, 'yyyy-mm-dd') = + to_char(sysdate, 'yyyy-mm-dd') and cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm-dd') = + to_char(sysdate, 'yyyy-mm-dd') and cm.pay_status = 0)) and cm.customer_type != 1 group by cm.PK_REGISTER_GRADE order by cm.PK_REGISTER_GRADE) a @@ -66,14 +71,15 @@ select bg.grade_name, bg.grade_value, nvl(a.member_total, 0) member_total, - 1 sort + 1 sort from (select cm.PK_REGISTER_GRADE, count(1) member_total 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 - 1, 'yyyy-mm-dd') + and ((to_char(cm.pay_time, 'yyyy-mm-dd') = + to_char(sysdate - 1, 'yyyy-mm-dd') and cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm-dd') = + to_char(sysdate - 1, 'yyyy-mm-dd') and cm.pay_status = 0)) and cm.customer_type != 1 group by cm.PK_REGISTER_GRADE order by cm.PK_REGISTER_GRADE) a @@ -84,13 +90,15 @@ select bg.grade_name, bg.grade_value, nvl(a.member_total, 0) member_total, - 2 sort + 2 sort from (select cm.PK_REGISTER_GRADE, count(1) member_total 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') = to_char(sysdate, 'yyyy-mm') + and ((to_char(cm.pay_time, 'yyyy-mm') = + to_char(sysdate, 'yyyy-mm') and cm.pay_status = 1) or + (to_char(cm.creation_time, 'yyyy-mm') = + to_char(sysdate, 'yyyy-mm') and cm.pay_status = 0)) and cm.customer_type != 1 group by cm.PK_REGISTER_GRADE order by cm.PK_REGISTER_GRADE) a