zouxuan 2 years ago
parent
commit
ea6894c00e

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

@@ -129,6 +129,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     private ImGroupMemberService imGroupMemberService;
     @Autowired
     private MemberFeeSettingService memberFeeSettingService;
+    @Autowired
+    private StudentMusicCourseFeeService studentMusicCourseFeeService;
 
     @Override
     public BaseDAO<Long, MusicGroupPaymentCalender> getDAO() {
@@ -434,6 +436,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             // 学生加到班级
             classGroupService.addStudentToClassGroupAndCourseArranging(calenderAddStudent.getStudentIds(), calenderAddStudent.getClassGroupIds(),
                     batchNo, musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList(), musicGroup);
+            //记录学员课程费用
+            studentMusicCourseFeeService.addExpcetPrice(musicGroupPaymentCalender);
             ExecutorService executor = Executors.newFixedThreadPool(5);
             CompletableFuture.runAsync(() -> {
                 imUserFriendService.refreshGroupImUserFriend(musicGroupId, GroupType.MUSIC);
@@ -442,19 +446,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         }
         //如果缴费项目不需要审核,处理经营报表相关改动
         if(musicGroupPaymentCalender.getStatus() != AUDITING){
-            //更新 student_registration 表 expect_surplus_course_fee_预计总课费
-            //更新 music_group_payment_calender_member 表 income_团练宝实际收入
-            //更新 course_schedule_student_payment 表 经营报表预售、实收
-
-            //1、记录用户剩余课程费用(包含已排课或已缴费的缴费项目金额)
-            //2、学员退学后更新剩余课费
-            //3、每月结算经营报表时更新本月课程实收(actualPrice)、确认收入(expect_price_)
-
-            //实际总课费 = 已缴课费  + (云教练缴费 - 云教练成本) + (商品收入 - 商品成本)
-            //预计总课费 = 实际总课费 + 已排课未缴费
-            //应收 = 预计课费 - 实际课费
-            //实际收入 = 当月已消耗课费总和
-            //预计收入 = 实际总课费
+            studentMusicCourseFeeService.addExpcetPrice(musicGroupPaymentCalender);
         }
 
         ModelMap map = new ModelMap(1);