Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		
						commit
						462a7ac369
					
				|  | @ -52,9 +52,8 @@ | ||||||
|         from (select cm.PK_SETTLE_GRADE, count(1) member_total |         from (select cm.PK_SETTLE_GRADE, count(1) member_total | ||||||
|               from cu_member cm |               from cu_member cm | ||||||
|               where cm.del_flag = 0 |               where cm.del_flag = 0 | ||||||
|                 and cm.pay_status = 1 |  | ||||||
|                 and cm.category = 0 |                 and cm.category = 0 | ||||||
|                 and to_char(cm.pay_time, 'yyyy-mm-dd') = |                 and to_char(cm.CREATION_TIME, 'yyyy-mm-dd') = | ||||||
|                     to_char(sysdate, 'yyyy-mm-dd') |                     to_char(sysdate, 'yyyy-mm-dd') | ||||||
|                 and cm.customer_type != 1 |                 and cm.customer_type != 1 | ||||||
|               group by cm.PK_SETTLE_GRADE |               group by cm.PK_SETTLE_GRADE | ||||||
|  | @ -70,9 +69,8 @@ | ||||||
|         from (select cm.PK_SETTLE_GRADE, count(1) member_total |         from (select cm.PK_SETTLE_GRADE, count(1) member_total | ||||||
|               from cu_member cm |               from cu_member cm | ||||||
|               where cm.del_flag = 0 |               where cm.del_flag = 0 | ||||||
|                 and cm.pay_status = 1 |  | ||||||
|                 and cm.category = 0 |                 and cm.category = 0 | ||||||
|                 and to_char(cm.pay_time, 'yyyy-mm-dd') = |                 and to_char(cm.CREATION_TIME, 'yyyy-mm-dd') = | ||||||
|                     to_char(sysdate - 1, 'yyyy-mm-dd') |                     to_char(sysdate - 1, 'yyyy-mm-dd') | ||||||
|                 and cm.customer_type != 1 |                 and cm.customer_type != 1 | ||||||
|               group by cm.PK_SETTLE_GRADE |               group by cm.PK_SETTLE_GRADE | ||||||
|  | @ -88,9 +86,8 @@ | ||||||
|         from (select cm.PK_SETTLE_GRADE, count(1) member_total |         from (select cm.PK_SETTLE_GRADE, count(1) member_total | ||||||
|               from cu_member cm |               from cu_member cm | ||||||
|               where cm.del_flag = 0 |               where cm.del_flag = 0 | ||||||
|                 and cm.pay_status = 1 |  | ||||||
|                 and cm.category = 0 |                 and cm.category = 0 | ||||||
|                 and to_char(cm.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm') |                 and to_char(cm.CREATION_TIME, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm') | ||||||
|                 and cm.customer_type != 1 |                 and cm.customer_type != 1 | ||||||
|               group by cm.PK_SETTLE_GRADE |               group by cm.PK_SETTLE_GRADE | ||||||
|               order by cm.PK_SETTLE_GRADE) a |               order by cm.PK_SETTLE_GRADE) a | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue