|
@@ -123,8 +123,8 @@ 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);
|
|
|
+// studentMusicCourseFeeService.addExpectPrice(studentRegistration.getUserId(),
|
|
|
+// musicGroup.getId(),musicalFee);
|
|
|
//累加充值金额
|
|
|
studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(musicalFee));
|
|
|
//添加日志
|
|
@@ -136,6 +136,7 @@ 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);
|