Merge remote-tracking branch 'origin/master'

This commit is contained in:
13405411873 2025-06-06 16:18:43 +08:00
commit e321804d46
2 changed files with 4 additions and 4 deletions

View File

@ -134,8 +134,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
throw new Exception("当前用户积分余额为"+nowBalance+"您已超出提现额度"); throw new Exception("当前用户积分余额为"+nowBalance+"您已超出提现额度");
} }
if (memberPoints.getPoints()> 200){ if (memberPoints.getPoints()> 2000){
throw new Exception("单次最高提现200"); throw new Exception("单次最高提现2000积分");
} }
memberPoints.setOrderNo(generateOrderId()); memberPoints.setOrderNo(generateOrderId());
memberPoints.setStatus("02"); memberPoints.setStatus("02");

View File

@ -156,9 +156,9 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
result.setMemberEndDate(DateUtil.formatDate(card.getEndDate())); result.setMemberEndDate(DateUtil.formatDate(card.getEndDate()));
result.setCardName(card.getCardName()); result.setCardName(card.getCardName());
} }
//积分
result.setPointsBalance(pointsService.getBloggerBalance(userId));
if ("02".equals(userType)) { if ("02".equals(userType)) {
//积分
result.setPointsBalance(pointsService.getBloggerBalance(userId));
//报名 //报名
Integer report = cardService.getCardRightsValue(userId, "02", "report"); Integer report = cardService.getCardRightsValue(userId, "02", "report");
//赠送的报名次数 //赠送的报名次数