Bläddra i källkod

bug修改,缴费项目修改后会导致overflow_course_price_被重复add,导致课耗收入异常

zouxuan 1 år sedan
förälder
incheckning
9c29f195f3

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

@@ -406,6 +406,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         //保存课程费用列表
         List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList();
         if(CollectionUtils.isNotEmpty(courseSettingsList)){
+            courseSettingsList.forEach(e -> {
+                e.setOverflowCoursePrice(BigDecimal.ZERO);
+            });
             //是否会员团
             if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE && Objects.nonNull(calenderMember)){
                 //获取云教练溢出费用
@@ -514,14 +517,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     public Map<String, Object> getCalenderDetail(Map<String, Object> result, Long calenderId) {
         //课程
         List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId);
-        if (CollectionUtils.isNotEmpty(courseSettingsList)){
-            courseSettingsList.forEach(e -> {
-                e.setOverflowCoursePrice(BigDecimal.ZERO);
-            });
-            result.put("course", courseSettingsList);
-        }else {
-            result.put("course", null);
-        }
+        result.put("course", courseSettingsList==null?null:courseSettingsList.size() == 0?null:courseSettingsList);
         //乐保
         result.put("repair", musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId);