Merge remote-tracking branch 'origin/feature/0406-degree' into feature/0406-degree

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

@@ -301,7 +301,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         //是否对分部开放
         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.getSubjectId())){
+            if(!studentIdList.contains(degreeRegistration.getOrganId())){
                 return BaseController.failed("该分部暂未开放此活动");
             }
         }

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

@@ -67,29 +67,19 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "考级报名支付")
     @PostMapping("/pay")
     public HttpResponseResult pay(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
+        if(degreeRegistration.getOrganId() == null){
+            return failed("该分部暂未开放此活动");
+        }
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
+        TenantContextHolder.setTenantId(user.getTenantId());
         degreeRegistration.setUserId(user.getId());
-        if(user.getOrganId() == null || user.getOrganId() == 43){
-            user.setUsername(degreeRegistration.getName());
-            user.setIdCardNo(degreeRegistration.getIdcard());
-            Organization organization = organizationDao.findByName(degreeRegistration.getCity());
-            if(Objects.nonNull(organization)){
-                user.setOrganId(organization.getId());
-            }
-            teacherDao.updateUser(user);
-        }
-        degreeRegistration.setOrganId(user.getOrganId());
-        if(Objects.isNull(degreeRegistration.getOrganId())){
-            return failed("该分部暂未开放此活动");
-        }
         HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
         if(result.getCode() != 200){
             return result;
         }
-        TenantContextHolder.setTenantId(user.getTenantId());
         degreeRegistration.setUserId(user.getId());
         if("IDENTITY".equals(degreeRegistration.getCertificateType())){
 	        IdcardValidator idcardValidator = new IdcardValidator();
@@ -97,6 +87,12 @@ public class DegreeController extends BaseController {
 	            throw new BizException("身份证号不正确，请核对");
 	        }
         }
+        if(user.getOrganId() == null || user.getOrganId() == 43){
+            user.setUsername(degreeRegistration.getName());
+            user.setIdCardNo(degreeRegistration.getIdcard());
+            user.setOrganId(degreeRegistration.getOrganId());
+            teacherDao.updateUser(user);
+        }
         HttpResponseResult pay = degreeRegistrationService.pay(degreeRegistration);
         TenantContextHolder.clearTenantId();
         return pay;