Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec 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-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -156,7 +156,7 @@ public class OpenDouble11StaticsController extends BaseController {
         Integer saleStaticsType = query.getSaleStaticsType();
         if (0 == saleStaticsType) { //将不同类型数据汇总
             List<Double11StaticWrapper.SaleAmountAndUser> allResult = new ArrayList<>();
-            for (int i = 1; i <= 6; i++) {
+            for (int i = 1; i <= 7; i++) {
                 query.setSaleStaticsType(i);
                 setQueryParam(query, configParam);
                 List<Double11StaticWrapper.SaleAmountAndUser> oneResult = queryOrgSaleAmount(query, orgIdMap);

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