update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDetailDao.java

@@ -206,10 +206,4 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
 	 */
 	MusicGroupPaymentCalenderDetail findByOrderId(@Param("orderId") Long orderId);
 
-	/**
-	 * 根据缴费项目批量获取
-	 * @author zouxuan
-	 * @param calenderIds
-	 */
-	void delByCalenderIds(@Param("calenderIds") List<Long> calenderIds);
 }

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

@@ -1621,8 +1621,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         //删除续费周期
         musicGroupStudentFeeDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
-        //删除缴费明细
-//        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 
         // 退团
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.QUIT);
@@ -1700,13 +1698,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             sysUserCashAccountDetailService.addCashAccountDetail(userId, amount, SysUserCashAccountDetailService.MUSIC_GROUP + musicGroupId, "",
                     PlatformCashAccountDetailTypeEnum.REFUNDS, null, SUCCESS, "退出乐团", null);
         }
+
         //缴费项目预计人数减一
         musicGroupPaymentCalenderDao.cutCalenderExpectNum(userId,musicGroupId);
-        //删除所有未缴费的类型为新增学员的缴费项
+        //删除缴费项目
         List<Long> calenderIds = musicGroupPaymentCalenderDao.findStudentNoPaymentCalender(userId,musicGroupId);
+        //删除缴费项目详情
+        musicGroupPaymentCalenderDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
         if(calenderIds != null && calenderIds.size() > 0){
             musicGroupPaymentCalenderDao.delByIds(calenderIds);
-            musicGroupPaymentCalenderDetailDao.delByCalenderIds(calenderIds);
         }
         return true;
     }

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

@@ -178,18 +178,12 @@
 	<delete id="deleteByUserIdAndMusicGroupId">
 		DELETE FROM music_group_payment_calender_detail
 		WHERE music_group_payment_calender_id_ IN (SELECT mgpc.id_ FROM music_group_payment_calender mgpc
-		WHERE mgpc.music_group_id_ = #{musicGroupId} AND mgpc.status_ IN ('NO','OPEN'))
+		WHERE mgpc.music_group_id_ = #{musicGroupId})
 		AND user_id_ = #{userId} AND payment_status_ = 'NON_PAYMENT'
 	</delete>
     <delete id="deleteByCalenderId">
 		DELETE FROM music_group_payment_calender_detail WHERE music_group_payment_calender_id_ = #{id}
 	</delete>
-	<delete id="delByCalenderIds">
-		DELETE FROM music_group_payment_calender_detail WHERE music_group_payment_calender_id_ IN
-		<foreach collection="calenderIds" item="item" separator="," open="(" close=")">
-			#{item}
-		</foreach>
-	</delete>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">