zouxuan преди 5 години
родител
ревизия
65e67d0d0c
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

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

@@ -501,9 +501,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 //新增班级学生关系(合奏班)
                 ClassGroupRelation classGroupRelation = classGroupRelationDao.findClassGroupRelation(classGroupId);
                 classGroupStudentMapperDao.insert(new ClassGroupStudentMapper(classGroupRelation.getClassGroupId(), userId));
-
+                Date date = new Date();
                 //获取当前月
-                Integer month = Integer.parseInt(DateUtil.getMonth(new Date()));
+                Integer month = Integer.parseInt(DateUtil.getMonth(date));
                 //获取下次缴费月份
                 List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
                 List<Integer> months = musicGroupPaymentCalenders.stream().map(e -> e.getPaymentMonth()).collect(Collectors.toList());
@@ -546,7 +546,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 if(reduce == BigDecimal.ZERO){
                     studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                     studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
+                    studentPaymentOrder.setActualAmount(reduce);
+                    studentPaymentOrder.setPayTime(date);
                 }
+                studentPaymentOrder.setExpectAmount(reduce);
                 studentRegistrationDao.insertBasic(studentRegistration);
                 studentPaymentOrderService.insert(studentPaymentOrder);
                 studentPaymentOrderDetails.forEach(e -> {