Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherMapperService.java

@@ -43,4 +43,11 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @return void
      */
     void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules, Map<Long, CourseSchedule> oldCourseSchedules);
+
+    /**
+     * 获取班级老师
+     * @param classGroupId
+     * @return
+     */
+    List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId);
 }

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

@@ -575,10 +575,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     e.setClassMode(1);
                 } else if (e.getOffLineClassesNum() > 0 && e.getOffLineClassesNum() > 0) {
                     e.setClassMode(3);
-                } else if (e.getOnlineClassesNum() < 0 && e.getOffLineClassesNum() >= 0) {
+                } else if (e.getOnlineClassesNum() <= 0 && e.getOffLineClassesNum() > 0) {
                     e.setClassMode(2);
                 } else {
-                    e.setClassMode(0);
+                    e.setClassMode(1);
                 }
             }
         });
@@ -1083,6 +1083,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //计算每节课的课酬
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
         List<CourseScheduleStudentPayment> courseScheduleStudentPaymentList = new ArrayList<>();
+        List<CourseSchedule> courseScheduleList = new ArrayList<>();
+
         BigDecimal expectPrice = new BigDecimal("0");
         int times = 0;
 
@@ -1129,8 +1131,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
                 courseSchedule.setTeacherId(teacherId);
                 courseSchedule.setActualTeacherId(teacherId);
-
                 courseScheduleDao.insert(courseSchedule);
+                courseScheduleList.add(courseSchedule);
 
                 times++;
 
@@ -1207,6 +1209,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             now = now.plusDays(1);
         }
+
+        //检测新排课冲突
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
         //老师结算表
         courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
 

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

@@ -411,4 +411,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
         return courseScheduleTeacherSalary;
     }
+
+    public List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId){
+        return classGroupTeacherMapperDao.findClassGroupTeachers(classGroupId.toString());
+    }
 }

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

@@ -635,10 +635,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         classGroupIds=new ArrayList<>(temp);
         Map<Integer,String> classIdSubjectNameMap=convertToMap(courseScheduleDao.findClassSubjects(classGroupIds));
         courseSchedules.forEach(courseSchedule -> {
-            StringBuilder className=new StringBuilder(classIdSubjectNameMap.get(courseSchedule.getClassGroupId()));
-            className.append("-");
-            className.append(courseSchedule.getType().getMsg());
-            courseSchedule.setName(className.toString());
+        	if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MIX)){
+				courseSchedule.setName(courseSchedule.getType().getCode());
+			}else{
+				StringBuilder className=new StringBuilder(classIdSubjectNameMap.get(courseSchedule.getClassGroupId()));
+				className.append("-");
+				className.append(courseSchedule.getType().getMsg());
+				courseSchedule.setName(className.toString());
+			}
             courseSchedule.setStatus(CourseStatusEnum.NOT_START);
         });
     }

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

@@ -1108,6 +1108,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void applyRefund(Long vipGroupId) {
+        if(true){
+            throw new BizException("暂不支持退课");
+        }
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (null == sysUser) {
 			throw new BizException("获取用户信息失败");
@@ -1751,7 +1754,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         vipGroup.setStatus(VipGroupStatusEnum.APPLYING_END);
                     }
                     if(vipGroup.getCourseStartDate().before(now)&&vipGroup.getCoursesExpireDate().after(now)){
-                        vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
+						if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING_END)){
+							vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
+						}
                     }
                     VipGroup vipGroup1 = new VipGroup();
                     vipGroup1.setId(vipGroup.getId());

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -202,7 +202,7 @@
     </update>
 
     <delete id="batchDeleteCourseSchedules">
-        DELETE FROM course_schedule WHERE id_ IN
+        DELETE FROM course_schedule cs WHERE id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -268,4 +268,14 @@ public class ClassGroupController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserById(userId);
         return succeed(sysUser.getUsername());
     }
+
+    @ApiOperation(value = "查询班级老师")
+    @GetMapping("/getClassGroupTeachers")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/getClassGroupTeachers')")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")
+    })
+    public HttpResponseResult getClassGroupTeachers(Integer classGroupId){
+        return succeed(classGroupTeacherMapperService.getClassGroupTeachers(classGroupId));
+    }
 }