diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniVipController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniVipController.java index 383977b..96442b2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniVipController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniVipController.java @@ -77,6 +77,13 @@ public class MiniVipController { //检查card是否有效 boolean cardValid = yxVipCardService.cardIsValid(card); AssertUtils.isTrue(cardValid,"当前卡密无效或已被使用"); + YxVipCard yxVipCard = yxVipCardService.getOne(new LambdaQueryWrapper().eq(YxVipCard::getCardNum, card)); + VipDTO userVip = miniUserService.getUserVip(user.getId()); + if (userVip!=null) { + if (userVip.getSkuCode().equals(yxVipCard.getSkuCode())) { + throw new JeecgBootException("该类型激活码您已重复使用"); + } + } //使用卡密 boolean exchange = yxVipCardService.exchange(card, user.getId()); AssertUtils.isTrue(exchange,"当前卡密已被使用"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java index 4f140f7..e05660b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java @@ -63,6 +63,7 @@ public class YxVipCardServiceImpl extends ServiceImpl yxVipCardLambdaQueryWrapper = new LambdaQueryWrapper<>(); yxVipCardLambdaQueryWrapper.eq(YxVipCard::getUserId,userId); + yxVipCardLambdaQueryWrapper.orderByDesc(YxVipCard::getUsedTime); return this.list(yxVipCardLambdaQueryWrapper); }