经营报表相关改动

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

@@ -124,10 +124,9 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 					if(Objects.nonNull(chargeType) && chargeType.getFee() != null && orderMusical.getPrice().compareTo(BigDecimal.ZERO) > 0
 							&& chargeType.getFee().compareTo(orderMusical.getPrice()) < 0){
 						musicalFee = orderMusical.getPrice().subtract(chargeType.getFee());
-//						studentMusicCourseFeeService.addExpectPrice(studentRegistration.getUserId(),
-//								musicGroup.getId(),musicalFee);
 						//累加充值金额
 						studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(musicalFee));
+						studentRegistrationDao.update(studentRegistration);
 						//添加日志
 						StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
 						studentCourseFeeDetail.setTenantId(musicGroup.getTenantId());
@@ -137,7 +136,6 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 						studentCourseFeeDetail.setMemo("免费团,购买乐器赠送课费");
 						studentCourseFeeDetail.setOperator(userId);
 						studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
-						studentRegistrationDao.update(studentRegistration);
 						List<MusicGroupPaymentStudentCourseDetail> courseDetails = musicGroupPaymentStudentCourseDetailDao.findByCalenderAndUserId(musicGroupPaymentCalender.getId().toString(), userId);
 						if(CollectionUtils.isNotEmpty(courseDetails)){
 							distributeTotalAmount(courseDetails,musicalFee);
@@ -188,18 +186,6 @@ public class MusicGroupPaymentStudentCourseDetailServiceImpl extends BaseService
 						if(Objects.nonNull(chargeType) && chargeType.getFee() != null && orderMusical.getPrice().compareTo(BigDecimal.ZERO) > 0
 								&& chargeType.getFee().compareTo(orderMusical.getPrice()) < 0){
 							musicalFee = orderMusical.getPrice().subtract(chargeType.getFee());
-							//累加充值金额
-							studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(musicalFee));
-							//添加日志
-							StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
-							studentCourseFeeDetail.setTenantId(musicGroup.getTenantId());
-							studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
-							studentCourseFeeDetail.setAmount(musicalFee);
-							studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
-							studentCourseFeeDetail.setMemo("免费团,购买乐器赠送课费");
-							studentCourseFeeDetail.setOperator(userId);
-							studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
-							studentRegistrationDao.update(studentRegistration);
 							distributeTotalAmount(musicGroupPaymentStudentCourseDetails,musicalFee);
 						}
 					}