angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bd_dev' into bd_dev

This commit is contained in:
cabbage 2025-07-25 15:41:23 +08:00
parent dbcc051277 12727242b4
commit 860aef9224
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -3397,9 +3397,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
if(CollUtil.isNotEmpty(regionConfigList)){ if(CollUtil.isNotEmpty(regionConfigList)){
// 匹配到的区域配置 // 匹配到的区域配置
for (BdAwardsRegionConfig config : 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()); CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType());
if(ObjectUtil.isEmpty(regionDetail)){ if(ObjectUtil.isEmpty(regionDetail)){
if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ if(bdAwards.getAwardsValue() >= config.getAwardsValue()){

2
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -3174,7 +3174,7 @@
LEFT JOIN BD_AREA P ON P.PK_ID = cmrr.PROVINCE AND P.DEL_FLAG = 0 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 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 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.PK_MEMBER IN ( #{userId} )
<if test="type != null and type == 1"> <if test="type != null and type == 1">
and cmrr.PROVINCE != 0 and cmrr.PROVINCE != 0