From fbace91837850c60c1cbcd70b72783fdc8532ca3 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 25 Jul 2025 15:05:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?##=20Fix=20-=20=E6=94=B6=E7=9B=8A=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=20->=20=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/member/base/CuMemberMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index 29a0be7d..2b2f3dcd 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -3174,7 +3174,7 @@
                 LEFT JOIN BD_AREA P ON P.PK_ID = cmrr.PROVINCE AND P.DEL_FLAG = 0
                 LEFT JOIN BD_AREA C ON C.PK_ID = cmrr.CITY AND C.DEL_FLAG = 0
                 LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0
-        where 1=1
+        where cmrr.del_flag = 0
           AND cmrr.PK_MEMBER IN ( #{userId} )
         <if test="type != null and type == 1">
             and cmrr.PROVINCE != 0

From 12727242b43de82b2894cab1a93e122fb7bfb0ed Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 25 Jul 2025 15:31:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?##=20Fix=20-=20=E6=94=B6=E7=9B=8A=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=20->=20=E8=B0=83=E6=95=B4=E5=88=A4=E6=96=AD=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzs/member/base/service/impl/CuMemberServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index 483ffd38..606c02e0 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -3397,9 +3397,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         if(CollUtil.isNotEmpty(regionConfigList)){
             // 匹配到的区域配置
             for (BdAwardsRegionConfig config : regionConfigList) {
-//                BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData();
+                BdAwards configAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData();
                 // 判断业绩
-                if(smallPv.compareTo(bdAwards.getSmallAssess()) >= 0){
+                if(smallPv.compareTo(configAwards.getSmallAssess()) >= 0){
                     CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType());
                     if(ObjectUtil.isEmpty(regionDetail)){
                         if(bdAwards.getAwardsValue() >= config.getAwardsValue()){