From c537b3477d9208a9548ab961b822a557e8c16872 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 24 Apr 2025 19:12:19 +0800
Subject: [PATCH] 1

---
 .../java/com/ruoyi/member/service/IMemberCardService.java  | 2 +-
 .../com/ruoyi/member/service/IMemberRightsService.java     | 3 ++-
 .../ruoyi/member/service/impl/MemberCardServiceImpl.java   | 4 ++--
 .../ruoyi/member/service/impl/MemberRightsServiceImpl.java | 4 ++--
 .../ruoyi/member/service/impl/MemberUserServiceImpl.java   | 7 +++++--
 .../src/main/java/com/ruoyi/member/vo/MemberUserVO.java    | 2 ++
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java
index ef50ada..8ead7dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java
@@ -60,7 +60,7 @@ public interface IMemberCardService extends IService<MemberCard> {
      * @author PQZ
      * @date 17:27 2025/3/31
      **/
-    Integer getCardReport(Long userId, String userType);
+    Integer getCardRightsValue(Long userId, String userType,String rightsCode);
 
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java
index 56339cf..242c813 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java
@@ -26,13 +26,14 @@ public interface IMemberRightsService extends IService<MemberRights> {
     void dealRights(Long userId, String userType, List<CardRightsVO> rights);
 
     /**
+     * 根据卡id，用户id，权益编码查询权益值
      * @param userId 用户id
      * @param carId  卡id
      * @return java.lang.Integer
      * @author PQZ
      * @date 17:15 2025/3/31
      **/
-    Integer getReport(Long userId, String carId);
+    Integer getMemberRightsValue(Long userId, String carId,String rightsCode);
 
     /**
      * 根据用户id，卡id，权益编码，更新剩余值
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java
index ea0e1af..2bff09e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java
@@ -225,13 +225,13 @@ public class MemberCardServiceImpl extends ServiceImpl<MemberCardMapper, MemberC
      * @date 17:27 2025/3/31
      **/
     @Override
-    public Integer getCardReport(Long userId, String userType) {
+    public Integer getCardRightsValue(Long userId, String userType,String rightsCode) {
         //查询当前用户在当前时间有无正在服役的会员卡
         List<MemberCard> memberCards = getMemberCards(userId, userType);
         if (memberCards.isEmpty()) {
             return 0;
         } else {
-            return rightsService.getReport(memberCards.get(0).getUserId(), memberCards.get(0).getCardId());
+            return rightsService.getMemberRightsValue(memberCards.get(0).getUserId(), memberCards.get(0).getCardId(),rightsCode);
         }
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java
index bba8d33..f0cecf6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java
@@ -67,7 +67,7 @@ public class MemberRightsServiceImpl extends ServiceImpl<MemberRightsMapper, Mem
      * @date 17:15 2025/3/31
      **/
     @Override
-    public Integer getReport(Long userId, String cardId) {
+    public Integer getMemberRightsValue(Long userId, String cardId,String rightsCode) {
         LambdaQueryWrapper<MemberRights> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper
                 .eq(MemberRights::getUserId, userId)
@@ -77,7 +77,7 @@ public class MemberRightsServiceImpl extends ServiceImpl<MemberRightsMapper, Mem
             return dlRightsConfig.getReport();
         } else {
             List<MemberRights> filterRights = rights.stream()
-                    .filter(item -> "report".equals(item.getRightsCode()))
+                    .filter(item -> rightsCode.equals(item.getRightsCode()))
                     .collect(Collectors.toList());
             return filterRights.get(0).getRemaining();
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
index 2f3e8de..f01213d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
@@ -116,7 +116,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
         //积分
         result.setPointsBalance(pointsService.getBloggerBalance(userId));
         //报名
-        result.setReport(cardService.getCardReport(userId,"02"));
+        result.setReport(cardService.getCardRightsValue(userId,"02","report"));
         //地址信息
         result.setAddresses(addressService.listByUserId(userId));
         //会员开通记录
@@ -141,9 +141,12 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
             //积分
             result.setPointsBalance(pointsService.getBloggerBalance(userId));
             //报名
-            result.setReport(cardService.getCardReport(userId,"02"));
+            result.setReport(cardService.getCardRightsValue(userId,"02","report"));
         } else {
+            //通告券
             result.setCoupon(couponService.getCoupon(userId));
+            //剩余发布通告额度
+            result.setAddNotice(cardService.getCardRightsValue(userId,"01","add_notice"));
         }
         return result;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java
index 5afc2e1..f925728 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java
@@ -40,6 +40,8 @@ public class MemberUserVO extends MemberUser {
     int report;
     /**剩余通告券*/
     int coupon;
+    /**发布通告额度*/
+    int addNotice;
     /**用户名*/
     String userName;
     /**类型名称*/