diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 26785baf..5d53691e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -677,33 +677,35 @@ public class RetailOrderServiceImpl implements IRetailOrderService { return resultStr; } public void processMemberLevel(CuMember gradeMember, SaOrderExt saOrderExt){ - // 处理等级 - GradeDTO bdGrade = iGradeServiceApi.getGrade(gradeMember.getPkSettleGrade()).getData(); - List gradeDTOList = iGradeServiceApi.getRetailGradeList().getData(); - CuMemberLevel memberLevel = null; - if(bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()){ - if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.GOLD_CARD_PV) >= 0){ - // 拿金牌等级 - BdGrade goldGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.YOU_KE.getValue())).findFirst().get(); - memberLevel = getCuMemberLevel(gradeMember, saOrderExt, goldGrade.getPkId()); - gradeMember.setPkSettleGrade(goldGrade.getPkId()); - gradeMember.setPkSettleGradeValue(goldGrade.getGradeValue()); - }else if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.SILVER_CARD_PV) >= 0){ - // 拿银牌等级 - BdGrade silverGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.HAI_FAN.getValue())).findFirst().get(); - memberLevel = getCuMemberLevel(gradeMember, saOrderExt, silverGrade.getPkId()); - gradeMember.setPkSettleGrade(silverGrade.getPkId()); - gradeMember.setPkSettleGradeValue(silverGrade.getGradeValue()); + if(EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()){ + // 处理等级 + GradeDTO bdGrade = iGradeServiceApi.getGrade(gradeMember.getPkSettleGrade()).getData(); + List gradeDTOList = iGradeServiceApi.getRetailGradeList().getData(); + CuMemberLevel memberLevel = null; + if(bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()){ + if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.GOLD_CARD_PV) >= 0){ + // 拿金牌等级 + BdGrade goldGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.YOU_KE.getValue())).findFirst().get(); + memberLevel = getCuMemberLevel(gradeMember, saOrderExt, goldGrade.getPkId()); + gradeMember.setPkSettleGrade(goldGrade.getPkId()); + gradeMember.setPkSettleGradeValue(goldGrade.getGradeValue()); + }else if(saOrderExt.getOrderAchieve().compareTo(RetailConstants.SILVER_CARD_PV) >= 0){ + // 拿银牌等级 + BdGrade silverGrade = gradeDTOList.stream().filter(item -> item.getGradeValue().equals(EGrade.HAI_FAN.getValue())).findFirst().get(); + memberLevel = getCuMemberLevel(gradeMember, saOrderExt, silverGrade.getPkId()); + gradeMember.setPkSettleGrade(silverGrade.getPkId()); + gradeMember.setPkSettleGradeValue(silverGrade.getGradeValue()); + } } - } - if(ObjectUtil.isNotEmpty(memberLevel)){ - Boolean saveMemberLevelFlag = iMemberServiceApi.saveMemberLevel(memberLevel).getData(); - if(!saveMemberLevelFlag){ - throw new ServiceException("记录用户升级信息异常!"); - } - Boolean saveMemberFlag = iMemberServiceApi.saveMember(gradeMember).getData(); - if(!saveMemberFlag){ - throw new ServiceException("更新用户结算等级异常!"); + if(ObjectUtil.isNotEmpty(memberLevel)){ + Boolean saveMemberLevelFlag = iMemberServiceApi.saveMemberLevel(memberLevel).getData(); + if(!saveMemberLevelFlag){ + throw new ServiceException("记录用户升级信息异常!"); + } + Boolean saveMemberFlag = iMemberServiceApi.saveMember(gradeMember).getData(); + if(!saveMemberFlag){ + throw new ServiceException("更新用户结算等级异常!"); + } } } }