系统收费

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

@@ -1612,7 +1612,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		//更新学生的缴费记录状态
 		calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
-		calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
+		calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
 		calenderDetail.setPayTime(date);
 		calenderDetail.setUpdateTime(date);
 		musicGroupPaymentCalenderDetailDao.update(calenderDetail);

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

@@ -2301,7 +2301,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         String orderNo = idGeneratorService.generatorId("payment") + "";
 
-        BigDecimal amount = calenderDetail.getExpectAmount();
+        BigDecimal amount = calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount());
 
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();

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

@@ -315,7 +315,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
 
                 for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
-                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
+                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
                     calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                     calenderDetail.setPayTime(nowDate);
                     calenderDetail.setUpdateTime(nowDate);

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

@@ -1056,30 +1056,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         return classGroupStuList;
     }
 
-    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public void updateCalender(Long calenderDetailId, Integer userId) {
-        Date date = new Date();
-        MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.get(calenderDetailId);
-        MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetail.getMusicGroupPaymentCalenderId());
-        MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId, calender.getMusicGroupId());
-        if (calender.getIsGiveMusicNetwork()) {
-            //赠送网管课
-            musicGroupStudentFee.setRemainNetworkClassTimes(musicGroupStudentFee.getRemainNetworkClassTimes() + 1);
-        }
-        //更新学生的缴费记录状态
-        calenderDetail.setPaymentStatus(PAID_COMPLETED);
-        calenderDetail.setActualAmount(calenderDetail.getExpectAmount());
-        calenderDetail.setPayTime(date);
-        calenderDetail.setUpdateTime(date);
-        musicGroupPaymentCalenderDetailDao.update(calenderDetail);
-
-        //更新实际缴费人数
-        Integer actualNum = calender.getActualNum() == null ? 0 : calender.getActualNum();
-        calender.setActualNum(actualNum + 1);
-        calender.setUpdateTime(date);
-        musicGroupPaymentCalenderDao.update(calender);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentPaymentOrder updateApplyOrder(StudentPaymentOrder studentPaymentOrder) throws Exception {