feat:首页统计

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

@@ -5388,7 +5388,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				deletePaymentIds.add(mainCoursePayment.getId());
 				continue;
 			}
-			mainCoursePayment.setExpectPrice();
+//			mainCoursePayment.setExpectPrice();
 		}
     }
 }

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

@@ -1114,7 +1114,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			results.put("offlineTeacherSalary", ofts);
 		}
 
-		if(vipGroupCategory.getMusicTheory()){
+		if(Objects.isNull(vipGroupActivity)||vipGroupCategory.getMusicTheory()){
 			BigDecimal ots = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
 			BigDecimal ofts = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
 			if(Objects.nonNull(vipGroup.getStatus())&&normalStudentNum!=vipGroupCategory.getStudentNum()){
@@ -1124,7 +1124,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			results.put("totalPrice",vipGroup.getTotalPrice());
 			results.put("onlineTeacherSalary",ots);
 			results.put("offlineTeacherSalary",ofts);
-			return results;
 		}
 
 		if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!CollectionUtils.isEmpty(((VipGroupApplyBaseInfoDto)vipGroup).getVipGroupStudentCoursePrices())){