feat：乐理课

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

@@ -144,13 +144,14 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 							VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId());
 
 							VipGroupActivity vipGroupActivity = vipGroupActivityMap.get(vipGroup.getVipGroupActivityId());
+							VipGroupSalarySettlementDto vipGroupSalarySettlementDto = null;
 							if (!vipGroupCategory.getMusicTheory()&&vipGroupActivity == null) {
 								continue;
+							}else{
+								vipGroupSalarySettlementDto= JSON.parseObject(vipGroupActivity.getSalarySettlementJson(),
+										VipGroupSalarySettlementDto.class);
 							}
 
-							VipGroupSalarySettlementDto vipGroupSalarySettlementDto = JSON.parseObject(vipGroupActivity.getSalarySettlementJson(),
-									VipGroupSalarySettlementDto.class);
-
 							if (!vipGroupCategory.getMusicTheory()&&vipGroupSalarySettlementDto == null) {
 								continue;
 							}

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

@@ -1048,17 +1048,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 
 			results.put("totalPrice",totalPrice.setScale(0,BigDecimal.ROUND_CEILING));
-
-			if(vipGroup instanceof VipGroupApplyBaseInfoDto && !CollectionUtils.isEmpty(((VipGroupApplyBaseInfoDto)vipGroup).getVipGroupStudentCoursePrices())){
-				for (VipGroupStudentCoursePrice vscp : ((VipGroupApplyBaseInfoDto)vipGroup).getVipGroupStudentCoursePrices()) {
-					if(Objects.isNull(vscp.getOnlineClassesUnitPrice())||Objects.isNull(vscp.getOfflineClassesUnitPrice())){
-						throw new BizException("请设置课程单价");
-					}
-					vscp.setPaymentPrice(vscp.getOfflineClassesUnitPrice().multiply(new BigDecimal(vipGroup.getOfflineClassesNum())).add(vscp.getOnlineClassesUnitPrice().multiply(new BigDecimal(vipGroup.getOnlineClassesNum()))));
-					vipGroup.setTotalPrice(vipGroup.getTotalPrice().add(vscp.getPaymentPrice()));
-					results.put(vscp.getStudentId().toString(), vscp.getPaymentPrice());
-				}
-			}
+			vipGroup.setTotalPrice(totalPrice.setScale(0,BigDecimal.ROUND_CEILING));
 
 			//教师课酬线上单课酬计算
 			if(Objects.nonNull(vipGroupSalarySettlementDto.getOnlineSalarySettlement())){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupCategoryController.java

@@ -53,7 +53,7 @@ public class VipGroupCategoryController extends BaseController {
 		if(Objects.nonNull(organId)){
 			List<VipGroupCategory> result = vipGroupCategoryService.findAllByOrgan(organId.toString());
 			if(!CollectionUtils.isEmpty(result)){
-				result = result.stream().filter(c->c.getMusicTheory()).collect(Collectors.toList());
+				result = result.stream().filter(c->!c.getMusicTheory()).collect(Collectors.toList());
 			}
 			return succeed();
 		}else{
@@ -63,7 +63,7 @@ public class VipGroupCategoryController extends BaseController {
 			}
 			List<VipGroupCategory> result = vipGroupCategoryService.findAllByOrgan(teacher.getTeacherOrganId().toString());
 			if(!CollectionUtils.isEmpty(result)){
-				result = result.stream().filter(c->c.getMusicTheory()).collect(Collectors.toList());
+				result = result.stream().filter(c->!c.getMusicTheory()).collect(Collectors.toList());
 			}
 			return succeed(result);
 		}