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

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

This commit is contained in:
cabbage 2025-06-21 09:06:18 +08:00
parent b3a12a62f0 1a083b499b
commit 0fb3074768
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java
View File

@ -841,7 +841,9 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
Integer period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
Integer pkCountry = loginUser.getDataCountry();
R<List<BdAwards>> awardsList = iAwardsServiceApi.queryAwards(pkCountry);
R<List<GradeDTO>> gradeList = iGradeServiceApi.queryGradeList(pkCountry);
Map<Integer, BdAwards> awardsMap = awardsList.getData().stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o));
Map<Integer, GradeDTO> gradesMap = gradeList.getData().stream().collect(Collectors.toMap(GradeDTO::getGradeValue, o -> o));
int newLevel = awardsMap.get(EAwards.HEADER.getValue()).getPkId();
List<CuMemberAwards> cuMemberAwardsList = new ArrayList<>();
HandleBusinessVO businessVO = new HandleBusinessVO();
@ -855,6 +857,9 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
businessVO.setBusinessMemberList(businessMemberVOList);
for (BusinessMemberVO memberVO : businessMemberListUpdate) {
CuMemberExt memberExt = cuMemberService.getMemberById(memberVO.getPkMember());
if(!gradesMap.get(EGrade.S_VIP.getValue()).getPkId().equals(Integer.parseInt(memberVO.getNewValue()))){
continue;
}
// 没有奖衔
Integer memberAwardsValue = awardsList.getData().stream().filter(o -> o.getPkId().equals(memberExt.getPkAwards())).findFirst().get().getAwardsValue();
if(ObjectUtil.isNotEmpty(memberExt) && EAwards.HEADER.getValue() > memberAwardsValue){