Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -323,25 +323,25 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         Date nowDate = new Date();
         Degree degree = degreeService.getById(degreeRegistration.getDegreeId());
         if(!degree.getTenantId().equals(sysUser.getTenantId())){
-            return BaseController.failed("暂未开放此活动");
+            return BaseController.failed(HttpStatus.CHECKPOINT,"暂未开放此活动");
         }
         degreeRegistration.setUserId(sysUser.getId());
         //是否对分部开放
         if(StringUtils.isNotEmpty(degree.getOrganIds())){
             List<Integer> studentIdList = Arrays.stream(degree.getOrganIds().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
             if(!studentIdList.contains(degreeRegistration.getOrganId())){
-                return BaseController.failed("暂未开放此活动");
+                return BaseController.failed(HttpStatus.CHECKPOINT,"暂未开放此活动");
             }
         }
         if (degree.getStartTime().compareTo(nowDate) > 0) {
-            throw new BizException("活动还未开始，谢谢关注");
+            return BaseController.failed(HttpStatus.CHECKPOINT,"活动还未开始，谢谢关注");
         }
         if (degree.getEndTime().compareTo(nowDate) <= 0) {
-            throw new BizException("活动已结束，谢谢关注");
+            return BaseController.failed(HttpStatus.CHECKPOINT,"活动已结束，谢谢关注");
         }
         List<DegreeRegistrationDto> registrationDtos = degreeRegistration.getDegreeRegistrationDtos();
         if(CollectionUtils.isEmpty(registrationDtos)){
-            return BaseController.failed(HttpStatus.CREATED,"请选择考级项目");
+            return BaseController.failed(HttpStatus.CHECKPOINT,"请选择考级项目");
         }
         List<DegreeRegistrationDto> collect = registrationDtos.stream().filter(e -> e.getType() == DegreeTypeEnum.GRADE).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(collect)){
@@ -351,7 +351,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             if(Objects.nonNull(userLevelDegree)){
                 StringBuffer sb = new StringBuffer("您选择的");
                 sb.append("\"").append("专业考级-级别").append(userLevelDegree.getLevel()).append("\"").append("已报名，请勿重复选择");
-                return BaseController.failed(HttpStatus.CREATED, sb.toString());
+                return BaseController.failed(HttpStatus.CHECKPOINT, sb.toString());
             }
         }
         collect = registrationDtos.stream().filter(e -> e.getType() == DegreeTypeEnum.THEORY).collect(Collectors.toList());
@@ -362,7 +362,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             if(Objects.nonNull(userLevelDegree)){
                 StringBuffer sb = new StringBuffer("您选择的");
                 sb.append("\"").append("乐理考级-级别").append(userLevelDegree.getLevel()).append("\"").append("已报名，请勿重复选择");
-                return BaseController.failed(HttpStatus.CREATED, sb.toString());
+                return BaseController.failed(HttpStatus.CHECKPOINT, sb.toString());
             }
         }
         return BaseController.succeed();

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

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -63,7 +64,7 @@ public class DegreeController extends BaseController {
     @PostMapping("/pay")
     public HttpResponseResult pay(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
         if(degreeRegistration.getOrganId() == null){
-            return failed("暂未开放此活动");
+            return failed(HttpStatus.CHECKPOINT,"暂未开放此活动");
         }
         SysUser user = sysUserService.getUser();
         TenantContextHolder.setTenantId(user.getTenantId());
@@ -75,7 +76,7 @@ public class DegreeController extends BaseController {
         if("IDENTITY".equals(degreeRegistration.getCertificateType())){
 	        IdcardValidator idcardValidator = new IdcardValidator();
 	        if (!debugMode && !idcardValidator.isValidatedAllIdcard(degreeRegistration.getIdcard())) {
-	            throw new BizException("身份证号不正确，请核对");
+                return BaseController.failed(HttpStatus.CHECKPOINT,"身份证号不正确，请核对");
 	        }
         }
         if(user.getOrganId() == null || user.getOrganId() == 43){