经营报表相关改动

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

@@ -446,10 +446,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             classGroupService.addStudentToClassGroupAndCourseArranging(calenderAddStudent.getStudentIds(), calenderAddStudent.getClassGroupIds(),
                     batchNo, settingsList, musicGroup);
             //记录经营报表学员课程费用
-            if(CollectionUtils.isNotEmpty(settingsList)){
-                BigDecimal coursePrice = settingsList.stream().map(e -> e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
-                studentMusicCourseFeeService.addExpectPrice(calenderAddStudent.getStudentIds(),musicGroupId,coursePrice);
-            }
+//            if(CollectionUtils.isNotEmpty(settingsList)){
+//                BigDecimal coursePrice = settingsList.stream().map(e -> e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                studentMusicCourseFeeService.addExpectPrice(calenderAddStudent.getStudentIds(),musicGroupId,coursePrice);
+//            }
             ExecutorService executor = Executors.newFixedThreadPool(5);
             CompletableFuture.runAsync(() -> {
                 imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);

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

@@ -88,10 +88,10 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 					musicGroupPaymentStudentCourseDetailList.add(musicGroupPaymentStudentCourseDetail);
 					reduce = reduce.add(musicGroupPaymentStudentCourseDetail.getCourseCurrentPrice());
 				}
-				if(reduce.compareTo(BigDecimal.ZERO) > 0){
+//				if(reduce.compareTo(BigDecimal.ZERO) > 0){
 					//汇总学员乐团课费，如果有溢出的乐器费用、云教练费用，也一并汇总，用于计算经营报表
-					studentMusicCourseFeeService.addExpectPrice(studentId,musicGroupId,reduce);
-				}
+//					studentMusicCourseFeeService.addExpectPrice(studentId,musicGroupId,reduce);
+//				}
 			}
 			if (musicGroupPaymentStudentCourseDetailList.size() > 0) {
 				musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetailList);
@@ -252,7 +252,7 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 			List<Long> courseDetailIds = courseDetails.stream().map(e -> e.getId()).collect(Collectors.toList());
 			musicGroupPaymentStudentCourseDetailDao.delByIds(courseDetailIds);
 			//汇总学员乐团课费，如果有溢出的乐器费用、云教练费用，也一并汇总，用于计算经营报表
-			courseDetails = courseDetails.stream().filter(e -> e.getCourseCurrentPrice().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
+			/*courseDetails = courseDetails.stream().filter(e -> e.getCourseCurrentPrice().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
 			if(CollectionUtils.isNotEmpty(courseDetails)){
 				Map<Integer, List<MusicGroupPaymentStudentCourseDetail>> userMap = courseDetails.stream().collect(Collectors.groupingBy(e -> e.getUserId()));
 				for (Integer userId : userMap.keySet()) {
@@ -263,7 +263,7 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 						studentMusicCourseFeeService.cutExpectPrice(userId,musicGroupId,priceMap.get(musicGroupId));
 					}
 				}
-			}
+			}*/
 		}
 	}
 }

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

@@ -665,7 +665,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             studentCourseFeeDetail.setOperator(userId);
             studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
             //记录用户实际课费
-            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,courseFee);
+//            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,courseFee);
         }
         List<OrderDetailTypeEnum> detailTypeEnums = allDetails.stream().map(StudentPaymentOrderDetail::getType).collect(Collectors.toList());
         //学生云教练处理