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

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -152,7 +152,7 @@ public class MusicGroupController extends BaseController {
             //如果乐器和辅件都买过/那么看是否购买过其他的缴费项
             if (typeList.contains(OrderDetailTypeEnum.MUSICAL) && typeList.contains(OrderDetailTypeEnum.ACCESSORIES)) {
                 MusicGroupPaymentCalender paymentCalender = musicGroupPaymentCalenderService.getApplyCalenderByMusicId(musicGroupId);
-                HashMap<String, Object> calenderDetail = new HashMap<>(4);
+                HashMap<String, Object> calenderDetail = new HashMap<>(5);
                 musicGroupPaymentCalenderService.getCalenderDetail(calenderDetail,paymentCalender.getId());
                 boolean flag = false;
                 //是否购买乐团课
@@ -170,7 +170,7 @@ public class MusicGroupController extends BaseController {
                     }
                 }
 
-                if(!flag){
+                if(flag){
                     //是否购买会员
                     if(Objects.nonNull(calenderDetail.get("member"))){
                         if(typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
@@ -180,7 +180,7 @@ public class MusicGroupController extends BaseController {
                         }
                     }
                 }
-                if(!flag){
+                if(flag){
                     //是否购买活动包
                     if(Objects.nonNull(calenderDetail.get("activity"))){
                         if(typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.PRACTICE)){
@@ -190,7 +190,7 @@ public class MusicGroupController extends BaseController {
                         }
                     }
                 }
-                if(flag){
+                if(!flag){
                     return failed(HttpStatus.PROCESSING, "您已缴费,请等待乐团开启");
                 }
             }