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/DegreeRegistrationService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.dto.PageInfoDegree;
 import com.ym.mec.biz.dal.entity.DegreeRegistration;
@@ -22,7 +23,7 @@ public interface DegreeRegistrationService extends BaseService<Integer, DegreeRe
 
     PageInfoDegree<DegreeRegistration> getPageList(DegreeQueryInfo queryInfo);
 
-    HttpResponseResult check(DegreeRegistrationActivityDto degreeRegistration);
+    HttpResponseResult check(DegreeRegistrationActivityDto degreeRegistration, SysUser sysUser);
 
     //考级退费
     int refund(Integer degreeRegistrationId);

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

@@ -140,8 +140,8 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchSave(List<DegreeLevelFeeNew> degreeLevelFees) {
-        long count = degreeLevelFees.stream().map(e -> e.getLevel()).count();
-        if(count > 1){
+        long count = degreeLevelFees.stream().map(e -> e.getLevel()).distinct().count();
+        if(degreeLevelFees.size() > count){
             throw new BizException("请勿录入重复的报考级别");
         }
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
 import com.ym.mec.biz.dal.dao.StudentTeacherMapperDao;
@@ -314,14 +315,18 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult check(DegreeRegistrationActivityDto degreeRegistration) {
+    public HttpResponseResult check(DegreeRegistrationActivityDto degreeRegistration, SysUser sysUser) {
         Date nowDate = new Date();
         Degree degree = degreeService.getById(degreeRegistration.getDegreeId());
+        if(!degree.getTenantId().equals(sysUser.getTenantId())){
+            return BaseController.failed("暂未开放此活动");
+        }
+        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("暂未开放此活动");
             }
         }
         if (degree.getStartTime().compareTo(nowDate) > 0) {

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

@@ -1,7 +1,6 @@
 package com.ym.mec.student.controller;
 
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SysAreaDao;
@@ -12,10 +11,7 @@ import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.SysArea;
 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
-import com.ym.mec.biz.service.DegreeRegistrationService;
-import com.ym.mec.biz.service.SporadicChargeInfoService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysTenantConfigService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -26,7 +22,6 @@ 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.*;
@@ -44,7 +39,7 @@ public class DegreeController extends BaseController {
     private SporadicChargeInfoService sporadicChargeInfoService;
 
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @Autowired
     private TeacherDao teacherDao;
@@ -68,15 +63,11 @@ public class DegreeController extends BaseController {
     @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,"请登录");
+            return failed("暂未开放此活动");
         }
+        SysUser user = sysUserService.getUser();
         TenantContextHolder.setTenantId(user.getTenantId());
-        degreeRegistration.setUserId(user.getId());
-        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration);
+        HttpResponseResult result = degreeRegistrationService.check(degreeRegistration,user);
         if(result.getCode() != 200){
             return result;
         }
@@ -101,12 +92,7 @@ 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);
+        return degreeRegistrationService.check(degreeRegistration,sysUserService.getUser());
     }
 
     @ApiOperation(value = "查询收费列表")
@@ -124,11 +110,7 @@ public class DegreeController extends BaseController {
     @ApiOperation(value = "获取活动参数")
     @GetMapping("/getParams")
     public HttpResponseResult getParams(){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(user)||Objects.isNull(user.getId())){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-
+        SysUser user = sysUserService.getUser();
         SporadicChargeInfoQueryInfo queryInfo = new SporadicChargeInfoQueryInfo();
         queryInfo.setOrganId("42");
         queryInfo.setChargeType(SporadicChargeTypeEnum.LEVEL);