add 考级报名缴费

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

@@ -115,15 +115,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         classFee.put("other", amount);
 
         String receiver = "daya";
-        //深圳的零星缴费是在深圳
-        String sDaYaOrganIds = sysConfigDao.findConfigValue(SysConfigService.SZ_DA_YA_ORGAN_IDS);
-        if (StringUtils.isNotBlank(sDaYaOrganIds)) {
-            List<String> sDaYaOrganIdList = Arrays.asList(sDaYaOrganIds.split(","));
-            if (sDaYaOrganIdList.contains(chargeInfo.getOrganId().toString())) {
-                receiver = "sdaya";
-            }
-        }
-
         Map payMap = payService.getPayMap(
                 amount,
                 orderNo,

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

@@ -17,6 +17,8 @@ import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.util.idcard.IdcardValidator;
+import com.ym.mec.util.validator.CommonValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -67,6 +69,14 @@ public class DegreeController extends BaseController {
         ) {
             throw new BizException("必填参数不能为空");
         }
+        if (!CommonValidator.isMobileNo(degreeRegistration.getMobile())) {
+            throw new BizException("手机号码不正确，请核对");
+        }
+
+        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)) {