Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into active_course_2021-09-26～29

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

@@ -907,7 +907,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		List<String> bySubIds = subjectDao.findBySubIds(vipGroupApplyBaseInfoDto.getSubjectIdList());
 		StringBuffer className=new StringBuffer();
 		if(ActivityCourseType.FREE_VIP.equals(vipGroup.getVipGroupApplyBaseInfo().getActivityCourseType())){
-			className.append("考前辅导课•");
+			className.append("体验课•");
 		}else if(Objects.isNull(vipGroupCategory.getMusicTheory())||!vipGroupCategory.getMusicTheory()){
 			className.append(StringUtils.join(bySubIds,","));
 			className.append(vipGroupCategory.getName());

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

@@ -1454,7 +1454,7 @@
 				#{organId}
 			</foreach>
 		</if>
-		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d')
+		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d'),spo.type_
 		UNION ALL
 		SELECT spo.organ_id_,SUM(CASE WHEN spod.price_ IS NULL THEN 0 ELSE spod.price_ END) total_num_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_,spo.type_
 		FROM student_payment_order spo
@@ -1467,8 +1467,8 @@
 				#{organId}
 			</foreach>
 		</if>
-		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d')
-		)c GROUP BY DATE_FORMAT(c.month_,'%Y-%m-%d')
+		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d'),spo.type_
+		)c GROUP BY DATE_FORMAT(c.month_,'%Y-%m-%d'),c.type_
 	</select>
 
 	<sql id="queryTeacherServeInfoCondition">