Merge branch '20221010' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -503,8 +503,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 					detail.setSubCourseCurrentPrice(BigDecimal.ZERO);
 					detail.setSubCourseOriginalPrice(BigDecimal.ZERO);
 				}else{
-					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + courseDuration);
-					detail.setSubCourseMinutes(detail.getSubCourseMinutes() - courseDuration);
+					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + courseMinutes);
+					detail.setSubCourseMinutes(detail.getSubCourseMinutes() - courseMinutes);
 					//课程每分钟现价
 					BigDecimal unitMinuteCurrentPrice = detail.getCourseCurrentPrice().divide(new BigDecimal(detail.getTotalCourseMinutes()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
 					BigDecimal unitMinuteOriginalPrice = detail.getCourseOriginalPrice().divide(new BigDecimal(detail.getTotalCourseMinutes()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);

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

@@ -362,6 +362,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         //如果是学校缴费，需要保存还款周期
         musicGroupCalenderRefundPeriodService.savePeriod(musicGroupPaymentBaseCalender);
 
+        //云教练团经营报表相关
         operatingReportCloudService.save(musicGroupPaymentCalender);
         Long calenderId = musicGroupPaymentCalender.getId();
         //保存会员缴费信息

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

@@ -1953,25 +1953,23 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public boolean deleteMusicGroup(String musicGroupId) {
-
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
-
         if (musicGroup.getDelFlag() == true) {
             throw new BizException("乐团已删除");
         }
-
         if (musicGroup.getStatus() != MusicGroupStatusEnum.CANCELED) {
             throw new BizException("乐团当前状态是{}，不能删除", musicGroup.getStatus().getMsg());
         }
-
+        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroupId);
+        if(Objects.nonNull(musicGroupRegCalender)){
+            musicGroupPaymentCalenderService.del(musicGroupRegCalender.getId());
+        }
         musicGroup.setUpdateTime(new Date());
         musicGroup.setDelFlag(true);
         musicGroupDao.update(musicGroup);
-
         return true;
     }
 

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

@@ -188,7 +188,7 @@
 		<include refid="queryCoopCalenderHavingSql"/>)crp
 	</select>
 	<select id="sumCoopRefund" resultType="java.math.BigDecimal">
-		select CASE WHEN crp.id_ IS NULL THEN 0 ELSE SUM(refund_amount_) - SUM(sub_refund_amount_) END from music_group_calender_refund_period crp
+		select CASE WHEN crp.id_ IS NULL THEN 0 ELSE SUM(sub_refund_amount_) END from music_group_calender_refund_period crp
 		left join cooperation_organ co ON co.id_ = crp.cooperation_organ_id_
 		<include refid="queryCoopRefundSql"/>
 	</select>