This commit is contained in:
Vinjor 2025-04-22 11:26:26 +08:00
parent 4e1f18c0ff
commit baab33c805
2 changed files with 14 additions and 3 deletions

View File

@ -299,6 +299,7 @@ public class MemberCardServiceImpl extends ServiceImpl<MemberCardMapper, MemberC
private void checkRights(Map<String, ViewRightsVO> memberRightsMap, MemberRights item) { private void checkRights(Map<String, ViewRightsVO> memberRightsMap, MemberRights item) {
ViewRightsVO newRights = new ViewRightsVO(); ViewRightsVO newRights = new ViewRightsVO();
BeanUtils.copyProperties(item, newRights); BeanUtils.copyProperties(item, newRights);
newRights.setRemaining(item.getRemaining());
if (memberRightsMap.containsKey(item.getRightsCode())) { if (memberRightsMap.containsKey(item.getRightsCode())) {
//有这个权益了 //有这个权益了
ViewRightsVO oldRights = memberRightsMap.get(item.getRightsCode()); ViewRightsVO oldRights = memberRightsMap.get(item.getRightsCode());
@ -308,8 +309,18 @@ public class MemberCardServiceImpl extends ServiceImpl<MemberCardMapper, MemberC
memberRightsMap.put(item.getRightsCode(), newRights); memberRightsMap.put(item.getRightsCode(), newRights);
} }
} else { } else {
//没有这个权益直接加 //没有这个权益
if(DictConstants.RIGHTS_TYPE_NUMBER.equals(item.getRightsType())){
//数量限制的
memberRightsMap.put(item.getRightsCode(), newRights);
}else{
//是否支持的
if(1==item.getRightsValue()){
//支持返回
memberRightsMap.put(item.getRightsCode(), newRights); memberRightsMap.put(item.getRightsCode(), newRights);
} }
} }
}
}
} }

View File

@ -13,5 +13,5 @@ public class ViewRightsVO {
/** 权益编码 */ /** 权益编码 */
private String rightsCode; private String rightsCode;
/** 剩余值 (权益类型为是否时0代表不支持1代表支持权益类型为数量限制时0代表不限制其他数字代表具体限制数量) */ /** 剩余值 (权益类型为是否时0代表不支持1代表支持权益类型为数量限制时0代表不限制其他数字代表具体限制数量) */
private Long remaining; private Integer remaining;
} }