Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_admin

ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java

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

ruoyi-admin/src/main/java/com/ruoyi/member/vo/ViewRightsVO.java

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