From 2049e0e2b1126610ff4c1e265d84ef39597de92c Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 3 Nov 2025 09:47:45 +0800 Subject: [PATCH] =?UTF-8?q?##=20bug460=20=E7=9B=B4=E6=8E=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/report/member/CuMemberAwardsStatMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml index 9645cf3f..95b5d329 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml @@ -733,7 +733,8 @@ select SUM(so.ORDER_ACHIEVE) ORDER_ACHIEVE,so.PK_REFERENCE from CU_MEMBER cmm INNER JOIN SA_ORDER so on so.PK_REFERENCE=cmm.PK_ID and so.DEL_FLAG=0 and so.ORDER_STATUS=1 and so.PK_COUNTRY=#{dpdVO.pkCountry} where cmm.DEL_FLAG=0 - and so.ORDER_TYPE in (1,2,24,25) + and ((so.ORDER_TYPE = 3 and so.ORDER_TYPE_EXTEND = 1) + or so.ORDER_TYPE in (1,2,24,25)) and cmm.PK_PARENT=#{dpdVO.pkMember} @@ -763,7 +764,8 @@ where cm.DEL_FLAG = 0 AND cm.CATEGORY = 0 AND PK_SETTLE_COUNTRY = 1 and so.DEL_FLAG = 0 and so.ORDER_STATUS=1 - and so.ORDER_TYPE in (1,2,24,25) + and ((so.ORDER_TYPE = 3 and so.ORDER_TYPE_EXTEND = 1) + or so.ORDER_TYPE in (1,2,24,25)) AND cm.MEMBER_CODE =#{dpdVO.memberCode}