Merge remote-tracking branch 'origin/saas' into saas

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

@@ -105,7 +105,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 				// 批量新增
 				teacherDefaultMusicGroupSalaryDao.batchAdd(salaries);
 
-				String typeList = salaryMap.keySet().stream().map(e -> e.getCode()).collect(Collectors.joining(","));
+				/*String typeList = salaryMap.keySet().stream().map(e -> e.getCode()).collect(Collectors.joining(","));
 				// 查询所有需要修改的课酬
 				List<CourseScheduleTeacherSalary> updateTeacherSalaryList = courseScheduleTeacherSalaryDao.queryUserNoSettlementListByTypeAndStartClassDate(
 						userId, typeList, startDate);
@@ -169,10 +169,10 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											ts.setExpectSalary(duration.divide(new BigDecimal(mins), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getAssistantTeacher90MinSalary()));
 										}
 									}
-									/*if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
+									if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
 										int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(ts.getCourseScheduleId());
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
-									}*/
+									}
 									list.add(ts);
 								} else if (musicGroup.getSettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT) {// 默认课酬
 									mins = 30;
@@ -191,10 +191,10 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											ts.setExpectSalary(duration.divide(minsDecimal, CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(tdms.getAssistantTeacher30MinSalary()));
 										}
 									}
-									/*if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
+									if(CourseScheduleType.HIGH.equals(tdms.getCourseScheduleType())){
 										int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(ts.getCourseScheduleId());
 										ts.setExpectSalary(ts.getExpectSalary().multiply(new BigDecimal(studentNum)));
-									}*/
+									}
 									list.add(ts);
 								}
 								if(ts.getExpectSalary() == null){
@@ -206,7 +206,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 					if (list.size() > 0) {
 						courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(list);
 					}
-				}
+				}*/
 			}
 		}
 	}

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

@@ -72,7 +72,7 @@ public class TeacherDefaultPracticeGroupSalaryServiceImpl extends BaseServiceImp
 			if(startDate != null){
 				//更新课酬
 
-				String typeList = CourseScheduleType.PRACTICE.getCode();
+				/*String typeList = CourseScheduleType.PRACTICE.getCode();
 				// 查询所有需要修改的课酬
 				List<CourseScheduleTeacherSalary> updateTeacherSalaryList = courseScheduleTeacherSalaryDao.queryUserNoSettlementListByTypeAndStartClassDate(
 						userId, typeList, startDate);
@@ -104,7 +104,7 @@ public class TeacherDefaultPracticeGroupSalaryServiceImpl extends BaseServiceImp
 					if (list.size() > 0) {
 						courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(list);
 					}
-				}
+				}*/
 			}
 			
 			return true;

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

@@ -117,7 +117,7 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 				// 新增
 				teacherDefaultVipGroupSalaryDao.batchAdd(teacherDefaultVipGroupSalaries);
 
-				String typeList = CourseScheduleType.VIP.getCode();
+				/*String typeList = CourseScheduleType.VIP.getCode();
 				// 查询所有需要修改的课酬
 				List<CourseScheduleTeacherSalary> updateTeacherSalaryList = courseScheduleTeacherSalaryDao.queryUserNoSettlementListByTypeAndStartClassDate(
 						userId, typeList, startDate);
@@ -186,7 +186,7 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 					if (list.size() > 0) {
 						courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(list);
 					}
-				}
+				}*/
 			}
 		}
 	}

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

@@ -4257,6 +4257,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         		vipGroup.setStatus(VipGroupStatusEnum.CANCEL);
                 vipGroup.setUpdateTime(now);
                 vipGroup.setStopReason("没有学员");
+                
+                // 删除课表
+                courseScheduleDao.deleteCourseSchedulesByMusicGroupID(vipGroup.getId() + "", GroupType.VIP);
         	}
             vipGroupDao.batchUpdate(vipGroupList);