缴费修改

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

@@ -169,20 +169,25 @@ public class MusicGroupController extends BaseController {
                         flag = false;
                     }
                 }
-                //是否购买会员
-                if(Objects.nonNull(calenderDetail.get("member"))){
-                    if(typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
-                        flag = true;
-                    }else {
-                        flag = false;
+
+                if(!flag){
+                    //是否购买会员
+                    if(Objects.nonNull(calenderDetail.get("member"))){
+                        if(typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER) || typeList.contains(OrderDetailTypeEnum.CLOUD_TEACHER_PLUS)){
+                            flag = true;
+                        }else {
+                            flag = false;
+                        }
                     }
                 }
-                //是否购买活动包
-                if(Objects.nonNull(calenderDetail.get("activity"))){
-                    if(typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.PRACTICE)){
-                        flag = true;
-                    }else {
-                        flag = false;
+                if(!flag){
+                    //是否购买活动包
+                    if(Objects.nonNull(calenderDetail.get("activity"))){
+                        if(typeList.contains(OrderDetailTypeEnum.VIP) || typeList.contains(OrderDetailTypeEnum.PRACTICE)){
+                            flag = true;
+                        }else {
+                            flag = false;
+                        }
                     }
                 }
                 if(flag){