|
@@ -30,6 +30,8 @@ import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
+import org.springframework.transaction.annotation.Isolation;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -95,6 +97,22 @@ public class DegreeController extends BaseController {
|
|
return degreeRegistrationService.pay(degreeRegistration);
|
|
return degreeRegistrationService.pay(degreeRegistration);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation(value = "考级报名检查")
|
|
|
|
+ @PostMapping("/check")
|
|
|
|
+ @Transactional(isolation = Isolation.READ_COMMITTED)
|
|
|
|
+ public HttpResponseResult check(@RequestBody DegreeRegistrationActivityDto degreeRegistration) throws Exception {
|
|
|
|
+ SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
|
+ if(Objects.isNull(user)){
|
|
|
|
+ return failed(HttpStatus.FORBIDDEN,"请登录");
|
|
|
|
+ }
|
|
|
|
+ degreeRegistration.setUserId(user.getId());
|
|
|
|
+ studentDao.getLocked(degreeRegistration.getUserId());
|
|
|
|
+ DegreeRegistration degree = degreeRegistrationDao.getWithSubjectAndLevel(degreeRegistration);
|
|
|
|
+ if(Objects.nonNull(degree) && degree.getStatus().equals(2)){
|
|
|
|
+ return failed(HttpStatus.CREATED, "您已报考过选择的考级项目");
|
|
|
|
+ }
|
|
|
|
+ return succeed();
|
|
|
|
+ }
|
|
|
|
|
|
@ApiOperation(value = "查询收费列表")
|
|
@ApiOperation(value = "查询收费列表")
|
|
@GetMapping("/queryList")
|
|
@GetMapping("/queryList")
|