缴费项目改造

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

@@ -365,30 +365,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentBaseCalender.getCalenderMember();
         if (calenderMember != null) {
             calenderMember = musicGroupPaymentCalenderMemberService.initBean(calenderMember);
+            calenderMember.setActualAmount(memberActualAmount);
             calenderMember.setOriginalAmount(memberOriginalAmount);
             calenderMember.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderMember.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderMemberService.insert(calenderMember);
         }
         //保存乐保缴费信息
         MusicGroupPaymentCalenderRepair musicRepair = musicGroupPaymentBaseCalender.getMusicRepair();
         if (musicRepair != null) {
             musicRepair.setOriginalAmount(repairOriginalAmount);
+            musicRepair.setActualAmount(repairActualAmount);
             musicRepair.setCalenderId(calenderId);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                musicRepair.setActualAmount(BigDecimal.ZERO);
-            }
             musicGroupPaymentCalenderRepairService.insert(musicRepair);
         }
         //保存活动缴费信息
         List<MusicGroupPaymentCalenderActivity> calenderActivityList = musicGroupPaymentBaseCalender.getCalenderActivityList();
         if (calenderActivityList != null && calenderActivityList.size() > 0) {
             musicGroupPaymentCalenderActivityService.initBean(calenderActivityList);
-            if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
-                calenderActivityList.forEach(e -> e.setActualAmount(BigDecimal.ZERO));
-            }
             musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender, calenderId);
         }
         //保存课程费用列表