feat：12月活动

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -205,7 +205,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         studentPaymentOrder.setExpectAmount(amount);
         studentPaymentOrder.setActualAmount(amount);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
-        studentPaymentOrder.setMusicGroupId(degreeRegistration.getSporadicId().toString());
+        if(Objects.nonNull(degreeRegistration.getSporadicId())){
+            studentPaymentOrder.setMusicGroupId(degreeRegistration.getSporadicId().toString());
+        }
         studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
         studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
         if (degreeRegistration.getTheoryMoney().compareTo(BigDecimal.ZERO) > 0) {

mec-student/src/main/java/com/ym/mec/student/controller/DegreeController.java

@@ -72,18 +72,11 @@ public class DegreeController extends BaseController {
         }
         degreeRegistration.setUserId(user.getId());
 
-       if(StringUtils.isNotBlank(degreeRegistration.getIdcard())){
-           IdcardValidator idcardValidator = new IdcardValidator();
-           if (!idcardValidator.isValidatedAllIdcard(degreeRegistration.getIdcard())) {
-               throw new BizException("身份证号不正确，请核对");
-           }
-       }
-
-        if(Objects.isNull(degreeRegistration.getOrganId())){
-            return failed("该分部暂未参与此活动");
-        }
-
-        if(Objects.nonNull(degreeRegistration.getSporadicId())){
+        if(Objects.nonNull(degreeRegistration.getSporadicId())&&Objects.nonNull(degreeRegistration.getTheoryLevel())){
+            IdcardValidator idcardValidator = new IdcardValidator();
+            if (!idcardValidator.isValidatedAllIdcard(degreeRegistration.getIdcard())) {
+                throw new BizException("身份证号不正确，请核对");
+            }
             SporadicChargeInfo info = sporadicChargeInfoDao.get(degreeRegistration.getSporadicId());
             if (info == null || info.getDelFlag().equals(1)) {
                 return failed("报名信息不存在");
@@ -91,7 +84,12 @@ public class DegreeController extends BaseController {
             if (info.getOrganId() != 42 || !info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)) {
                 return failed("报名信息不存在");
             }
+        }else{
+            degreeRegistration.setOrganId(user.getOrganId());
+        }
 
+        if(Objects.isNull(degreeRegistration.getOrganId())){
+            return failed("该分部暂未参与此活动");
         }
 
         DegreeRegistration degree = degreeRegistrationDao.getWithUserIdAndActivityTag(user.getId(), DegreeRegistrationService.ACTIVITY_TAG);