Merge remote-tracking branch 'origin/master'

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

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("获取用户信息失败");
@@ -1417,8 +1420,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     	if(vipGroup.getStatus()==VipGroupStatusEnum.NOT_START){
 			vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
     		vipGroupDao.update(vipGroup);
-			courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
-			courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+    		if(courseScheduleIds != null && courseScheduleIds.size() > 0){
+				courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
+				courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+			}
+			stopVipPush(vipGroup.getId(),vipGroup.getName());
     		return;
 		}
 		List<Map<Integer, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
@@ -1429,6 +1435,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
 				courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
 			}
+			stopVipPush(vipGroup.getId(),vipGroup.getName());
 			return;
 		}
 		Map<Integer, BigDecimal> studentSurplusClassFees = MapUtil.convertIntegerMap(maps);
@@ -1458,11 +1465,27 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
 		teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
 		//vip课停止通知
-		Teacher teacher = teacherDao.get(vipGroup.getUserId());
-		Map<Integer,String> map = new HashMap<>(1);
-		map.put(vipGroup.getUserId(),vipGroup.getUserId().toString());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_VIP_COURSE_STOP,
-				map,null,0,"1",vipGroup.getName());
+//		Teacher teacher = teacherDao.get(vipGroup.getUserId());
+//		Map<Integer,String> map = new HashMap<>(1);
+//		map.put(vipGroup.getUserId(),vipGroup.getUserId().toString());
+//		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_VIP_COURSE_STOP,
+//				map,null,0,"1",vipGroup.getName());
+		stopVipPush(vipGroup.getId(),vipGroup.getName());
+	}
+
+	private void stopVipPush(Long vipGroupId,String vipGroupName){
+		String refundPeriod = sysConfigDao.findConfigValue(SysConfigService.REFUND_PERIOD);
+		Map<Integer,String> map = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryStudentIdMap(vipGroupId));
+		if(map != null && map.size() > 0){
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_STUDENT_VIP_STOP,
+					map,null,0,null,vipGroupName,refundPeriod);
+		}
+//		老师推送消息
+		map = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryTeacherIdMap(vipGroupId));
+		if(map != null && map.size() > 0){
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_TEACHER_VIP_STOP,
+					map,null,0,null,vipGroupName);
+		}
 	}
 
 	@Override
@@ -1675,26 +1698,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){
 			return;
 		}
-		String refundPeriod = sysConfigDao.findConfigValue(SysConfigService.REFUND_PERIOD);
 		//用户账户资金变动信息列表
 		List<SysUserCashAccountDetail> userCashAccountDetails = new ArrayList<>();
 		for (VipGroup noCreateSuccessVipGroup : noCreateSuccessVipGroups) {
 			noCreateSuccessVipGroup.setStatus(VipGroupStatusEnum.CANCEL);
 			List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(noCreateSuccessVipGroup.getId().toString(),
 					OrderTypeEnum.SMALL_CLASS_TO_BUY, DealStatusEnum.SUCCESS);
-
-			//学生推送消息
-			Map<Integer,String> maps = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryStudentIdMap(noCreateSuccessVipGroup.getId()));
-			if(maps != null && maps.size() > 0){
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_STUDENT_VIP_STOP,
-						maps,null,0,null,noCreateSuccessVipGroup.getName(),refundPeriod);
-			}
-			//老师推送消息
-			maps = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryTeacherIdMap(noCreateSuccessVipGroup.getId()));
-			if(maps != null && maps.size() > 0){
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_TEACHER_VIP_STOP,
-						maps,null,0,null,noCreateSuccessVipGroup.getName());
-			}
+			//推送消息
+			stopVipPush(noCreateSuccessVipGroup.getId(),noCreateSuccessVipGroup.getName());
 
 			for (StudentPaymentOrder studentPaymentOrder:studentPaymentOrders){
 				//生成账户资金明细
@@ -1743,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>