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 ba296c8..b370fd0 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 @@ -80,9 +80,7 @@ public class MiniVipController { YxVipCard yxVipCard = yxVipCardService.getOne(new LambdaQueryWrapper().eq(YxVipCard::getCardNum, card)); VipDTO userVip = miniUserService.getUserVip(user.getId()); if (userVip!=null && userVip.getVipLevel()!=0) { - if (userVip.getSkuCode().equals(yxVipCard.getSkuCode())) { - throw new JeecgBootException("该类型激活码您已重复使用"); - } + AssertUtils.notTrue(yxVipSkuService.convertVipLevel(yxVipCard.getSkuCode())<=userVip.getVipLevel(),"该权益您已激活!不可重复兑换"); } //使用卡密 boolean exchange = yxVipCardService.exchange(card, user.getId()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java index 554c989..7ff60c3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java @@ -129,7 +129,7 @@ public class WxPayApiController { VipDTO userVip = miniUserService.getUserVip(user.getId()); if (userVip!=null) { //如果这个会员已经买过了,提示不可重复购买 - AssertUtils.notTrue(skuCode.equals(userVip.getSkuCode()),"该权益您已购买!不可重复购买"); + AssertUtils.notTrue(yxVipSkuService.convertVipLevel(skuCode)<=userVip.getVipLevel(),"该权益您已购买!不可重复购买"); } YxOrder yxOrder = new YxOrder(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java index 822fa96..d6a0348 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java @@ -83,7 +83,7 @@ public class MiniUserService { } //获取到了vip信息 - if (StringUtils.isNoneBlank(skuCode)) { + if (StringUtils.isNotBlank(skuCode)) { if ("1001".equals(skuCode)) { vipDTO.setVipLevel(1); }else if("1002".equals(skuCode)){ @@ -102,6 +102,8 @@ public class MiniUserService { vipDTO.setSkuCode(skuCode); vipDTO.setActivationTime(activationTime); vipDTO.setValidTime(validTime); + }else{ + vipDTO.setVipLevel(0); } return vipDTO; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVipSkuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVipSkuService.java index af85317..744c62f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVipSkuService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxVipSkuService.java @@ -15,4 +15,5 @@ public interface IYxVipSkuService extends IService { */ public YxVipSku getBySkuCode(String skuCode); + public Integer convertVipLevel(String skuCode); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java index ca7ff4e..d242b25 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java @@ -235,6 +235,9 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(",")))); + if("表演类".equals(professionalCategory)){ + queryRecommendMajorVO.getPCategoryChildrenList().add("兼报"); + } } //标签类别 if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipSkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipSkuServiceImpl.java index 8cdc347..4b46d66 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipSkuServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipSkuServiceImpl.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: VIP库存表 * @Author: jeecg-boot - * @Date: 2024-02-23 + * @Date: 2024-02-23 * @Version: V1.0 */ @Service @@ -24,7 +24,29 @@ public class YxVipSkuServiceImpl extends ServiceImpl i return null; } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(YxVipSku::getSkuCode,skuCode); + lambdaQueryWrapper.eq(YxVipSku::getSkuCode, skuCode); return getOne(lambdaQueryWrapper); } + + @Override + public Integer convertVipLevel(String skuCode) { + if (StringUtils.isBlank(skuCode)) { + return 0; + } + if ("1001".equals(skuCode)) { + return 1; + } else if ("1002".equals(skuCode)) { + return 2; + } else if ("1003".equals(skuCode)) { + return 3; + } else if ("1004".equals(skuCode)) { + return 4; + } else if ("1005".equals(skuCode)) { + return 5; + } else if ("9999".equals(skuCode)) { + return 9; + } + return 0; + } + }