فهرست منبع

1、教师端购买的课程状态调整
2、乐团课名称生成调整
3、

Joburgess 5 سال پیش
والد
کامیت
b4d65113c6

+ 2 - 2
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);
                 }
             }
         });

+ 8 - 4
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);
         });
     }

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

@@ -1108,6 +1108,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void applyRefund(Long vipGroupId) {
+
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (null == sysUser) {
 			throw new BizException("获取用户信息失败");

+ 1 - 1
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>