Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1018,7 +1018,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private boolean addCalenderDetail(StudentPaymentOrder studentPaymentOrder, StudentRegistration studentRegistration) {
         Date nowDate = new Date();
         MusicGroupStudentFee musicGroupStudentFee = new MusicGroupStudentFee();
-        musicGroupStudentFee.setRemainNetworkClassTimes(0);
         musicGroupStudentFee.setLatestPaidTime(nowDate);
         musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
         musicGroupStudentFee.setUpdateTime(nowDate);
@@ -1042,11 +1041,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         musicGroupRegCalender.setUpdateTime(nowDate);
         musicGroupPaymentCalenderDao.update(musicGroupRegCalender);
 
+        List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(studentRegistration.getMusicGroupId());
+        BigDecimal courseTotalPrice = courseSettings.stream().filter(e -> orderDetailTypes.contains(e.getCourseType().getCode())).map(MusicGroupPaymentCalenderCourseSettings::getCourseCurrentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+
         MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
         musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupRegCalender.getId());
         musicGroupPaymentCalenderDetail.setUserId(studentPaymentOrder.getUserId());
-        musicGroupPaymentCalenderDetail.setExpectAmount(studentPaymentOrder.getExpectAmount());
-        musicGroupPaymentCalenderDetail.setActualAmount(studentPaymentOrder.getActualAmount());
+        musicGroupPaymentCalenderDetail.setExpectAmount(courseTotalPrice);
+        musicGroupPaymentCalenderDetail.setActualAmount(courseTotalPrice);
         musicGroupPaymentCalenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
         musicGroupPaymentCalenderDetail.setUserStatus(null);
         musicGroupPaymentCalenderDetail.setPayTime(nowDate);
@@ -1059,11 +1062,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         musicGroupPaymentCalenderDetail.setUseInCourse(0);
         musicGroupPaymentCalenderDetailDao.insert(musicGroupPaymentCalenderDetail);
 
-        List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
-
         List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = new ArrayList<>();
 
-        List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(studentRegistration.getMusicGroupId());
         for (MusicGroupPaymentCalenderCourseSettings courseSetting : courseSettings) {
             if (!orderDetailTypes.contains(courseSetting.getCourseType().getCode())) continue;
             MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();