|
@@ -184,13 +184,13 @@ public class MusicGroupController extends BaseController {
|
|
|
//判断是否所有类型都购买完
|
|
|
if (musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE) {
|
|
|
if (typeList.contains(OrderDetailTypeEnum.MUSICAL) && typeList.contains(OrderDetailTypeEnum.ACCESSORIES)
|
|
|
- && typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER)) {
|
|
|
+ && (typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS))) {
|
|
|
return failed(HttpStatus.PROCESSING, "您已缴费,请等待乐团开启");
|
|
|
}
|
|
|
} else {
|
|
|
if (typeList.contains(OrderDetailTypeEnum.MUSICAL)
|
|
|
&& typeList.contains(OrderDetailTypeEnum.ACCESSORIES)
|
|
|
- && (typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.COURSE)
|
|
|
+ && (typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS) || typeList.contains(OrderDetailTypeEnum.COURSE)
|
|
|
|| typeList.contains(OrderDetailTypeEnum.HIGH_ONLINE_COURSE) || typeList.contains(OrderDetailTypeEnum.SINGLE)
|
|
|
|| typeList.contains(OrderDetailTypeEnum.MIX) || typeList.contains(OrderDetailTypeEnum.HIGH)
|
|
|
|| typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.DEMO)
|