2022考级报名

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

@@ -480,7 +480,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         List<DegreeRegistrationDto> registrationDtos = degreeRegistration.getDegreeRegistrationDtos();
         if(CollectionUtils.isEmpty(registrationDtos)){
-            return BaseController.failed(HttpStatus.FORBIDDEN,"请选择考级项目");
+            return BaseController.failed(HttpStatus.CREATED,"请选择考级项目");
         }
         List<DegreeRegistrationDto> collect = registrationDtos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(collect)){
@@ -488,7 +488,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),StringUtils.join(collect1,","),null,2);
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 {} 乐器考级已报名，请勿重复选择",collect.get(0).getLevel());
+                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐器考级已报名，请勿重复选择");
             }
         }
         collect = registrationDtos.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
@@ -497,7 +497,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),null,StringUtils.join(collect1,","),2);
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 {} 乐理考级已报名，请勿重复选择",collect.get(0).getLevel());
+                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐理考级已报名，请勿重复选择");
             }
         }
         return BaseController.succeed();

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

@@ -63,14 +63,15 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "考级报名支付")
     @PostMapping("/pay")
     public HttpResponseResult pay(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
-        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
-        if(result.getCode() != 200){
-            return result;
-        }
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
+        degreeRegistration.setUserId(user.getId());
+        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
+        if(result.getCode() != 200){
+            return result;
+        }
         TenantContextHolder.setTenantId(user.getTenantId());
         degreeRegistration.setUserId(user.getId());
         if("IDENTITY".equals(degreeRegistration.getCertificateType())){
@@ -116,6 +117,11 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "考级报名检查")
     @PostMapping("/check")
     public HttpResponseResult check(@RequestBody DegreeRegistrationActivityDto degreeRegistration) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(user)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        degreeRegistration.setUserId(user.getId());
         return degreeRegistrationService.check(degreeRegistration);
     }