新版本套餐第8次提交

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -136,7 +136,7 @@ public class WxJsjpController extends BaseController {
        if("理论计时".equals(sysDictData.getDictLabel())){
            int isActiva = schActivationService.isSchActivation(gzptUserInfo.getOutId());
            if(isActiva==1){
-               throw new CustomException(JSONObject.parseObject("该学员已激活，请勿重复操作").get("message").toString());
+               throw new CustomException("该学员已激活，请勿重复操作",500);
            }
        }
 

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -87,10 +87,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
 
         GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
-
+        int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
         if ("理论计时".equals(order.getGoodsName())) {
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -127,7 +129,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科一专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -200,7 +204,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科二专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -272,7 +278,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科三专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -345,7 +353,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科四专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -481,7 +491,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科一+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -559,7 +571,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科二+科三VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -648,7 +662,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科二+科三+科四".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -737,7 +753,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("科三+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {
@@ -837,7 +855,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
             //激活操作
-            saveActiva(order, userInfo);
+            if(isActiva!=1) {
+                saveActiva(order, userInfo);
+            }
         } else if ("全科目超级VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
             if (userVip != null) {