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 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()){ 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} ) and cmrr.PROVINCE != 0