updates

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<YxVipCard>().eq(YxVipCard::getCardNum, card));
         VipDTO userVip = miniUserService.getUserVip(user.getId());
         if (userVip!=null && userVip.getVipLevel()!=0) {
-            if (userVip.getSkuCode().equals(yxVipCard.getSkuCode())) {
+            AssertUtils.notTrue(yxVipSkuService.convertVipLevel(yxVipCard.getSkuCode())<=userVip.getVipLevel(),"该权益您已激活!不可重复兑换");
-                throw new JeecgBootException("该类型激活码您已重复使用");
-            }
         }
         //使用卡密
         boolean exchange = yxVipCardService.exchange(card, user.getId());

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();

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;
     }

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<YxVipSku> {
      */
     public YxVipSku getBySkuCode(String skuCode);
 
+    public Integer convertVipLevel(String skuCode);
 }

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<YxSchoolMajorMapper, Y
         //有子级专业
         if (StringUtils.isNotBlank(activeCurrentUserScore.getProfessionalCategoryChildren()) && !"高职高专".equals(queryRecommendMajorVO.getBatch()) && !"高职高专".equals(queryRecommendMajorVO.getBatch())) {
             queryRecommendMajorVO.setPCategoryChildrenList(new ArrayList<>(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(","))));
+            if("表演类".equals(professionalCategory)){
+                queryRecommendMajorVO.getPCategoryChildrenList().add("兼报");
+            }
         }
         //标签类别
         if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipSkuServiceImpl.java

@@ -24,7 +24,29 @@ public class YxVipSkuServiceImpl extends ServiceImpl<YxVipSkuMapper, YxVipSku> i
             return null;
         }
         LambdaQueryWrapper<YxVipSku> 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;
+    }
+
 }