update

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

@@ -1622,7 +1622,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除续费周期
         musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
         //删除缴费明细
-        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
+//        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 
         // 退团
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
@@ -1707,7 +1707,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(calenderIds != null && calenderIds.size() > 0){
             musicGroupPaymentCalenderDao.delByIds(calenderIds);
             musicGroupPaymentCalenderDetailDao.delByCalenderIds(calenderIds);
-            //删除所有未缴费的缴费详情
         }
         return true;
     }

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

@@ -214,9 +214,10 @@
         AND payment_type_ != 'ADD_STUDENT' AND expect_num_ > 0 AND music_group_id_ = #{musicGroupId}
     </update>
     <select id="findStudentNoPaymentCalender" resultType="java.lang.Long">
-        SELECT id_ FROM music_group_payment_calender
-        WHERE id_ IN (SELECT music_group_payment_calender_id_ FROM music_group_payment_calender_detail
-        WHERE user_id_ = #{userId} AND payment_status_ = 'NON_PAYMENT') AND payment_type_ = 'ADD_STUDENT' AND music_group_id_ = #{musicGroupId}
+        SELECT DISTINCT mgpc.id_ FROM music_group_payment_calender mgpc
+        LEFT JOIN music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
+        WHERE mgpcd.user_id_ = #{userId} AND mgpcd.payment_status_ = 'NON_PAYMENT'
+        AND mgpc.payment_type_ = 'ADD_STUDENT' AND mgpc.music_group_id_ = #{musicGroupId}
     </select>
 
     <!-- 根据主键删除一条记录 -->