经营报表

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

@@ -749,7 +749,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
         }
-        musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
+        if(BigDecimal.ZERO.compareTo(paymentCalenderDetail.getActualAmount()) < 0){
+            musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
+            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,paymentCalenderDetail.getActualAmount());
+        }
         studentRegistrationDao.update(studentRegistration);
     }
 

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

@@ -321,7 +321,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
                         calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
                         calenderDetail.setPayTime(nowDate);
-                        calenderDetail.setUpdateTime(nowDate);
                     }
                     if (calenderDetails.size() > 0) {
                         musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);

mec-biz/src/main/resources/config/mybatis/OperatingReportCloudMapper.xml

@@ -61,7 +61,6 @@
 	</update>
     <update id="settlementCalender">
 		UPDATE operating_report_cloud orc
-		LEFT JOIN cloud_teacher_free_course ctf ON ctf.calender_id_ = orc.calender_id_
 		SET orc.settlement_flag_ = 1
 		WHERE orc.month_flag_ = 0 AND orc.settlement_flag_ = 0 AND DATE_FORMAT(orc.start_date_,'%Y-%m') = #{month};
 	</update>