Merge branch 'zx_1026_1111' into test

mec-application/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -205,7 +205,7 @@ public class ActivityController extends BaseController {
     }
 
     @ApiOperation(value = "查询乐团编制")
-    @GetMapping(value = "/querySubject", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/querySubject")
     public HttpResponseResult<MusicGroupPlanMakingDto> query(Integer id) throws Exception {
         MusicGroupPlanMaking pm = musicGroupPlanMakingService.get(id);
 

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

@@ -779,21 +779,22 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 			if(StringUtils.isEmpty(activity.getVipGroupCategoryIdList())){
 				activity.setActivityTypeEnum("PRACTICE");
 			}else {
-				if(StringUtils.equals(activity.getVipGroupCategoryNames(),"小组课")){
+				activity.setActivityTypeEnum(activity.getVipGroupCategoryNames());
+				/*if(StringUtils.equals(activity.getVipGroupCategoryNames(),"小组课")){
 					activity.setActivityTypeEnum("THEORY");
 				}else{
 					activity.setActivityTypeEnum(activity.getVipGroupCategoryNames());
-				}
+				}*/
 			}
 		}
-		String giveCourseType = activity.getGiveCourseType();
+		/*String giveCourseType = activity.getGiveCourseType();
 		if(StringUtils.isNotEmpty(giveCourseType)){
 			if(StringUtils.equals(giveCourseType,"VIP")){
 				if(StringUtils.equals(activity.getGiveCategoryName(),"小组课")){
 					activity.setGiveCourseType("THEORY");
 				}
 			}
-		}
+		}*/
     }
 
 	@Override

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

@@ -1424,14 +1424,14 @@
               where status_ = 'SUCCESS'
                 and group_type_ = 'VIP'
                 and type_ = 'SMALL_CLASS_TO_BUY'
-                and activity_id_ = #{param.v1}
+                and find_in_set(activity_id_, #{v1})
               union
               select user_id_, organ_id_
               from student_payment_order
               where status_ = 'SUCCESS'
                 and group_type_ = 'VIP'
                 and type_ = 'SMALL_CLASS_TO_BUY'
-                and activity_id_ = #{param.v2}
+                and find_in_set(activity_id_, #{v2})
               union
               SELECT user_id_, organ_id_
               FROM student_payment_order
@@ -1446,7 +1446,7 @@
               where status_ = 'SUCCESS'
                 and group_type_ = 'MEMBER'
                 and type_ = 'MEMBER'
-                and activity_id_ = #{param.cloudTeacher}
+                and find_in_set(activity_id_, #{param.cloudTeacher})
               union
               select t.user_id_, t.organ_id_
               from student_payment_order t
@@ -1469,7 +1469,7 @@
               where status_ = 'SUCCESS'
                 and group_type_ = 'VIP'
                 and type_ = 'SMALL_CLASS_TO_BUY'
-                and activity_id_ = #{param.theory}) t
+                and find_in_set(activity_id_, #{param.theory})) t
         group by organ_id_
     </select>
 </mapper>