Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online-2020-11-23

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -91,25 +91,25 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="wxOpenid != null">
+            <if test="wxOpenid != null and wxOpenid != ''">
                 wx_openid_ = #{wxOpenid},
             </if>
-            <if test="avatar != null">
+            <if test="avatar != null and avatar != ''">
                 avatar_ = #{avatar},
             </if>
-            <if test="email != null">
+            <if test="email != null and email != ''">
                 email_ = #{email},
             </if>
             <if test="gender != null">
                 gender_ = #{gender},
             </if>
-            <if test="salt != null">
+            <if test="salt != null and salt != ''">
                 salt_ = #{salt},
             </if>
-            <if test="username != null">
+            <if test="username != null and username != ''">
                 username_ = #{username},
             </if>
-            <if test="userType != null">
+            <if test="userType != null and userType != ''">
                 user_type_ = #{userType},
             </if>
             <if test="updateTime != null">
@@ -121,31 +121,31 @@
             <if test="birthdate != null">
                 birthdate_ = #{birthdate},
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 phone_ = #{phone},
             </if>
-            <if test="qqOpenid != null">
+            <if test="qqOpenid != null and qqOpenid != ''">
                 qq_openid_ = #{qqOpenid},
             </if>
-            <if test="nation != null">
+            <if test="nation != null and nation != ''">
                 nation_ = #{nation},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
-            <if test="imToken != null">
+            <if test="imToken != null and imToken != ''">
                 im_token_ = #{imToken},
             </if>
-            <if test="idCardNo != null">
+            <if test="idCardNo != null and idCardNo != ''">
                 id_card_no_ = #{idCardNo},
             </if>
-            <if test="password != null">
+            <if test="password != null and password != ''">
                 password_ = #{password},
             </if>
-            <if test="wechatId != null">
+            <if test="wechatId != null and wechatId != ''">
                 wechat_id_ = #{wechatId},
             </if>
-            <if test="realName != null">
+            <if test="realName != null and realName != ''">
                 real_name_ = #{realName},
             </if>
             <if test="isSuperAdmin != null">

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

@@ -2041,11 +2041,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         //排课处理
-        if (classGroup.getType().equals(ClassGroupTypeEnum.SNAP)) {
-            courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
-        } else {
-            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
-        }
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
 
         //老师结算表
         if (courseScheduleTeacherSalaryList.size() > 0) {
@@ -2334,7 +2330,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             now = now.plusDays(1);
         }
-        courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
 
         //老师结算表
         if (courseScheduleTeacherSalaryList.size() > 0) {

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

@@ -2202,7 +2202,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<Long, IntegerAndIntegerListDto> classGroupTeachingTeacherMap = classGroupAndUserIdsMap.stream()
                 .collect(Collectors.toMap(IntegerAndIntegerListDto::getId, integerAndIntegerListDto -> integerAndIntegerListDto));
 
-        existCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
+		allCourseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
         courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 
         newNode:
@@ -2682,9 +2682,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
 			CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
-			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(),vipGroup.getCoursesExpireDate())){
-				throw new BizException("调整失败：课程时间超过课程有效期");
-			}
 
 			BigDecimal teacherSalary=BigDecimal.ZERO;
 

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

@@ -524,6 +524,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (sysUser1 != null && !userId.equals(sysUser1.getId())) {
             throw new BizException("手机号已被占用");
         }
+        student.setUserType(sysUser1.getUserType());
         sysUserFeignService.updateSysUser(student);
 
         student.setUserId(student.getId());