考级报名

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DegreeRegistrationDto.java

@@ -9,9 +9,6 @@ import java.util.Date;
 
 @Data
 public class DegreeRegistrationDto{
-    @ApiModelProperty(value = "考级编号",required = false)
-    private Long degreeId;
-
     @ApiModelProperty(value = "考试级别",required = false)
     private String level;
 

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

@@ -94,7 +94,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             String level = registrationDto.getLevel();
             degree.setOrderNo(orderNo);
             degree.setLevel(level);
-            degree.setDegreeId(registrationDto.getDegreeId());
+            degree.setDegreeId(degreeRegistration.getDegreeId());
             degree.setTheoryCert(registrationDto.getTheoryCert());
             degree.setType(registrationDto.getType());
             degree.setStatus(1);
@@ -316,11 +316,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             return BaseController.failed(HttpStatus.CREATED,"请选择考级项目");
         }
         List<DegreeRegistrationDto> collect = registrationDtos.stream().filter(e -> e.getType() == DegreeTypeEnum.GRADE).collect(Collectors.toList());
-        Long degreeId = collect.stream().map(e -> e.getDegreeId()).collect(Collectors.toList()).get(0);
         if(!CollectionUtils.isEmpty(collect)){
             String levels = collect.stream().map(e -> e.getLevel()).collect(Collectors.joining(","));
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
-                    degreeId,DegreeTypeEnum.GRADE,levels,degreeRegistration.getSubjectId());
+                    degree.getId(),DegreeTypeEnum.GRADE,levels,degreeRegistration.getSubjectId());
             if(Objects.nonNull(userLevelDegree)){
                 return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegree.getLevel() +  " 乐器考级已报名，请勿重复选择");
             }
@@ -329,7 +328,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if(!CollectionUtils.isEmpty(collect)){
             String levels = collect.stream().map(e -> e.getLevel()).collect(Collectors.joining(","));
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
-                    degreeId,DegreeTypeEnum.THEORY,levels,degreeRegistration.getSubjectId());
+                    degree.getId(),DegreeTypeEnum.THEORY,levels,degreeRegistration.getSubjectId());
             if(Objects.nonNull(userLevelDegree)){
                 return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegree.getLevel() +  " 乐理考级已报名，请勿重复选择");
             }

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

@@ -97,31 +97,6 @@ public class DegreeController extends BaseController {
         TenantContextHolder.clearTenantId();
         return pay;
     }
-/*
-    @ApiOperation(value = "考级报名支付")
-    @PostMapping("/theoryPay")
-    public HttpResponseResult theoryPay(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(user)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        degreeRegistration.setUserId(user.getId());
-
-        if(Objects.nonNull(degreeRegistration.getTheoryLevel())){
-            IdcardValidator idcardValidator = new IdcardValidator();
-            if (!idcardValidator.isValidatedAllIdcard(degreeRegistration.getIdcard())) {
-                throw new BizException("身份证号不正确，请核对");
-            }
-        }else{
-            degreeRegistration.setOrganId(user.getOrganId());
-        }
-
-        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() == 4){
-            return failed("该分部暂未开放此活动");
-        }
-
-        return degreeRegistrationService.theoryPay(degreeRegistration);
-    }*/
 
     @ApiOperation(value = "考级报名检查")
     @PostMapping("/check")