Merge remote-tracking branch 'origin/online1' into online1

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

@@ -50,7 +50,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param status
      * @return
      */
-    List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("status") List<MusicGroupPaymentCalender.PaymentCalenderStatusEnum> status, @Param("payUserType") String payUserType);
+    List<MusicGroupPaymentCalender> queryByPaymentStatus(@Param("musicGroupId") String musicGroupId, @Param("status") List<MusicGroupPaymentCalender.PaymentCalenderStatusEnum> status, @Param("payUserType") String payUserType);
 
     /**
      * 获取缴费信息锁

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

@@ -1488,7 +1488,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		List<PaymentCalenderStatusEnum> statusList = new ArrayList<>();
 		statusList.add(PaymentCalenderStatusEnum.NO);
 		statusList.add(PaymentCalenderStatusEnum.OPEN);
-		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(statusList,PayUserType.STUDENT.getCode());
+		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(null, statusList,PayUserType.STUDENT.getCode());
 
 		List<MusicGroupPaymentCalender> updateMusicGroupPaymentCalenderList = new ArrayList<MusicGroupPaymentCalender>();
 		for (MusicGroupPaymentCalender mgpc : musicGroupPaymentCalenderList) {

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

@@ -97,6 +97,8 @@ import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
@@ -3251,7 +3253,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("会员收费乐团不可更改收费模式");
             }
             if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
-                throw new BizException("当前乐团收费模式不可更改为会员收费");
+            	
+            	//如果有进行中的缴费，不能修改会员
+            	List<PaymentCalenderStatusEnum> statusList = new ArrayList<>();
+        		statusList.add(PaymentCalenderStatusEnum.NO);
+        		statusList.add(PaymentCalenderStatusEnum.OPEN);
+        		statusList.add(PaymentCalenderStatusEnum.AUDITING);
+        		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(musicGroupId, statusList,PayUserType.STUDENT.getCode());
+
+        		if(musicGroupPaymentCalenderList != null && musicGroupPaymentCalenderList.size() > 0){
+        			throw new BizException("存在未完结[审核中/未开启缴费/开启缴费]的缴费项目，请检查");
+        		}
+            	
             }
         }
         musicGroup.setUpdateTime(date);

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

@@ -318,6 +318,9 @@
         	<if test="payUserType != null">
                 AND pay_user_type_ = #{payUserType}
         	</if>
+        	<if test="musicGroupId != null">
+                AND music_group_id_ = #{musicGroupId}
+        	</if>
         </where>
     </select>