dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
PQZ 2025-04-24 19:12:19 +08:00
parent 5d03a32807
commit c537b3477d
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java
View File

@ -60,7 +60,7 @@ public interface IMemberCardService extends IService<MemberCard> {
* @author PQZ * @author PQZ
* @date 17:27 2025/3/31 * @date 17:27 2025/3/31
**/ **/
Integer getCardReport(Long userId, String userType); Integer getCardRightsValue(Long userId, String userType,String rightsCode);
/** /**

3
ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java
View File

@ -26,13 +26,14 @@ public interface IMemberRightsService extends IService<MemberRights> {
void dealRights(Long userId, String userType, List<CardRightsVO> rights); void dealRights(Long userId, String userType, List<CardRightsVO> rights);
/** /**
* 根据卡id，用户id，权益编码查询权益值
* @param userId 用户id * @param userId 用户id
* @param carId 卡id * @param carId 卡id
* @return java.lang.Integer * @return java.lang.Integer
* @author PQZ * @author PQZ
* @date 17:15 2025/3/31 * @date 17:15 2025/3/31
**/ **/
Integer getReport(Long userId, String carId); Integer getMemberRightsValue(Long userId, String carId,String rightsCode);
/** /**
* 根据用户id，卡id，权益编码，更新剩余值 * 根据用户id，卡id，权益编码，更新剩余值

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

@ -225,13 +225,13 @@ public class MemberCardServiceImpl extends ServiceImpl<MemberCardMapper, MemberC
* @date 17:27 2025/3/31 * @date 17:27 2025/3/31
**/ **/
@Override @Override
public Integer getCardReport(Long userId, String userType) { public Integer getCardRightsValue(Long userId, String userType,String rightsCode) {
//查询当前用户在当前时间有无正在服役的会员卡 //查询当前用户在当前时间有无正在服役的会员卡
List<MemberCard> memberCards = getMemberCards(userId, userType); List<MemberCard> memberCards = getMemberCards(userId, userType);
if (memberCards.isEmpty()) { if (memberCards.isEmpty()) {
return 0; return 0;
} else { } else {
return rightsService.getReport(memberCards.get(0).getUserId(), memberCards.get(0).getCardId()); return rightsService.getMemberRightsValue(memberCards.get(0).getUserId(), memberCards.get(0).getCardId(),rightsCode);
} }
} }

4
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java
View File

@ -67,7 +67,7 @@ public class MemberRightsServiceImpl extends ServiceImpl<MemberRightsMapper, Mem
* @date 17:15 2025/3/31 * @date 17:15 2025/3/31
**/ **/
@Override @Override
public Integer getReport(Long userId, String cardId) { public Integer getMemberRightsValue(Long userId, String cardId,String rightsCode) {
LambdaQueryWrapper<MemberRights> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MemberRights> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper lambdaQueryWrapper
.eq(MemberRights::getUserId, userId) .eq(MemberRights::getUserId, userId)
@ -77,7 +77,7 @@ public class MemberRightsServiceImpl extends ServiceImpl<MemberRightsMapper, Mem
return dlRightsConfig.getReport(); return dlRightsConfig.getReport();
} else { } else {
List<MemberRights> filterRights = rights.stream() List<MemberRights> filterRights = rights.stream()
.filter(item -> "report".equals(item.getRightsCode())) .filter(item -> rightsCode.equals(item.getRightsCode()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return filterRights.get(0).getRemaining(); return filterRights.get(0).getRemaining();
} }

7
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
View File

@ -116,7 +116,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
//积分 //积分
result.setPointsBalance(pointsService.getBloggerBalance(userId)); result.setPointsBalance(pointsService.getBloggerBalance(userId));
//报名 //报名
result.setReport(cardService.getCardReport(userId,"02")); result.setReport(cardService.getCardRightsValue(userId,"02","report"));
//地址信息 //地址信息
result.setAddresses(addressService.listByUserId(userId)); result.setAddresses(addressService.listByUserId(userId));
//会员开通记录 //会员开通记录
@ -141,9 +141,12 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
//积分 //积分
result.setPointsBalance(pointsService.getBloggerBalance(userId)); result.setPointsBalance(pointsService.getBloggerBalance(userId));
//报名 //报名
result.setReport(cardService.getCardReport(userId,"02")); result.setReport(cardService.getCardRightsValue(userId,"02","report"));
} else { } else {
//通告券
result.setCoupon(couponService.getCoupon(userId)); result.setCoupon(couponService.getCoupon(userId));
//剩余发布通告额度
result.setAddNotice(cardService.getCardRightsValue(userId,"01","add_notice"));
} }
return result; return result;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java
View File

@ -40,6 +40,8 @@ public class MemberUserVO extends MemberUser {
int report; int report;
/**剩余通告券*/ /**剩余通告券*/
int coupon; int coupon;
/**发布通告额度*/
int addNotice;
/**用户名*/ /**用户名*/
String userName; String userName;
/**类型名称*/ /**类型名称*/