Merge branch 'online1' into vip_price_827

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SoundCompareHelper.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/SoundCompareHandler.java

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -62,7 +62,7 @@ public class NewsController extends BaseController {
 	@Autowired
 	private SysConfigService sysConfigService;
 
-	private final LocalDate xiaMenBannerStartShowTime = LocalDate.parse("2021-10-11", DateUtil.dateFormatter);
+	private final LocalDate xiaMenBannerStartShowTime = LocalDate.parse("2021-10-10", DateUtil.dateFormatter);
 
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")

codegen/src/main/resources/generateConfigration.xml

@@ -8,7 +8,7 @@
 		<catalog>mec_test</catalog>
 		<schema>mec_test</schema>
 	</dbConfiguration>
-	<srcBase>e:/javabean</srcBase>
+	<srcBase>/Users/chenxiaoyu/Documents/javabean</srcBase>
 	<pojoPackageName>com.ym.mec.biz.dal.entity</pojoPackageName>
 	<daoPackageName>com.ym.mec.biz.dal.dao</daoPackageName>
 	<servicePackageName>com.ym.mec.biz.service</servicePackageName>

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserRole.java

@@ -17,6 +17,8 @@ public class SysUserRole {
 	public static Integer ADMISSIONS_DIRECTOR = 6;
 	//教学主任、乐队指导
 	public static Integer DEAN_OF_STUDIES = 7;
+	//维修技师
+	public static Integer REPAIR = 37;
 	//总部管理员
 	public static Integer ADMINISTRATOR = 25;
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -39,7 +39,6 @@ public class RoleController extends BaseController {
 	private SysRoleMenuService sysRoleMenuService;
 	@Autowired
 	private SysMenuService sysMenuService;
-
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.web.controller;
 
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -316,6 +317,12 @@ public class UserController extends BaseController {
 	public Object getRole() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
+			SysUser sysUser = sysUserService.get(user.getUserId());
+			if(sysUser.getIsSuperAdmin()){
+				QueryInfo queryInfo = new QueryInfo();
+				queryInfo.setRows(9999);
+				return succeed(sysRoleService.queryPage(queryInfo).getRows());
+			}
 			return succeed(sysRoleService.findRoleByUserId(user.getUserId()));
 		}
 		return failed();

mec-biz/src/main/java/com/ym/mec/biz/dal/config/SoundCompareConfig.java

@@ -35,7 +35,7 @@ public class SoundCompareConfig {
     /**
      * @describe 有效分贝大小
      */
-    public int validDb = 35;
+    public int validDb = -65;
     /**
      * @describe 有效频率
      */

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ActivityApplyStudentTypeDao.java

@@ -0,0 +1,12 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.ActivityApplyStudentType;
+
+public interface ActivityApplyStudentTypeDao extends BaseDAO<Integer, ActivityApplyStudentType> {
+
+
+    void deleteByActivity(Integer activityId);
+
+    void updateByActivity(ActivityApplyStudentType applyToStudentType);
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ActivityPlanDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.ActivityPlan;
+
+public interface ActivityPlanDao extends BaseDAO<Integer, ActivityPlan> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ActivityUserMapperDao.java

@@ -0,0 +1,88 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.ActivityUserMapper;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public interface ActivityUserMapperDao extends BaseDAO<Integer, ActivityUserMapper> {
+
+
+    /**
+    * @description: 获取学员排课资格
+    * @param activityId
+    * @param studentIds
+    * @param type 排课资格类型
+    * @return com.ym.mec.biz.dal.entity.ActivityUserMapper
+    * @author zx
+    * @date 2021/10/11 16:31
+    */
+    List<ActivityUserMapper> findByStudentIdList(@Param("activityId") Integer activityId, @Param("studentIds") String studentIds, @Param("type") String type);
+
+    /**
+    * @description: 获取学员购买的活动次数
+     * @param activityId
+     * @param userId
+    * @return int
+    * @author zx
+    * @date 2021/10/12 18:22
+    */
+    int countActivityBuyNum(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
+
+    /**
+    * @description:
+     * @param groupId
+     * @param studentId
+    * @return com.ym.mec.biz.dal.entity.ActivityUserMapper
+    * @author zx
+    * @date 2021/10/14 15:40
+    */
+    ActivityUserMapper findByStudentId(@Param("groupId") Long groupId, @Param("studentId") Integer studentId);
+
+    /**
+     * @description: 消耗排课资格
+     * @param activityUserMapperIds
+     * @param studentIds
+     * @param type
+     * @param groupId
+     * @return int
+     * @author zx
+     * @date 2021/10/15 15:53
+     */
+    Integer use(@Param("activityUserMapperIds") String activityUserMapperIds,
+            @Param("studentIds") String studentIds,
+            @Param("type") String type,
+            @Param("groupId") Long groupId);
+
+    /**
+    * @description: 批量新增
+     * @param activityUserMappers
+    * @return void
+    * @author zx
+    * @date 2021/10/20 13:38
+    */
+    void batchInsert(@Param("activityUserMappers") List<ActivityUserMapper> activityUserMappers);
+
+    /**
+     * @description:
+     * @param groupId
+ * @param groupType
+    * @return com.ym.mec.biz.dal.entity.ActivityUserMapper
+     */
+    ActivityUserMapper findVipUserMapper(@Param("groupId") Long groupId,
+                                         @Param("groupType") String groupType,
+                                         @Param("studentId") Integer studentId);
+
+    /**
+     * @description: 修改指导老师
+     * @param userId
+     * @param teacherId
+     * @return void
+     * @author zx
+     * @date 2021/11/1 16:21
+     */
+    void updateTeacherId(@Param("userId") Integer userId, @Param("teacherId") Integer teacherId);
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -44,7 +44,7 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
      * @param studentId
      * @return
      */
-    List<CloudTeacherOrder> getStudentCloudTeacherOrder(@Param("studentId") Integer studentId);
+    List<CloudTeacherOrder> getStudentCloudTeacherOrder(@Param("studentId") Integer studentId, @Param("musicGroupId") String musicGroupId);
     
     /**
      * 根据订单编号查询订单详情

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentMusicScoreDao.java

@@ -8,8 +8,6 @@ import java.util.List;
 
 public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, CourseScheduleStudentMusicScore> {
 
-    int updateByMusicScore(CourseScheduleStudentMusicScore courseScheduleStudentMusicScore);
-
     List<CourseScheduleStudentMusicScore> queryByScoreIdAndCourseId(@Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
                                                                     @Param("courseId") Long courseId,
                                                                     @Param("userId") Integer userId,
@@ -31,7 +29,9 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
      * @param musicScoreAccompanimentId
      * @return
      */
-    int openPlayStatus(@Param("scheduleId") long scheduleId,@Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
+    int openPlayStatus(@Param("scheduleId") long scheduleId,
+                       @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
+                       @Param("userId") Integer userId);
 
     /**
      * 开启伴奏播放
@@ -39,5 +39,7 @@ public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, Cou
      * @param musicScoreAccompanimentId
      * @return
      */
-    int openAccompanimentPlayStatus(@Param("scheduleId") long scheduleId, @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId);
+    int openAccompanimentPlayStatus(@Param("scheduleId") long scheduleId,
+                                    @Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
+                                    @Param("userId") Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -560,4 +560,24 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
      * @return
      */
     List<BasicUserDto> getCourseStudents(@Param("courseScheduleId") Long courseScheduleId);
+
+    /**
+    * @description: 当前分部是否有vip，网管课
+     * @param organId
+    * @return boolean
+    * @author zx
+    * @date 2021/11/5 11:30
+    */
+    boolean hasCourse(@Param("organId") String organId);
+
+    /**
+    * @description:  报表中心学员小课记录导出
+     * @param organId
+    * @return java.util.List<com.ym.mec.biz.dal.dto.StudentVipPracticeExportDto>
+    * @author zx
+    * @date 2021/11/5 11:54 
+    */
+    List<StudentVipPracticeExportDto> exportStudentVipPractice(@Param("organId") String organId);
+
+    List<BaseNameDto> queryLastOverTeacher(@Param("studentIds") List<Integer> studentIds, @Param("groupType") String groupType);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeInfoDao.java

@@ -7,4 +7,6 @@ import com.ym.mec.common.dal.BaseDAO;
 public interface EmployeeInfoDao extends BaseDAO<Long, EmployeeInfo> {
 
 	EmployeeInfoDto queryDetail(Long id);
+
+    EmployeeInfo findByPhone(String mobileNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -187,6 +187,8 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                  @Param("educationUserId") Integer educationUserId,
                                  @Param("noPaymentType") Integer noPaymentType);
 
+
+
     List<Map<Integer, Integer>> countOrganNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
 
     List<String> getNoPaymentMusicGroup(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
@@ -316,6 +318,7 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
                                                                  @Param("organIds") List<Integer> organIds);
 
     int countStudentErrorLeave(@Param("organIdList") Set<Integer> organIdList, @Param("format") String format, @Param("classGroupIds") List<Long> classGroupIds);
+    List<Map<Integer, Integer>> countOrganStudentErrorLeave(@Param("organIds") Set<Integer> organIds, @Param("classGroupIds") List<Long> classGroupIds);
 
     int countStudentErrorLeave1(Map<String, Object> params);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/LuckDrawCountDao.java

@@ -2,8 +2,13 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.LuckDrawCount;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 public interface LuckDrawCountDao extends BaseDAO<Long, LuckDrawCount> {
 
 	public LuckDrawCount getLock(Long userId);
+
+	LuckDrawCount findByIdAndGroupId(@Param("userId") Integer userId, @Param("groupId") int groupId);
+
+	LuckDrawCount findLockByIdAndGroupId(@Param("userId") Integer userId, @Param("groupId") int groupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/LuckDrawPrizeDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.dto.HorseRaceLampDto;
 import com.ym.mec.biz.dal.entity.LuckDrawPrize;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -34,4 +35,13 @@ public interface LuckDrawPrizeDao extends BaseDAO<Integer, LuckDrawPrize> {
 	 * @return
 	 */
 	List<LuckDrawPrize> queryDefaultPrize(int group);
+
+	/**
+	* @description: 获取双十一活动跑马灯
+	 * @param groupId
+	* @return java.util.List<com.ym.mec.biz.dal.dto.HorseRaceLampDto>
+	* @author zx
+	* @date 2021/10/19 15:35
+	*/
+    List<HorseRaceLampDto> queryHorseRaceLampDto(int groupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MarketActivityDao.java

@@ -0,0 +1,21 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.ActivityDetailDto;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MarketActivity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MarketActivityDao extends BaseDAO<Integer, MarketActivity> {
+
+
+    /**
+    * @description: 根据营销活动编号，获取活动详情列表
+     * @param marketPriceId
+    * @return java.util.List<com.ym.mec.biz.dal.entity.ActivityDetailDto>
+    * @author zx
+    * @date 2021/10/19 15:50
+    */
+    List<ActivityDetailDto> queryActivity(@Param("marketPriceId") Integer marketPriceId, @Param("organId") Integer organId);
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicEnlightenmentQuestionnaireDao.java

@@ -0,0 +1,41 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.dto.MusicEnlightenmentQuestionnaireStatDto;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MusicEnlightenmentQuestionnaire;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MusicEnlightenmentQuestionnaireDao extends BaseDAO<Long, MusicEnlightenmentQuestionnaire> {
+
+    /**
+     * @describe 获取乐团下所有启蒙问卷
+     * @author Joburgess
+     * @date 2021/10/13 0013
+     * @param musicGroupId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.MusicEnlightenmentQuestionnaire>
+     */
+    List<MusicEnlightenmentQuestionnaire> findByMusicGroupId(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * @describe 查询学员月u谈启蒙课问卷
+     * @author Joburgess
+     * @date 2021/10/13 0013
+     * @param musicGroupId:
+     * @param userPhone:
+     * @return com.ym.mec.biz.dal.entity.MusicEnlightenmentQuestionnaire
+     */
+    MusicEnlightenmentQuestionnaire lockUserMusicEnlightenmentQuestionnaire(@Param("musicGroupId") String musicGroupId,
+                                                @Param("userPhone") String userPhone);
+
+    /**
+     * @describe 启蒙课问卷统计
+     * @author Joburgess
+     * @date 2021/10/13 0013
+     * @param musicGroupId:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.MusicEnlightenmentQuestionnaireStatDto>
+     */
+    List<MusicEnlightenmentQuestionnaireStatDto> musicEnlightenmentQuestionnaireStat(@Param("musicGroupId") String musicGroupId);
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationDao.java

@@ -33,7 +33,7 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      * @param userId
      * @return
      */
-    List<Organization> queryEmployeeOrgan(@Param("userId") Integer userId);
+    List<Organization> queryEmployeeOrgan(@Param("userId") Integer userId, @Param("organId") String organId);
 
     /**
      * 根据分部编号获取分部名称map

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupDao.java

@@ -388,4 +388,47 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return
      */
     String getStudentEduTeacher(@Param("studentId") Integer studentId);
+
+    /**
+    * @description: 统计学员在指定活动上关联的次数
+     * @param vipGroupActivityId
+    * @param studentId
+    * @return int
+    * @author zx
+    * @date 2021/10/8 14:59
+    */
+    int countStudentUserActivityNum(@Param("vipGroupActivityId") Integer vipGroupActivityId, @Param("studentId") Integer studentId);
+
+
+
+    int countUserRepeatPracticeGroupInCourseStartEndTime(@Param("userId") Integer userId,
+                                                    @Param("courseStartDate") Date courseStartDate,
+                                                    @Param("courseEndDate") Date courseEndDate);
+
+    /**
+    * @description: 获取学员可购买的网管课列表
+     * @param params
+    * @return java.util.List<com.ym.mec.biz.dal.dto.StudentVipGroupShowListDto>
+    * @author zx
+    * @date 2021/10/12 14:56
+    */
+    List<StudentVipGroupShowListDto> findPracticeGroups(Map<String, Object> params);
+
+    /**
+    * @description: 获取学生端网管课购买详情
+     * @param groupId
+    * @return com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto
+    * @author zx
+    * @date 2021/10/15 14:36
+    */
+    StudentVipGroupDetailDto getPracticeGroupDetail(Long groupId);
+
+    /**
+    * @description: 统计老师开启的网管课数量
+     * @param teacherId
+    * @return java.lang.Integer
+    * @author zx
+    * @date 2021/10/15 14:44
+    */
+    Integer countTeacherPracticeGroups(Integer teacherId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeGroupSellPriceDao.java

@@ -9,6 +9,4 @@ import com.ym.mec.common.dal.BaseDAO;
  */
 public interface PracticeGroupSellPriceDao extends BaseDAO<Integer, PracticeGroupSellPrice> {
 
-
-
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SchoolDao.java

@@ -49,7 +49,9 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      */
     List<School> findVipSchoolByUserId(@Param("userId") Integer userId,
                                        @Param("organId") String organId,
-                                       @Param("isDefault") Integer isDefault);
+                                       @Param("isDefault") Integer isDefault,
+                                       @Param("search") String search);
+
     List<School> findVipSchoolByUserId2(@Param("userId") Integer userId,
                                        @Param("organId") String organId);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -405,4 +405,13 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * 标记进行中乐团在读学员+VIP、网管有课的学员
      */
     void remarkCountFlag();
+
+    /**
+    * @description: 更新会员信息
+     * @param student
+    * @return void
+    * @author zx
+    * @date 2021/10/13 13:34
+    */
+    void updateStudentMember(@Param("student") Student student);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -164,15 +164,13 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     int countSurplusCourseByMusicGroupAndUser(@Param("musicGroupId") String musicGroupId, @Param("userId") Integer userId);
 
     /**
-     * @param musicGroupId: 乐团或小课金额
-     * @param groupType:
+     * @param vipGroupId: 乐团或小课金额
      * @return java.math.BigDecimal
      * @describe 统计乐团或vip课的收入金额
      * @author Joburgess
      * @date 2019/12/4
      */
-    BigDecimal sumGroupIncomeFee(@Param("musicGroupId") String musicGroupId,
-                                 @Param("groupType") String groupType);
+    BigDecimal sumGroupIncomeFee(@Param("vipGroupId") Long vipGroupId);
 
     List<StudentPaymentOrder> findStudentPaymentOrder(@Param("groupType") String groupType, @Param("musicGroupId") String musicGroupId);
 
@@ -456,4 +454,22 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     Integer getOrderIdByMusical(@Param("musicGroupId") String musicGroupId, @Param("studentId") Integer studentId);
+
+    /**
+    * @description: 根据课程组编号获取学员的订单列表
+     * @param vipGroupId
+    * @return java.util.Map<java.lang.Integer,java.math.BigDecimal>
+    * @author zx
+    * @date 2021/10/20 18:56
+    */
+    List<Map<Integer, BigDecimal>> queryStudentCourseAmountMap(Long vipGroupId);
+
+    /**
+    * @description: 获取学员购买的双十一活动信息
+     * @param userId
+    * @return java.lang.Object
+    * @author zx
+    * @date 2021/10/27 10:27
+    */
+    String queryStudentDoubleEleven2021Order(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -4,15 +4,12 @@ import java.math.BigDecimal;
 import java.util.*;
 
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.entity.*;
 
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -632,6 +629,15 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     List<StudentRegistration> queryMemberEndAutoQuitMusic(@Param("memberEndAutoQuitMusic") String memberEndAutoQuitMusic,
                                                           @Param("educationUserId") Integer educationUserId,
                                                           @Param("organIds") String organIds);
+
+    /**
+     * 获取所有在会员团，但是没有会员，并且没有待生效的学员
+     * @param memberEndAutoQuitMusic
+     * @return
+     */
+    List<Map<Integer, Integer>> queryOrganMemberEndAutoQuitMusic(@Param("memberEndAutoQuitMusic") String memberEndAutoQuitMusic,
+                                                          @Param("educationUserId") Integer educationUserId,
+                                                          @Param("organIds") Set<Integer> organIds);
     
     /**
      * 统计指定乐团在读的声部人数
@@ -698,4 +704,23 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      */
     List<CloudTeacherActiveTargetJsonDto> queryOrganTarget();
 
+    /**
+    * @description: 获取乐团在读学员乐保信息
+     * @param params
+    * @return java.util.List<com.ym.mec.biz.dal.entity.StudentInstrument>
+    * @author zx
+    * @date 2021/11/9 10:40
+    */
+    List<StudentInstrument> queryMusicStudentInstrument(Map<String, Object> params);
+
+    int countMusicStudentInstrument(Map<String, Object> params);
+
+    /**
+    * @description: 获取乐团在读和有乐保的人数
+     * @param musicGroupIds
+    * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroup>
+    * @author zx
+    * @date 2021/11/10 17:55
+    */
+    List<MusicGroup> countInstrument(@Param("musicGroupIds") List<String> musicGroupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserCashAccountLogDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.SysUserCashAccountLog;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SysUserCashAccountLogDao extends BaseDAO<Long, SysUserCashAccountLog> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -266,4 +266,9 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
      * @return java.lang.Long
      */
 	Long findFirstSign(@Param("currentScheduleId") Long currentScheduleId, @Param("userId") Integer userId);
+
+	void updateDeviceNum(@Param("courseId") Integer courseId,
+						 @Param("userId") String userId,
+						 @Param("signInDeviceNum") String signInDeviceNum,
+						 @Param("signOutDeviceNum") String signOutDeviceNum);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultPracticeGroupSalaryDao.java

@@ -31,6 +31,7 @@ public interface TeacherDefaultPracticeGroupSalaryDao extends BaseDAO<Long, Teac
      */
     TeacherDefaultPracticeGroupSalary findByTeacherAndCourseMinutes(@Param("userId")Integer userId,
 																	@Param("minutes") Integer minutes);
+
 	List<TeacherDefaultPracticeGroupSalary> findByTeachersAndCourseMinutes(@Param("teacherIds")List<Integer> teacherIds,
 																	@Param("minutes") Integer minutes);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupActivityDao.java

@@ -1,6 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.dto.ExportVipGroupActivityDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -15,10 +15,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	 * @Date: 2019/10/2
 	 * 根据课程类型获取vip课 活动方案
 	 */
-	List<VipGroupActivity> findByCategory(@Param("categoryId") Long categoryId,
-										  @Param("organIds") String organIds,
-										  @Param("applyToStudentType") Integer applyToStudentType,
-										  @Param("includeClosed") Boolean includeClosed);
+	List<VipGroupActivity> findByCategory(@Param("activityQueryDto") ActivityQueryDto activityQueryDto);
 
 	/**
 	 * 根据活动方案编号列表获取名称
@@ -37,4 +34,107 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	 * @return
 	 */
 	List<ExportVipGroupActivityDto> exportVipGroupActivity(Map<String, Object> params);
+
+	/**
+	* @description: 获取老师待排课的活动方案列表
+	 * @param
+	* @return java.util.List<com.ym.mec.biz.dal.dto.WaitCourseActivityDto>
+	* @author zx
+	* @date 2021/10/11 11:17
+	*/
+    List<WaitCourseActivityDto> queryWaitCourseActivity(@Param("teacherId") Integer teacherId, @Param("organId") String organId);
+
+    /**
+    * @description: 获取活动待排课学员数量
+     * @param userId
+     * @param activityId
+    * @return com.ym.mec.biz.dal.dto.ActivityWaitCourseStudentNumDto
+    * @author zx
+    * @date 2021/10/11 14:37
+    */
+    ActivityWaitCourseStudentNumDto getActivityWaitCourseStudentNum(@Param("userId") Integer userId, @Param("activityId") Integer activityId);
+
+	/**
+	 * @description: 获取活动学员课排课次数
+	 * @param userId
+	 * @param activityId
+	 * @return com.ym.mec.biz.dal.dto.ActivityWaitCourseStudentNumDto
+	 * @author zx
+	 * @date 2021/10/11 15:02
+	 */
+	List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(Map<String, Object> params);
+
+	int countActivityStudentCanCourseNum(Map<String, Object> params);
+
+	/**
+	* @description: 双十一活动统计
+	 * @param
+	* @return java.util.List<com.ym.mec.biz.dal.dto.DoubleEleven2021ActivityDto>
+	* @author zx
+	* @date 2021/10/25 13:46
+	*/
+    List<DoubleEleven2021ActivityDto> countActivityStatis();
+
+	/**
+	* @description: 双十一活动统计
+	 * @param
+	* @return java.util.List<com.ym.mec.biz.dal.dto.DoubleEleven2021ActivityDto>
+	* @author zx
+	* @date 2021/10/25 13:46
+	*/
+    List<DoubleEleven2021ActivityDto> countOrganActivityStatis(@Param("organIdList") List<Integer> organIdList);
+
+    /**
+    * @description: 双十一活动统计
+     * @param
+    * @return com.ym.mec.biz.dal.dto.DoubleEleven2021Dto
+    * @author zx
+    * @date 2021/10/25 15:44
+    */
+	DoubleEleven2021Dto countDoubleEleven2021Statis();
+
+    /**
+    * @description: 双十一活动统计
+     * @param
+    * @return com.ym.mec.biz.dal.dto.DoubleEleven2021Dto
+    * @author zx
+    * @date 2021/10/25 15:44
+    */
+	List<DoubleEleven2021Dto> countOrganDoubleEleven2021Statis(@Param("organId") Integer organId);
+
+	/**
+	* @description: 双十一活动统计
+	 * @param
+	* @return int
+	* @author zx
+	* @date 2021/10/25 15:54
+	*/
+	Integer countGiveMemberNum();
+
+	/**
+	* @description: 双十一活动统计
+	 * @param
+	* @return int
+	* @author zx
+	* @date 2021/10/25 15:54
+	*/
+	List<Map<Long,Long>> countOrganGiveMemberNum(@Param("organIdList") List<Integer> organIdList);
+
+	/**
+	* @description: 双十一活动统计学员列表
+	 * @param params
+	* @return java.util.List<com.ym.mec.biz.dal.dto.DoubleEleven2021OrderDetailDto>
+	* @author zx
+	* @date 2021/10/27 13:31
+	*/
+    List<DoubleEleven2021OrderDetailDto> queryDoubleEleven2021OrderDetail(Map<String, Object> params);
+
+    /**
+    * @description: 双十一活动统计学员列表
+     * @param params
+    * @return int
+    * @author zx
+    * @date 2021/10/27 13:32
+    */
+	int countDoubleEleven2021OrderDetail(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityPlanAddDto.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ActivityPlan;
+
+public class ActivityPlanAddDto extends ActivityPlan {
+
+    private SalarySettlementDto salarySettlement;
+
+    public SalarySettlementDto getSalarySettlement() {
+        return salarySettlement;
+    }
+
+    public void setSalarySettlement(SalarySettlementDto salarySettlement) {
+        this.salarySettlement = salarySettlement;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityQueryDto.java

@@ -0,0 +1,124 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ActivityQueryDto{
+
+    @ApiModelProperty(value = "课程形式")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "分部")
+    private String organId;
+
+    @ApiModelProperty(value = "课程类型")
+    private String courseType = "VIP";
+
+    @ApiModelProperty(value = "学员列表")
+    private String studentIds;
+
+    @ApiModelProperty(value = "活动类型0课程1会员，默认0")
+    private Integer activityType = 0;
+
+    @ApiModelProperty(value = "0非会员，1会员")
+    private Integer memberNum;
+
+    @ApiModelProperty(value = "0老用户，1新用户")
+    private Integer newStudentNum;
+
+    private Boolean includeClosed;
+
+    private boolean onlySpecialActivity;
+
+    private Integer teacherId;
+
+    private Boolean enable;
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public boolean isOnlySpecialActivity() {
+        return onlySpecialActivity;
+    }
+
+    public void setOnlySpecialActivity(boolean onlySpecialActivity) {
+        this.onlySpecialActivity = onlySpecialActivity;
+    }
+
+    public Boolean getIncludeClosed() {
+        return includeClosed;
+    }
+
+    public void setIncludeClosed(Boolean includeClosed) {
+        this.includeClosed = includeClosed;
+    }
+
+    public Integer getMemberNum() {
+        return memberNum;
+    }
+
+    public void setMemberNum(Integer memberNum) {
+        this.memberNum = memberNum;
+    }
+
+    public Integer getNewStudentNum() {
+        return newStudentNum;
+    }
+
+    public void setNewStudentNum(Integer newStudentNum) {
+        this.newStudentNum = newStudentNum;
+    }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public String getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(String courseType) {
+        this.courseType = courseType;
+    }
+
+    public String getStudentIds() {
+        return studentIds;
+    }
+
+    public void setStudentIds(String studentIds) {
+        this.studentIds = studentIds;
+    }
+
+    public Integer getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(Integer activityType) {
+        this.activityType = activityType;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityWaitCourseStudentNumDto.java

@@ -0,0 +1,107 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
+
+public class ActivityWaitCourseStudentNumDto{
+
+    private VipGroupActivity vipGroupActivity;
+
+    private Integer vipNum;
+
+    private Integer practiceNum;
+
+    private Integer giveVipNum;
+
+    private Integer givePracticeNum;
+
+    private String username;
+
+    private String avatar;
+
+    private String phone;
+
+    private Integer userId;
+
+    //活动和员工的分部
+    private String employeeAndActivityOrganIds;
+
+    public String getEmployeeAndActivityOrganIds() {
+        return employeeAndActivityOrganIds;
+    }
+
+    public void setEmployeeAndActivityOrganIds(String employeeAndActivityOrganIds) {
+        this.employeeAndActivityOrganIds = employeeAndActivityOrganIds;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public VipGroupActivity getVipGroupActivity() {
+        return vipGroupActivity;
+    }
+
+    public void setVipGroupActivity(VipGroupActivity vipGroupActivity) {
+        this.vipGroupActivity = vipGroupActivity;
+    }
+
+    public Integer getVipNum() {
+        return vipNum;
+    }
+
+    public void setVipNum(Integer vipNum) {
+        this.vipNum = vipNum;
+    }
+
+    public Integer getPracticeNum() {
+        return practiceNum;
+    }
+
+    public void setPracticeNum(Integer practiceNum) {
+        this.practiceNum = practiceNum;
+    }
+
+    public Integer getGiveVipNum() {
+        return giveVipNum;
+    }
+
+    public void setGiveVipNum(Integer giveVipNum) {
+        this.giveVipNum = giveVipNum;
+    }
+
+    public Integer getGivePracticeNum() {
+        return givePracticeNum;
+    }
+
+    public void setGivePracticeNum(Integer givePracticeNum) {
+        this.givePracticeNum = givePracticeNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BaseNameDto.java

@@ -0,0 +1,33 @@
+package com.ym.mec.biz.dal.dto;
+
+public class BaseNameDto {
+    private Integer userId;
+
+    private Integer teacherId;
+
+    private String teacherName;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BuyDoubleEleven2021Dto.java

@@ -0,0 +1,95 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class BuyDoubleEleven2021Dto {
+
+    @ApiModelProperty(value = "付款渠道")
+    private String paymentChannel;
+
+    @ApiModelProperty(value = "业务渠道")
+    private String paymentBusinessChannel;
+
+    @ApiModelProperty(value = "是否使用账户余额支付")
+    private boolean isUseBalancePayment;
+
+    @ApiModelProperty(value = "是否重新支付")
+    private boolean isRepeatPay;
+
+    @ApiModelProperty(value = "营销活动编号")
+    private String activityIdList;
+
+    @ApiModelProperty(value = "优惠券列表", required = false)
+    private List<Integer> couponIdList;
+
+    private Integer organId;
+
+    private Integer userId;
+
+    public String getActivityIdList() {
+        return activityIdList;
+    }
+
+    public void setActivityIdList(String activityIdList) {
+        this.activityIdList = activityIdList;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public List<Integer> getCouponIdList() {
+        return couponIdList;
+    }
+
+    public void setCouponIdList(List<Integer> couponIdList) {
+        this.couponIdList = couponIdList;
+    }
+
+    public boolean isRepeatPay() {
+        return isRepeatPay;
+    }
+
+    public void setRepeatPay(boolean repeatPay) {
+        isRepeatPay = repeatPay;
+    }
+
+    public boolean isUseBalancePayment() {
+        return isUseBalancePayment;
+    }
+
+    public void setUseBalancePayment(boolean useBalancePayment) {
+        isUseBalancePayment = useBalancePayment;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
+
+    public String getPaymentBusinessChannel() {
+        return paymentBusinessChannel;
+    }
+
+    public void setPaymentBusinessChannel(String paymentBusinessChannel) {
+        this.paymentBusinessChannel = paymentBusinessChannel;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DoubleEleven2021ActivityDto.java

@@ -0,0 +1,52 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class DoubleEleven2021ActivityDto {
+
+    @ApiModelProperty(value = "成交额",required = false)
+    private BigDecimal buyAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "总购买数",required = false)
+    private int buyNum = 0;
+
+    @ApiModelProperty(value = "购买的活动类型1、1v1 20节，2、1v1 40节，3、1v2 20节，4、1v2 40节，5、乐理课",required = false)
+    private Integer type;
+
+    private Integer organId;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public BigDecimal getBuyAmount() {
+        return buyAmount;
+    }
+
+    public void setBuyAmount(BigDecimal buyAmount) {
+        this.buyAmount = buyAmount;
+    }
+
+    public int getBuyNum() {
+        return buyNum;
+    }
+
+    public void setBuyNum(int buyNum) {
+        this.buyNum = buyNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DoubleEleven2021Dto.java

@@ -0,0 +1,185 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class DoubleEleven2021Dto {
+
+    private Integer organId;
+
+    @ApiModelProperty(value = "分部",required = false)
+    private String organName;
+
+    @ApiModelProperty(value = "总成交额",required = false)
+    private BigDecimal totalBuyAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "总购买数",required = false)
+    private Integer totalBuyNum = 0;
+
+    @ApiModelProperty(value = "人均购买金额",required = false)
+    private BigDecimal avgBuyAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "赠送会员人数",required = false)
+    private Long giveMemberNum = 0l;
+
+    @ApiModelProperty(value = "1v1 20节课购买金额",required = false)
+    private BigDecimal vip1V120Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v1 20节课购买人数",required = false)
+    private int vip1V120Num = 0;
+
+    @ApiModelProperty(value = "1v1 40节课购买金额",required = false)
+    private BigDecimal vip1V140Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v1 40节课购买人数",required = false)
+    private Integer vip1V140Num = 0;
+
+    @ApiModelProperty(value = "1v2 20节课购买金额",required = false)
+    private BigDecimal vip1V220Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v2 20节课购买人数",required = false)
+    private Integer vip1V220Num = 0;
+
+    @ApiModelProperty(value = "1v2 40节课购买金额",required = false)
+    private BigDecimal vip1V240Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v2 40节课购买人数",required = false)
+    private Integer vip1V240Num = 0;
+
+    @ApiModelProperty(value = "乐理课购买金额",required = false)
+    private BigDecimal musicTheoryAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "乐理课购买人数",required = false)
+    private Integer musicTheoryNum = 0;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public BigDecimal getTotalBuyAmount() {
+        return totalBuyAmount;
+    }
+
+    public void setTotalBuyAmount(BigDecimal totalBuyAmount) {
+        this.totalBuyAmount = totalBuyAmount;
+    }
+
+    public Integer getTotalBuyNum() {
+        return totalBuyNum;
+    }
+
+    public void setTotalBuyNum(Integer totalBuyNum) {
+        this.totalBuyNum = totalBuyNum;
+    }
+
+    public BigDecimal getAvgBuyAmount() {
+        return avgBuyAmount;
+    }
+
+    public void setAvgBuyAmount(BigDecimal avgBuyAmount) {
+        this.avgBuyAmount = avgBuyAmount;
+    }
+
+    public Long getGiveMemberNum() {
+        return giveMemberNum;
+    }
+
+    public void setGiveMemberNum(Long giveMemberNum) {
+        this.giveMemberNum = giveMemberNum;
+    }
+
+    public BigDecimal getVip1V120Amount() {
+        return vip1V120Amount;
+    }
+
+    public void setVip1V120Amount(BigDecimal vip1V120Amount) {
+        this.vip1V120Amount = vip1V120Amount;
+    }
+
+    public int getVip1V120Num() {
+        return vip1V120Num;
+    }
+
+    public void setVip1V120Num(int vip1V120Num) {
+        this.vip1V120Num = vip1V120Num;
+    }
+
+    public BigDecimal getVip1V140Amount() {
+        return vip1V140Amount;
+    }
+
+    public void setVip1V140Amount(BigDecimal vip1V140Amount) {
+        this.vip1V140Amount = vip1V140Amount;
+    }
+
+    public Integer getVip1V140Num() {
+        return vip1V140Num;
+    }
+
+    public void setVip1V140Num(Integer vip1V140Num) {
+        this.vip1V140Num = vip1V140Num;
+    }
+
+    public BigDecimal getVip1V220Amount() {
+        return vip1V220Amount;
+    }
+
+    public void setVip1V220Amount(BigDecimal vip1V220Amount) {
+        this.vip1V220Amount = vip1V220Amount;
+    }
+
+    public Integer getVip1V220Num() {
+        return vip1V220Num;
+    }
+
+    public void setVip1V220Num(Integer vip1V220Num) {
+        this.vip1V220Num = vip1V220Num;
+    }
+
+    public BigDecimal getVip1V240Amount() {
+        return vip1V240Amount;
+    }
+
+    public void setVip1V240Amount(BigDecimal vip1V240Amount) {
+        this.vip1V240Amount = vip1V240Amount;
+    }
+
+    public Integer getVip1V240Num() {
+        return vip1V240Num;
+    }
+
+    public void setVip1V240Num(Integer vip1V240Num) {
+        this.vip1V240Num = vip1V240Num;
+    }
+
+    public BigDecimal getMusicTheoryAmount() {
+        return musicTheoryAmount;
+    }
+
+    public void setMusicTheoryAmount(BigDecimal musicTheoryAmount) {
+        this.musicTheoryAmount = musicTheoryAmount;
+    }
+
+    public Integer getMusicTheoryNum() {
+        return musicTheoryNum;
+    }
+
+    public void setMusicTheoryNum(Integer musicTheoryNum) {
+        this.musicTheoryNum = musicTheoryNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DoubleEleven2021OrderDetailDto.java

@@ -0,0 +1,87 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DoubleEleven2021OrderDetailDto {
+
+    private Integer userId;
+
+    private String username;
+
+    private String orderNo;
+
+    private BigDecimal amount = BigDecimal.ZERO;
+
+    private Date createTime;
+
+    private Date payTime;
+
+    private String type;
+
+    private Boolean giveMember;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Boolean getGiveMember() {
+        return giveMember;
+    }
+
+    public void setGiveMember(Boolean giveMember) {
+        this.giveMember = giveMember;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/GoodsSellDto.java

@@ -24,13 +24,24 @@ public class GoodsSellDto{
 	@ApiModelProperty(value = "商品销售价", required = false)
 	private BigDecimal goodsPrice = BigDecimal.ZERO;
 
+	@ApiModelProperty(value = "商品团购价", required = false)
+	private BigDecimal goodsGroupPrice = BigDecimal.ZERO;
+
 	@ApiModelProperty(value = "商品销售总价", required = false)
 	private BigDecimal totalGoodsPrice = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "辅件商品列表", required = false)
     private String complementGoodsIdList;
 
-    public String getComplementGoodsIdList() {
+	public BigDecimal getGoodsGroupPrice() {
+		return goodsGroupPrice;
+	}
+
+	public void setGoodsGroupPrice(BigDecimal goodsGroupPrice) {
+		this.goodsGroupPrice = goodsGroupPrice;
+	}
+
+	public String getComplementGoodsIdList() {
         return complementGoodsIdList;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HorseRaceLampDto.java

@@ -10,6 +10,16 @@ public class HorseRaceLampDto {
 
     private String username;
 
+    private String prizeName;
+
+    public String getPrizeName() {
+        return prizeName;
+    }
+
+    public void setPrizeName(String prizeName) {
+        this.prizeName = prizeName;
+    }
+
     public Integer getNum() {
         return num;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/IndexErrorDataExportDto.java

@@ -28,12 +28,18 @@ public class IndexErrorDataExportDto {
     @ApiModelProperty(value = "未加入任何班级学员")
     private int noClassMusicGroupStudentInfo;
 
+    @ApiModelProperty(value = "学员请假异常数")
+    private int studentErrorLeave;
+
     @ApiModelProperty(value = "未缴费学员数")
     private int studentNotPayment;
 
     @ApiModelProperty(value = "申请退团学员数")
     private int studentApplyForQuitMusicGroup;
 
+    @ApiModelProperty(value = "会员已过期数量")
+    private int noMemberStudentNum;
+
     @ApiModelProperty(value = "预计课酬较低")
     private int teacherExpectSalaryBeLow;
 
@@ -73,6 +79,22 @@ public class IndexErrorDataExportDto {
     @ApiModelProperty(value = "总计")
     private int total;
 
+    public int getStudentErrorLeave() {
+        return studentErrorLeave;
+    }
+
+    public void setStudentErrorLeave(int studentErrorLeave) {
+        this.studentErrorLeave = studentErrorLeave;
+    }
+
+    public int getNoMemberStudentNum() {
+        return noMemberStudentNum;
+    }
+
+    public void setNoMemberStudentNum(int noMemberStudentNum) {
+        this.noMemberStudentNum = noMemberStudentNum;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicEnlightenmentQuestionnaireStatDto.java

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/10/13 0013
+ */
+public class MusicEnlightenmentQuestionnaireStatDto {
+
+    @ApiModelProperty("教师推荐专业名称")
+    private String subjectName;
+
+    @ApiModelProperty("人数")
+    private Integer userNum;
+
+    @ApiModelProperty("在学乐器人数")
+    private Integer learningUserNum;
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public Integer getUserNum() {
+        return userNum;
+    }
+
+    public void setUserNum(Integer userNum) {
+        this.userNum = userNum;
+    }
+
+    public Integer getLearningUserNum() {
+        return learningUserNum;
+    }
+
+    public void setLearningUserNum(Integer learningUserNum) {
+        this.learningUserNum = learningUserNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicStudentInstrumentDto.java

@@ -0,0 +1,54 @@
+package com.ym.mec.biz.dal.dto;
+
+public class MusicStudentInstrumentDto{
+
+    private Integer userId;
+
+    private String username;
+
+    private String avatar;
+
+    private String phone;
+
+    private Boolean hasInstrument;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Boolean getHasInstrument() {
+        return hasInstrument;
+    }
+
+    public void setHasInstrument(Boolean hasInstrument) {
+        this.hasInstrument = hasInstrument;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupApplyBaseInfoDto.java

@@ -0,0 +1,60 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.PracticeGroup;
+import com.ym.mec.biz.dal.entity.VipGroupStudentCoursePrice;
+import com.ym.mec.biz.dal.enums.ActivityCourseType;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+public class PracticeGroupApplyBaseInfoDto extends PracticeGroup {
+
+    @ApiModelProperty(value = "课酬",required = false)
+    private BigDecimal salary;
+
+    @ApiModelProperty(value = "教师线上课课酬")
+    private BigDecimal onlineTeacherSalary;
+
+    @ApiModelProperty(value = "活动课程类型")
+    private ActivityCourseType activityCourseType;
+
+    /** 课程结束日期 */
+    @ApiModelProperty(value = "课程结束日期", required = false)
+    private java.util.Date coursesExpireDate;
+
+    @Override
+    public Date getCoursesExpireDate() {
+        return coursesExpireDate;
+    }
+
+    @Override
+    public void setCoursesExpireDate(Date coursesExpireDate) {
+        this.coursesExpireDate = coursesExpireDate;
+    }
+
+    public ActivityCourseType getActivityCourseType() {
+        return activityCourseType;
+    }
+
+    public void setActivityCourseType(ActivityCourseType activityCourseType) {
+        this.activityCourseType = activityCourseType;
+    }
+
+    public BigDecimal getOnlineTeacherSalary() {
+        return onlineTeacherSalary;
+    }
+
+    public void setOnlineTeacherSalary(BigDecimal onlineTeacherSalary) {
+        this.onlineTeacherSalary = onlineTeacherSalary;
+    }
+
+    public BigDecimal getSalary() {
+        return salary;
+    }
+
+    public void setSalary(BigDecimal salary) {
+        this.salary = salary;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupApplyDto.java

@@ -0,0 +1,74 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.List;
+
+public class PracticeGroupApplyDto {
+
+    @ApiModelProperty(value = "网管课基本信息",required = false)
+    private PracticeGroupApplyBaseInfoDto practiceGroupApplyBaseInfoDto;
+
+    @ApiModelProperty(value = "课程计划列表",required = false)
+    private List<CourseSchedule> courseSchedules;
+
+    @ApiModelProperty(value = "课程组只能是正常状态")
+    private boolean onlyProgress;
+
+    private BigDecimal singleClassPrice;
+
+    @ApiModelProperty(value = "是否赠课")
+    private Boolean giveFlag;
+
+    @ApiModelProperty(value = "是否允许超出活动允许的学生使用次数")
+    private Boolean allowOverstepActivityStudentNum = false;
+
+    public Boolean getGiveFlag() {
+        return giveFlag;
+    }
+
+    public void setGiveFlag(Boolean giveFlag) {
+        this.giveFlag = giveFlag;
+    }
+
+    public Boolean getAllowOverstepActivityStudentNum() {
+        return allowOverstepActivityStudentNum;
+    }
+
+    public void setAllowOverstepActivityStudentNum(Boolean allowOverstepActivityStudentNum) {
+        this.allowOverstepActivityStudentNum = allowOverstepActivityStudentNum;
+    }
+
+    public BigDecimal getSingleClassPrice() {
+        return singleClassPrice;
+    }
+
+    public void setSingleClassPrice(BigDecimal singleClassPrice) {
+        this.singleClassPrice = singleClassPrice;
+    }
+
+    public PracticeGroupApplyBaseInfoDto getPracticeGroupApplyBaseInfoDto() {
+        return practiceGroupApplyBaseInfoDto;
+    }
+
+    public void setPracticeGroupApplyBaseInfoDto(PracticeGroupApplyBaseInfoDto practiceGroupApplyBaseInfoDto) {
+        this.practiceGroupApplyBaseInfoDto = practiceGroupApplyBaseInfoDto;
+    }
+
+    public List<CourseSchedule> getCourseSchedules() {
+        return courseSchedules;
+    }
+
+    public void setCourseSchedules(List<CourseSchedule> courseSchedules) {
+        this.courseSchedules = courseSchedules;
+    }
+
+    public boolean getOnlyProgress() {
+        return onlyProgress;
+    }
+
+    public void setOnlyProgress(boolean onlyProgress) {
+        this.onlyProgress = onlyProgress;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupBuyParamsDto.java

@@ -0,0 +1,127 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class PracticeGroupBuyParamsDto {
+
+    @ApiModelProperty(value = "课程组ID")
+    private Long practiceGroupId;
+
+    @ApiModelProperty(value = "付款渠道")
+    private String paymentChannel;
+
+    @ApiModelProperty(value = "业务渠道")
+    private String paymentBusinessChannel;
+
+    @ApiModelProperty(value = "是否使用账户余额支付")
+    private boolean isUseBalancePayment;
+
+    @ApiModelProperty(value = "是否重新支付")
+    private boolean isRepeatPay;
+
+    @ApiModelProperty(value = "营销活动编号")
+    private Integer activityId;
+
+    @ApiModelProperty(value = "优惠券列表", required = false)
+    private List<Integer> couponIdList;
+
+    private BigDecimal amount;
+
+    private Integer organId;
+
+    @ApiModelProperty(value = "购买的会员数量")
+    private Integer buyMemberNum;
+
+    public Integer getBuyMemberNum() {
+        return buyMemberNum;
+    }
+
+    public void setBuyMemberNum(Integer buyMemberNum) {
+        this.buyMemberNum = buyMemberNum;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public Long getPracticeGroupId() {
+        return practiceGroupId;
+    }
+
+    public void setPracticeGroupId(Long practiceGroupId) {
+        this.practiceGroupId = practiceGroupId;
+    }
+
+    public List<Integer> getCouponIdList() {
+        return couponIdList;
+    }
+
+    public void setCouponIdList(List<Integer> couponIdList) {
+        this.couponIdList = couponIdList;
+    }
+
+    public boolean isRepeatPay() {
+        return isRepeatPay;
+    }
+
+    public void setRepeatPay(boolean repeatPay) {
+        isRepeatPay = repeatPay;
+    }
+
+    public boolean isUseBalancePayment() {
+        return isUseBalancePayment;
+    }
+
+    public void setUseBalancePayment(boolean useBalancePayment) {
+        isUseBalancePayment = useBalancePayment;
+    }
+
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
+
+    public String getPaymentBusinessChannel() {
+        return paymentBusinessChannel;
+    }
+
+    public void setPaymentBusinessChannel(String paymentBusinessChannel) {
+        this.paymentBusinessChannel = paymentBusinessChannel;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReturnFeeDto.java

@@ -0,0 +1,74 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.GroupType;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class ReturnFeeDto {
+
+    @ApiModelProperty(value = "课程组编号",required = false)
+    private Long vipGroupId;
+
+    @ApiModelProperty(value = "课程组编号",required = false)
+    private Long groupId;
+
+    @ApiModelProperty(value = "退费学员",required = false)
+    private Integer studentId;
+
+    @ApiModelProperty(value = "退费金额",required = false)
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "是否确认退还活动赠送",required = false)
+    private Boolean confirmReturnActivityGive = false;
+
+    private GroupType groupType;
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+
+    public Long getVipGroupId() {
+        return vipGroupId;
+    }
+
+    public void setVipGroupId(Long vipGroupId) {
+        this.vipGroupId = vipGroupId;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Boolean getConfirmReturnActivityGive() {
+        return confirmReturnActivityGive;
+    }
+
+    public void setConfirmReturnActivityGive(Boolean confirmReturnActivityGive) {
+        this.confirmReturnActivityGive = confirmReturnActivityGive;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SalarySettlementDto.java

@@ -0,0 +1,52 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+public class SalarySettlementDto implements Serializable {
+
+    @ApiModelProperty("线上课收费标准")
+    private SalarySettlementTypeDto onlineSalarySettlement;
+
+    @ApiModelProperty("线下课收费标准")
+    private SalarySettlementTypeDto offlineSalarySettlement;
+
+    @ApiModelProperty("赠送线上课收费标准")
+    private SalarySettlementTypeDto giveOnlineSalarySettlement;
+
+    @ApiModelProperty("赠送线下课收费标准")
+    private SalarySettlementTypeDto giveOfflineSalarySettlement;
+
+    public SalarySettlementTypeDto getOnlineSalarySettlement() {
+        return onlineSalarySettlement;
+    }
+
+    public void setOnlineSalarySettlement(SalarySettlementTypeDto onlineSalarySettlement) {
+        this.onlineSalarySettlement = onlineSalarySettlement;
+    }
+
+    public SalarySettlementTypeDto getOfflineSalarySettlement() {
+        return offlineSalarySettlement;
+    }
+
+    public void setOfflineSalarySettlement(SalarySettlementTypeDto offlineSalarySettlement) {
+        this.offlineSalarySettlement = offlineSalarySettlement;
+    }
+
+    public SalarySettlementTypeDto getGiveOnlineSalarySettlement() {
+        return giveOnlineSalarySettlement;
+    }
+
+    public void setGiveOnlineSalarySettlement(SalarySettlementTypeDto giveOnlineSalarySettlement) {
+        this.giveOnlineSalarySettlement = giveOnlineSalarySettlement;
+    }
+
+    public SalarySettlementTypeDto getGiveOfflineSalarySettlement() {
+        return giveOfflineSalarySettlement;
+    }
+
+    public void setGiveOfflineSalarySettlement(SalarySettlementTypeDto giveOfflineSalarySettlement) {
+        this.giveOfflineSalarySettlement = giveOfflineSalarySettlement;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SalarySettlementTypeDto.java

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class SalarySettlementTypeDto {
+
+    @ApiModelProperty(value = "课程形式")
+    private TeachModeEnum teachMode;
+
+    @ApiModelProperty(value = "课酬结算方式")
+    private SalarySettlementTypeEnum salarySettlementType;
+
+    @ApiModelProperty(value = "课酬结算参数值")
+    private BigDecimal settlementValue;
+
+    public TeachModeEnum getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(TeachModeEnum teachMode) {
+        this.teachMode = teachMode;
+    }
+
+    public SalarySettlementTypeEnum getSalarySettlementType() {
+        return salarySettlementType;
+    }
+
+    public void setSalarySettlementType(SalarySettlementTypeEnum salarySettlementType) {
+        this.salarySettlementType = salarySettlementType;
+    }
+
+    public BigDecimal getSettlementValue() {
+        return settlementValue;
+    }
+
+    public void setSettlementValue(BigDecimal settlementValue) {
+        this.settlementValue = settlementValue;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SoundCompareHelper.java

@@ -4,7 +4,6 @@ import be.tarsos.dsp.AudioEvent;
 import be.tarsos.dsp.SilenceDetector;
 import be.tarsos.dsp.pitch.PitchDetectionHandler;
 import be.tarsos.dsp.pitch.PitchDetectionResult;
-import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.enums.DeviceTypeEnum;
 import com.ym.mec.biz.dal.enums.HeardLevelEnum;
 import com.ym.mec.biz.service.impl.SoundCompareHandler;
@@ -18,7 +17,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author Joburgess
@@ -58,21 +56,21 @@ public class SoundCompareHelper implements PitchDetectionHandler {
     @ApiModelProperty(value = "播放速度")
     private int speed = 90;
 
-    @ApiModelProperty(value = "xml中每个小节的音符详情")
+    @ApiModelProperty(value = "小节xml信息字典")
     private Map<Integer, List<MusicPitchDetailDto>> measureXmlInfoMap = new HashMap<>();
 
-    @ApiModelProperty(value = "xml中每小节开始时间、结束时间")
+    @ApiModelProperty(value = "小节结束时间字典")
     private Map<Integer, MusicPitchDetailDto> measureEndTime = new HashMap<>();
 
-//    @ApiModelProperty(value = "录音音频信息")
-//    private List<MusicPitchDetailDto> recordMeasurePithInfo = new ArrayList<>();
+    @ApiModelProperty(value = "录音音频信息")
+    private List<MusicPitchDetailDto> recordMeasurePithInfo = new ArrayList<>();
 
     @ApiModelProperty(value = "小节分数记录")
     private Map<String, BigDecimal> userScoreMap = new HashMap<>();
 
     private Map<Integer, Map<String, Object>> userMeasureScoreMap = new HashMap<>();
 
-    @ApiModelProperty(value = "xml中每个音符频率")
+    @ApiModelProperty(value = "音符频率字典")
     private Map<Integer, Float> musicalNotePitchMap = new HashMap<>();
 
     @ApiModelProperty(value = "每个音符评测结果")
@@ -81,15 +79,8 @@ public class SoundCompareHelper implements PitchDetectionHandler {
     @ApiModelProperty(value = "偏移时间量，解决客户端录音播放不同步导致的声音留白")
     private int offsetTime = -1;
 
-    /** xml中每个音符详情 */
     private List<MusicPitchDetailDto> musicXmlInfos;
 
-    /** 第一个音符前有多少个字节 */
-    private long firstMeasureStartBytes = 0;
-
-    /** 文件的总字节数长度 */
-    private long recordBytes = 0;
-
     private String clientId;
 
     private Integer detailId;
@@ -98,48 +89,23 @@ public class SoundCompareHelper implements PitchDetectionHandler {
 
     private String xmlUrl;
 
-    /** 演奏音频数据中频率变更明显持续数量 */
-    private int obviousChangeNum = 0;
-
-    /** 演奏音频中但前小节所有频率数据 */
-    private List<MusicPitchDetailDto> currPitchInfos = new ArrayList<>();
-    private List<MusicPitchDetailDto> currTmpPitchInfos = new ArrayList<>();
-
-    private List<MusicPitchDetailDto> recordMeasurePitchInfos = new ArrayList<>();
-
     /**
      * @describe 分贝检测器
      */
     public SilenceDetector silenceDetector = new SilenceDetector();
 
-    /**
-     * xml中每个音符详情 
-     * @return
-     */
     public List<MusicPitchDetailDto> getMusicXmlInfos() {
         return musicXmlInfos;
     }
 
-    /**
-     * xml中每个音符详情 
-     * @return
-     */
     public void setMusicXmlInfos(List<MusicPitchDetailDto> musicXmlInfos) {
         this.musicXmlInfos = musicXmlInfos;
     }
 
-    /**
-     * xml中每个音符对应的频率
-     * @return
-     */
     public Map<Integer, Float> getMusicalNotePitchMap() {
         return musicalNotePitchMap;
     }
 
-    /**
-     * xml中每个音符对应的频率
-     * @return
-     */
     public void setMusicalNotePitchMap(Map<Integer, Float> musicalNotePitchMap) {
         this.musicalNotePitchMap = musicalNotePitchMap;
     }
@@ -232,10 +198,6 @@ public class SoundCompareHelper implements PitchDetectionHandler {
         this.musicScoreId = musicScoreId;
     }
 
-    /**
-     * 录音文件
-     * @return
-     */
     public RandomAccessFile getAccessFile() {
         return accessFile;
     }
@@ -256,10 +218,6 @@ public class SoundCompareHelper implements PitchDetectionHandler {
         this.recordFilePath = recordFilePath;
     }
 
-    /**
-     * 录音文件
-     * @return
-     */
     public void setAccessFile(RandomAccessFile accessFile) {
         this.accessFile = accessFile;
     }
@@ -280,172 +238,77 @@ public class SoundCompareHelper implements PitchDetectionHandler {
         this.measureStartTime = measureStartTime;
     }
 
-    /**
-     * xml中每个小节的音符详情
-     * @return
-     */
     public Map<Integer, List<MusicPitchDetailDto>> getMeasureXmlInfoMap() {
         return measureXmlInfoMap;
     }
 
-    /**
-     * xml中每个小节的音符详情
-     * @return
-     */
     public void setMeasureXmlInfoMap(Map<Integer, List<MusicPitchDetailDto>> measureXmlInfoMap) {
         this.measureXmlInfoMap = measureXmlInfoMap;
     }
 
-    /**
-     * xml中每小节开始时间、结束时间
-     * @return
-     */
     public Map<Integer, MusicPitchDetailDto> getMeasureEndTime() {
         return measureEndTime;
     }
 
-    /**
-     * xml中每小节开始时间、结束时间
-     * @param measureEndTime
-     */
     public void setMeasureEndTime(Map<Integer, MusicPitchDetailDto> measureEndTime) {
         this.measureEndTime = measureEndTime;
     }
 
-    /**
-     * 每个音符的评测结果
-     * @return
-     */
     public List<MusicalNotesPlayStatDto> getMusicalNotesPlayStats() {
         return musicalNotesPlayStats;
     }
 
-    /**
-     * 每个音符的评测结果
-     * @return
-     */
     public void setMusicalNotesPlayStats(List<MusicalNotesPlayStatDto> musicalNotesPlayStats) {
         this.musicalNotesPlayStats = musicalNotesPlayStats;
     }
 
-    /**
-     * 小节累积得分（节奏、音准、完整度）
-     * @return
-     */
-    public Map<String, BigDecimal> getUserScoreMap() {
-        return userScoreMap;
-    }
-
-    /**
-     * 小节累积得分（节奏、音准、完整度）
-     * @return
-     */
-    public void setUserScoreMap(Map<String, BigDecimal> userScoreMap) {
-        this.userScoreMap = userScoreMap;
-    }
-
-    /**
-     * 第一个音符前有多少个字节
-     * @return
-     */
-    public long getFirstMeasureStartBytes() {
-        return firstMeasureStartBytes;
+    public List<MusicPitchDetailDto> getRecordMeasurePithInfo() {
+        return recordMeasurePithInfo;
     }
 
-    /**
-     * 第一个音符前有多少个字节
-     * @param firstMeasureStartBytes
-     */
-    public void setFirstMeasureStartBytes(long firstMeasureStartBytes) {
-        this.firstMeasureStartBytes = firstMeasureStartBytes;
+    public void setRecordMeasurePithInfo(List<MusicPitchDetailDto> recordMeasurePithInfo) {
+        this.recordMeasurePithInfo = recordMeasurePithInfo;
     }
 
-    /**
-     * 文件的总字节数长度
-     * @return
-     */
-    public long getRecordBytes() {
-        return recordBytes;
+    public Map<String, BigDecimal> getUserScoreMap() {
+        return userScoreMap;
     }
 
-    /**
-     * 文件的总字节数长度
-     * @param recordBytes
-     */
-    public void setRecordBytes(long recordBytes) {
-        this.recordBytes = recordBytes;
+    public void setUserScoreMap(Map<String, BigDecimal> userScoreMap) {
+        this.userScoreMap = userScoreMap;
     }
 
-    /**
-     * 小节得分结果
-     * @return
-     */
     public Map<Integer, Map<String, Object>> getUserMeasureScoreMap() {
         return userMeasureScoreMap;
     }
 
-    /**
-     * 小节得分结果
-     * @return
-     */
     public void setUserMeasureScoreMap(Map<Integer, Map<String, Object>> userMeasureScoreMap) {
         this.userMeasureScoreMap = userMeasureScoreMap;
     }
 
-    public List<MusicPitchDetailDto> getRecordMeasurePitchInfos() {
-        return recordMeasurePitchInfos;
-    }
-
-    public void setRecordMeasurePitchInfos(List<MusicPitchDetailDto> recordMeasurePitchInfos) {
-        this.recordMeasurePitchInfos = recordMeasurePitchInfos;
-    }
-
     @Override
     public void handlePitch(PitchDetectionResult pitchDetectionResult, AudioEvent audioEvent) {
         int timeStamp = (int) (measureStartTime + audioEvent.getTimeStamp()*1000);
         float pitch = pitchDetectionResult.getPitch();
-        int decibel = (int) (100 - Math.abs(silenceDetector.currentSPL()));
-
-        if(decibel <= SoundCompareHandler.soundCompareConfig.validDb){
-            pitch = -1;
-            decibel = 0;
-        }
-
-        SoundCompareHandler.LOGGER.info("时间：{}, 频率：{}, 分贝：{}", timeStamp, pitch, decibel);
-
-        //上次的频率与本次的频率相差10hz或分贝相差10
-        if(currPitchInfos.size()>0&&(Math.abs(currPitchInfos.get(currPitchInfos.size()-1).getFrequency()-pitch)>10||Math.abs(currPitchInfos.get(currPitchInfos.size()-1).getDecibel()-decibel)>10)){
-            Double avgPitch = currPitchInfos.stream().skip(1).collect(Collectors.averagingDouble(MusicPitchDetailDto::getFrequency));
-            Double avgDb = currPitchInfos.stream().skip(1).collect(Collectors.averagingDouble(MusicPitchDetailDto::getDecibel));
-
-            MusicPitchDetailDto measureDetail = new MusicPitchDetailDto(currPitchInfos.get(0).getTimeStamp(), avgPitch.floatValue(), avgDb);
-            measureDetail.setEndTimeStamp(timeStamp);
-            measureDetail.setDuration(measureDetail.getEndTimeStamp()-measureDetail.getTimeStamp());
-
-            if(measureDetail.getDuration()>25&&(avgPitch>0||avgDb>SoundCompareHandler.soundCompareConfig.validDb)){
-                recordMeasurePitchInfos.add(measureDetail);
-            }
-
-            currPitchInfos.clear();
-
-            //初始化偏移时间
-            if(offsetTime == -1 && recordMeasurePitchInfos.size() == 1){
-                offsetTime = recordMeasurePitchInfos.get(0).getTimeStamp();
-                for (MusicPitchDetailDto musicXmlInfo : musicXmlInfos) {
-                    if(!musicXmlInfo.getDontEvaluating()){
-                        if(offsetTime > musicXmlInfo.getTimeStamp()) {
-                            offsetTime = offsetTime - musicXmlInfo.getTimeStamp();
-                        }
-                        break;
-                    }
-                }
-                musicXmlInfos.forEach(e->e.setTimeStamp(e.getTimeStamp()+offsetTime));//??????
-                for (Map.Entry<Integer, MusicPitchDetailDto> musicPitchDetailDtoEntry : measureEndTime.entrySet()) {
-                    musicPitchDetailDtoEntry.getValue().setTimeStamp(musicPitchDetailDtoEntry.getValue().getTimeStamp() + offsetTime);
-                    musicPitchDetailDtoEntry.getValue().setEndTimeStamp(musicPitchDetailDtoEntry.getValue().getEndTimeStamp() + offsetTime);
+        if(offsetTime == -1 && !DeviceTypeEnum.IOS.equals(deviceType) && pitch>0){
+            int preTimeStamp = CollectionUtils.isEmpty(recordMeasurePithInfo)?0:recordMeasurePithInfo.get(recordMeasurePithInfo.size()-1).getTimeStamp();
+            offsetTime = timeStamp - (timeStamp - preTimeStamp)/2;
+            for (MusicPitchDetailDto musicXmlInfo : musicXmlInfos) {
+                if(!musicXmlInfo.getDontEvaluating()){
+                    if(offsetTime > musicXmlInfo.getTimeStamp())
+                        offsetTime = offsetTime - musicXmlInfo.getTimeStamp();
+                    break;
                 }
             }
+            for (Map.Entry<Integer, MusicPitchDetailDto> musicPitchDetailDtoEntry : measureEndTime.entrySet()) {
+                musicPitchDetailDtoEntry.getValue().setTimeStamp(musicPitchDetailDtoEntry.getValue().getTimeStamp() + offsetTime);
+                musicPitchDetailDtoEntry.getValue().setEndTimeStamp(musicPitchDetailDtoEntry.getValue().getEndTimeStamp() + offsetTime);
+            }
+        }
+        if(silenceDetector.currentSPL()< SoundCompareHandler.soundCompareConfig.validDb){
+            pitch = -1;
         }
-        currPitchInfos.add(new MusicPitchDetailDto(timeStamp, pitch, decibel));
+//            LOGGER.info("时间：{}, 频率：{}, 分贝：{}", timeStamp, pitch, silenceDetecor.currentSPL());
+        recordMeasurePithInfo.add(new MusicPitchDetailDto(timeStamp, pitch, silenceDetector.currentSPL()));
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCourseInfoDto.java

@@ -54,6 +54,16 @@ public class StudentCourseInfoDto {
     @ApiModelProperty(value = "预计课酬")
     private BigDecimal expectPrice;
 
+    private BigDecimal originalPrice = BigDecimal.ZERO;
+
+    public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
+
     public StudentCourseInfoDto(String classDate, String startClassTime, String endClassTime) {
         this.classDate = DateUtil.stringToDate(classDate, DateUtil.DEFAULT_PATTERN);
         if (Objects.nonNull(this.classDate) && !StringUtils.isBlank(startClassTime)) {

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentOrderExportDto.java

@@ -87,11 +87,24 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
 
     //分润中的服务费用
     private BigDecimal serviceAmount = BigDecimal.ZERO;
+    
+    private BigDecimal serviceFee = BigDecimal.ZERO;
 
     private String feeFlag;
 
     private Integer payingStatus;
 
+    //订单金额
+    private BigDecimal orderAmount = BigDecimal.ZERO;
+
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
     public BigDecimal getSporadicAmount() {
         return sporadicAmount;
     }
@@ -324,7 +337,15 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.serviceAmount = serviceAmount;
     }
 
-    public BigDecimal getMaintenanceFee() {
+    public BigDecimal getServiceFee() {
+		return serviceFee;
+	}
+
+	public void setServiceFee(BigDecimal serviceFee) {
+		this.serviceFee = serviceFee;
+	}
+
+	public BigDecimal getMaintenanceFee() {
         return maintenanceFee;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupShowListDto.java

@@ -61,6 +61,26 @@ public class StudentVipGroupShowListDto {
     @ApiModelProperty(value = "开课时间")
     private Date courseStartDate;
 
+    private Date createTime;
+
+    private String groupType;
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public Date getCourseStartDate() {
         return courseStartDate;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipPracticeExportDto.java

@@ -0,0 +1,195 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class StudentVipPracticeExportDto{
+    private Integer userId;
+
+    private String username;
+
+    private Integer vipOverNum;
+
+    private Integer vipNotStartNum;
+
+    private Integer vipOverTeacherId;
+
+    private String vipOverTeacherName;
+
+    private String vipNotStartTeacherIds;
+
+    private String vipNotStartTeacherNames;
+
+    private Integer practiceOverNum;
+
+    private Integer practiceNotStartNum;
+
+    private Integer practiceOverTeacherId;
+
+    private String practiceOverTeacherName;
+
+    private String practiceNotStartTeacherIds;
+
+    private String practiceNotStartTeacherNames;
+
+    private Integer teacherId;
+
+    private String teacherName;
+
+    private String organName;
+
+    private BigDecimal courseBalance = BigDecimal.ZERO;
+
+    private String subjectName;
+
+    public BigDecimal getCourseBalance() {
+        return courseBalance;
+    }
+
+    public void setCourseBalance(BigDecimal courseBalance) {
+        this.courseBalance = courseBalance;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getVipNotStartTeacherIds() {
+        return vipNotStartTeacherIds;
+    }
+
+    public void setVipNotStartTeacherIds(String vipNotStartTeacherIds) {
+        this.vipNotStartTeacherIds = vipNotStartTeacherIds;
+    }
+
+    public String getVipNotStartTeacherNames() {
+        return vipNotStartTeacherNames;
+    }
+
+    public void setVipNotStartTeacherNames(String vipNotStartTeacherNames) {
+        this.vipNotStartTeacherNames = vipNotStartTeacherNames;
+    }
+
+    public String getPracticeNotStartTeacherIds() {
+        return practiceNotStartTeacherIds;
+    }
+
+    public void setPracticeNotStartTeacherIds(String practiceNotStartTeacherIds) {
+        this.practiceNotStartTeacherIds = practiceNotStartTeacherIds;
+    }
+
+    public String getPracticeNotStartTeacherNames() {
+        return practiceNotStartTeacherNames;
+    }
+
+    public void setPracticeNotStartTeacherNames(String practiceNotStartTeacherNames) {
+        this.practiceNotStartTeacherNames = practiceNotStartTeacherNames;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getVipOverNum() {
+        return vipOverNum;
+    }
+
+    public void setVipOverNum(Integer vipOverNum) {
+        this.vipOverNum = vipOverNum;
+    }
+
+    public Integer getVipNotStartNum() {
+        return vipNotStartNum;
+    }
+
+    public void setVipNotStartNum(Integer vipNotStartNum) {
+        this.vipNotStartNum = vipNotStartNum;
+    }
+
+    public Integer getPracticeOverNum() {
+        return practiceOverNum;
+    }
+
+    public void setPracticeOverNum(Integer practiceOverNum) {
+        this.practiceOverNum = practiceOverNum;
+    }
+
+    public Integer getPracticeNotStartNum() {
+        return practiceNotStartNum;
+    }
+
+    public void setPracticeNotStartNum(Integer practiceNotStartNum) {
+        this.practiceNotStartNum = practiceNotStartNum;
+    }
+
+    public Integer getVipOverTeacherId() {
+        return vipOverTeacherId;
+    }
+
+    public void setVipOverTeacherId(Integer vipOverTeacherId) {
+        this.vipOverTeacherId = vipOverTeacherId;
+    }
+
+    public String getVipOverTeacherName() {
+        return vipOverTeacherName;
+    }
+
+    public void setVipOverTeacherName(String vipOverTeacherName) {
+        this.vipOverTeacherName = vipOverTeacherName;
+    }
+
+    public Integer getPracticeOverTeacherId() {
+        return practiceOverTeacherId;
+    }
+
+    public void setPracticeOverTeacherId(Integer practiceOverTeacherId) {
+        this.practiceOverTeacherId = practiceOverTeacherId;
+    }
+
+    public String getPracticeOverTeacherName() {
+        return practiceOverTeacherName;
+    }
+
+    public void setPracticeOverTeacherName(String practiceOverTeacherName) {
+        this.practiceOverTeacherName = practiceOverTeacherName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupApplyBaseInfoDto.java

@@ -29,8 +29,8 @@ public class VipGroupApplyBaseInfoDto extends VipGroup {
     @ApiModelProperty(value = "预计招生人数",hidden = true)
     private Integer expectStudentNum;
 
-    @ApiModelProperty(value = "教师线上课课酬")
-    private BigDecimal onlineTeacherSalary;
+//    @ApiModelProperty(value = "教师线上课课酬")
+//    private BigDecimal onlineTeacherSalary;
 
     @ApiModelProperty(value = "教师线下课课酬")
     private BigDecimal offlineTeacherSalary;
@@ -76,14 +76,6 @@ public class VipGroupApplyBaseInfoDto extends VipGroup {
         this.subjectIdList = subjectIdList;
     }
 
-    public BigDecimal getOnlineTeacherSalary() {
-        return onlineTeacherSalary;
-    }
-
-    public void setOnlineTeacherSalary(BigDecimal onlineTeacherSalary) {
-        this.onlineTeacherSalary = onlineTeacherSalary;
-    }
-
     public BigDecimal getOfflineTeacherSalary() {
         return offlineTeacherSalary;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupApplyDto.java

@@ -1,8 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.VipGroupStudentCoursePrice;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -23,11 +21,22 @@ public class VipGroupApplyDto {
     @ApiModelProperty(value = "课程组只能是正常状态")
     private boolean onlyProgress;
 
+    @ApiModelProperty(value = "是否赠送课程")
+    private Boolean giveFlag;
+
     private BigDecimal singleClassPrice;
 
     @ApiModelProperty(value = "是否允许超出活动允许的学生使用次数")
     private Boolean allowOverstepActivityStudentNum = false;
 
+    public Boolean getGiveFlag() {
+        return giveFlag;
+    }
+
+    public void setGiveFlag(Boolean giveFlag) {
+        this.giveFlag = giveFlag;
+    }
+
     public Boolean getAllowOverstepActivityStudentNum() {
         return allowOverstepActivityStudentNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupBuyParamsDto.java

@@ -23,7 +23,7 @@ public class VipGroupBuyParamsDto {
     private boolean isUseBalancePayment;
 
     @ApiModelProperty(value = "是否重新支付")
-    private boolean isRepeatPay;
+    private boolean isRepeatPay = false;
 
     @ApiModelProperty(value = "优惠券列表", required = false)
     private List<Integer> couponIdList;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCostCountParamsDto.java

@@ -2,26 +2,40 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 /**
  * @Author Joburgess
  * @Date 2019/10/1
  */
 public class VipGroupCostCountParamsDto {
 
-    @ApiModelProperty("vip课程类型编号")
+    @ApiModelProperty("课程类型编号")
     private Integer vipGroupCategoryId;
 
-    @ApiModelProperty("vip课默认课程单价编号")
+    @ApiModelProperty("默认课程单价编号")
     private Long vipGroupDefaultClassesUnitPriceId;
 
-    @ApiModelProperty("VIP课活动方案编号")
+    @ApiModelProperty("活动方案编号")
     private Long vipGroupActivityId;
 
     @ApiModelProperty(value = "线上课课时数", required = false)
-    private Integer onlineClassesNum;
+    private BigDecimal vipOnlineClassesNum = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "线下课课时数", required = false)
-    private Integer offlineClassesNum;
+    private BigDecimal vipOfflineClassesNum = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "赠送线上课课时数", required = false)
+    private BigDecimal giveVipOnlineClassesNum = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "赠送线下课课时数", required = false)
+    private BigDecimal giveVipOfflineClassesNum = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "网管课课时数", required = false)
+    private BigDecimal practiceClassesNum = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "赠送网管课课时数", required = false)
+    private BigDecimal givePracticeClassesNum = BigDecimal.ZERO;
 
     public Integer getVipGroupCategoryId() {
         return vipGroupCategoryId;
@@ -47,19 +61,52 @@ public class VipGroupCostCountParamsDto {
         this.vipGroupActivityId = vipGroupActivityId;
     }
 
-    public Integer getOnlineClassesNum() {
-        return onlineClassesNum;
+    public BigDecimal getVipOnlineClassesNum() {
+        return vipOnlineClassesNum;
+    }
+
+    public void setVipOnlineClassesNum(BigDecimal vipOnlineClassesNum) {
+        this.vipOnlineClassesNum = vipOnlineClassesNum;
+    }
+
+    public BigDecimal getVipOfflineClassesNum() {
+        return vipOfflineClassesNum;
+    }
+
+    public void setVipOfflineClassesNum(BigDecimal vipOfflineClassesNum) {
+        this.vipOfflineClassesNum = vipOfflineClassesNum;
     }
 
-    public void setOnlineClassesNum(Integer onlineClassesNum) {
-        this.onlineClassesNum = onlineClassesNum;
+    public BigDecimal getGiveVipOnlineClassesNum() {
+        return giveVipOnlineClassesNum;
     }
 
-    public Integer getOfflineClassesNum() {
-        return offlineClassesNum;
+    public void setGiveVipOnlineClassesNum(BigDecimal giveVipOnlineClassesNum) {
+        this.giveVipOnlineClassesNum = giveVipOnlineClassesNum;
     }
 
-    public void setOfflineClassesNum(Integer offlineClassesNum) {
-        this.offlineClassesNum = offlineClassesNum;
+    public BigDecimal getGiveVipOfflineClassesNum() {
+        return giveVipOfflineClassesNum;
+    }
+
+    public void setGiveVipOfflineClassesNum(BigDecimal giveVipOfflineClassesNum) {
+        this.giveVipOfflineClassesNum = giveVipOfflineClassesNum;
+    }
+
+    public BigDecimal getPracticeClassesNum() {
+        return practiceClassesNum;
+    }
+
+    public void setPracticeClassesNum(BigDecimal practiceClassesNum) {
+        this.practiceClassesNum = practiceClassesNum;
+    }
+
+    public BigDecimal getGivePracticeClassesNum() {
+        return givePracticeClassesNum;
+    }
+
+    public void setGivePracticeClassesNum(BigDecimal givePracticeClassesNum) {
+        this.givePracticeClassesNum = givePracticeClassesNum;
     }
 }
+

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupSalarySettlementDto.java

@@ -10,19 +10,23 @@ import java.io.Serializable;
  */
 public class VipGroupSalarySettlementDto implements Serializable {
 
-    @ApiModelProperty("先上课收费标准")
-    private VipGroupSalarySettlementTypeDto onlineSalarySettlement;
+//    @ApiModelProperty("收费VIP线上课收费标准")
+//    private VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement;
 
-    @ApiModelProperty("线下课收费标准")
+    @ApiModelProperty("收费VIP线下课收费标准")
     private VipGroupSalarySettlementTypeDto offlineSalarySettlement;
 
-    public VipGroupSalarySettlementTypeDto getOnlineSalarySettlement() {
-        return onlineSalarySettlement;
-    }
+//    @ApiModelProperty("赠送VIP线上课收费标准")
+//    private VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement;
 
-    public void setOnlineSalarySettlement(VipGroupSalarySettlementTypeDto onlineSalarySettlement) {
-        this.onlineSalarySettlement = onlineSalarySettlement;
-    }
+    @ApiModelProperty("赠送VIP线下课收费标准")
+    private VipGroupSalarySettlementTypeDto giveVipOfflineSalarySettlement;
+
+    @ApiModelProperty("网管课收费标准")
+    private VipGroupSalarySettlementTypeDto practiceSalarySettlement;
+
+    @ApiModelProperty("赠送网管课收费标准")
+    private VipGroupSalarySettlementTypeDto givePracticeSalarySettlement;
 
     public VipGroupSalarySettlementTypeDto getOfflineSalarySettlement() {
         return offlineSalarySettlement;
@@ -31,4 +35,28 @@ public class VipGroupSalarySettlementDto implements Serializable {
     public void setOfflineSalarySettlement(VipGroupSalarySettlementTypeDto offlineSalarySettlement) {
         this.offlineSalarySettlement = offlineSalarySettlement;
     }
+
+    public VipGroupSalarySettlementTypeDto getGiveVipOfflineSalarySettlement() {
+        return giveVipOfflineSalarySettlement;
+    }
+
+    public void setGiveVipOfflineSalarySettlement(VipGroupSalarySettlementTypeDto giveVipOfflineSalarySettlement) {
+        this.giveVipOfflineSalarySettlement = giveVipOfflineSalarySettlement;
+    }
+
+    public VipGroupSalarySettlementTypeDto getPracticeSalarySettlement() {
+        return practiceSalarySettlement;
+    }
+
+    public void setPracticeSalarySettlement(VipGroupSalarySettlementTypeDto practiceSalarySettlement) {
+        this.practiceSalarySettlement = practiceSalarySettlement;
+    }
+
+    public VipGroupSalarySettlementTypeDto getGivePracticeSalarySettlement() {
+        return givePracticeSalarySettlement;
+    }
+
+    public void setGivePracticeSalarySettlement(VipGroupSalarySettlementTypeDto givePracticeSalarySettlement) {
+        this.givePracticeSalarySettlement = givePracticeSalarySettlement;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/WaitCourseActivityDto.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+public class WaitCourseActivityDto{
+
+    private Integer activityId;
+
+    private String activityName;
+
+    private Integer studentNum;
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityApplyStudentType.java

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(activity_apply_student_type):
+ */
+public class ActivityApplyStudentType {
+
+	/**  */
+	private Integer id;
+	
+	/** 是否是新学员1是0否 */
+	private Integer newStudent = -1;
+	
+	/** 是否会员 */
+	private Integer memberFlag = -1;
+	
+	/** 活动编号 */
+	private Integer activityId;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setNewStudent(Integer newStudent){
+		this.newStudent = newStudent;
+	}
+	
+	public Integer getNewStudent(){
+		return this.newStudent;
+	}
+			
+	public void setMemberFlag(Integer memberFlag){
+		this.memberFlag = memberFlag;
+	}
+	
+	public Integer getMemberFlag(){
+		return this.memberFlag;
+	}
+			
+	public void setActivityId(Integer activityId){
+		this.activityId = activityId;
+	}
+	
+	public Integer getActivityId(){
+		return this.activityId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityDetailDto.java

@@ -0,0 +1,106 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ActivityDetailDto {
+	private Integer activityId;
+
+	private String activityName;
+
+	private String activityDesc;
+
+	private BigDecimal currentPrice;
+
+	private BigDecimal originalPrice;
+
+	private String categoryName;
+
+	private Integer categoryId;
+
+	private BigDecimal courseNum;
+
+	private Date startTime;
+
+	private Date endTime;
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public BigDecimal getCourseNum() {
+		return courseNum;
+	}
+
+	public void setCourseNum(BigDecimal courseNum) {
+		this.courseNum = courseNum;
+	}
+
+	public Integer getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(Integer categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	public Integer getActivityId() {
+		return activityId;
+	}
+
+	public void setActivityId(Integer activityId) {
+		this.activityId = activityId;
+	}
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public String getActivityDesc() {
+		return activityDesc;
+	}
+
+	public void setActivityDesc(String activityDesc) {
+		this.activityDesc = activityDesc;
+	}
+
+	public BigDecimal getCurrentPrice() {
+		return currentPrice;
+	}
+
+	public void setCurrentPrice(BigDecimal currentPrice) {
+		this.currentPrice = currentPrice;
+	}
+
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
+	}
+
+	public void setOriginalPrice(BigDecimal originalPrice) {
+		this.originalPrice = originalPrice;
+	}
+
+	public String getCategoryName() {
+		return categoryName;
+	}
+
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityPlan.java

@@ -0,0 +1,331 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 对应数据库表(activity_plan):
+ */
+public class ActivityPlan {
+
+	@ApiModelProperty(value = "活动编号")
+	private Integer id;
+
+	@ApiModelProperty(value = "适用分部")
+	private String organId;
+
+	@ApiModelProperty(value = "活动名称")
+	private String name;
+
+	@ApiModelProperty(value = "活动描述")
+	private String description;
+
+	@ApiModelProperty(value = "活动类型，课程或者会员,0课程，1会员")
+	private Integer type;
+
+	@ApiModelProperty(value = "活动开始时间")
+	private java.util.Date startTime;
+
+	@ApiModelProperty(value = "活动结束时间")
+	private java.util.Date endTime;
+
+	@ApiModelProperty(value = "可排课开始时间")
+	private java.util.Date coursesStartTime;
+
+	@ApiModelProperty(value = "可排课截至时间")
+	private java.util.Date coursesEndTime;
+
+	@ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户，2会员，3非会员")
+	private Integer applyToStudentType = -1;
+
+	@ApiModelProperty(value = "可购买次数:-1：不限制")
+	private Integer maxBuyNum = -1;
+
+	@ApiModelProperty(value = "排课方式0课程余额1排课次数")
+	private Integer courseArrangingType = 0;
+
+	@ApiModelProperty(value = "课程类型VIP,PRACTICE")
+	private String courseType = "VIP";
+
+	@ApiModelProperty(value = "课程形式")
+	private Integer categoryId;
+
+	@ApiModelProperty(value = "单节课时长")
+	private Integer singleCourseTime;
+
+	@ApiModelProperty(value = "最少课程数量")
+	private Integer minCourseNum;
+
+	@ApiModelProperty(value = "最多可排课数量")
+	private Integer maxCourseNum;
+
+	@ApiModelProperty(value = "折扣")
+	private BigDecimal discount = new BigDecimal(100);
+
+	@ApiModelProperty(value = "满赠达标课时:-1：没有满减")
+	private Integer fullMinusCourseTimes = -1;
+
+	@ApiModelProperty(value = "赠课类型")
+	private String giveCourseType;
+
+	@ApiModelProperty(value = "赠课形式")
+	private Integer giveCategoryId;
+
+	@ApiModelProperty(value = "赠课数量")
+	private Integer giveCourseNum = 0;
+
+	@ApiModelProperty(value = "会员编号")
+	private Integer memberRankId;
+
+	@ApiModelProperty(value = "会员时长")
+	private Integer memberTime;
+
+	@ApiModelProperty(value = "结算标准")
+	private String salarySettlementJson;
+
+	@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag = false;
+
+	@ApiModelProperty(value = "是否可用")
+	private Boolean enable = false;
+
+	@ApiModelProperty(value = "创建时间")
+	private java.util.Date createTime;
+
+	@ApiModelProperty(value = "更新时间")
+	private java.util.Date updateTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(String organId) {
+		this.organId = organId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Date getCoursesStartTime() {
+		return coursesStartTime;
+	}
+
+	public void setCoursesStartTime(Date coursesStartTime) {
+		this.coursesStartTime = coursesStartTime;
+	}
+
+	public Date getCoursesEndTime() {
+		return coursesEndTime;
+	}
+
+	public void setCoursesEndTime(Date coursesEndTime) {
+		this.coursesEndTime = coursesEndTime;
+	}
+
+	public Integer getApplyToStudentType() {
+		return applyToStudentType;
+	}
+
+	public void setApplyToStudentType(Integer applyToStudentType) {
+		this.applyToStudentType = applyToStudentType;
+	}
+
+	public Integer getMaxBuyNum() {
+		return maxBuyNum;
+	}
+
+	public void setMaxBuyNum(Integer maxBuyNum) {
+		this.maxBuyNum = maxBuyNum;
+	}
+
+	public Integer getCourseArrangingType() {
+		return courseArrangingType;
+	}
+
+	public void setCourseArrangingType(Integer courseArrangingType) {
+		this.courseArrangingType = courseArrangingType;
+	}
+
+	public String getCourseType() {
+		return courseType;
+	}
+
+	public void setCourseType(String courseType) {
+		this.courseType = courseType;
+	}
+
+	public Integer getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(Integer categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	public Integer getSingleCourseTime() {
+		return singleCourseTime;
+	}
+
+	public void setSingleCourseTime(Integer singleCourseTime) {
+		this.singleCourseTime = singleCourseTime;
+	}
+
+	public Integer getMinCourseNum() {
+		return minCourseNum;
+	}
+
+	public void setMinCourseNum(Integer minCourseNum) {
+		this.minCourseNum = minCourseNum;
+	}
+
+	public Integer getMaxCourseNum() {
+		return maxCourseNum;
+	}
+
+	public void setMaxCourseNum(Integer maxCourseNum) {
+		this.maxCourseNum = maxCourseNum;
+	}
+
+	public BigDecimal getDiscount() {
+		return discount;
+	}
+
+	public void setDiscount(BigDecimal discount) {
+		this.discount = discount;
+	}
+
+	public Integer getFullMinusCourseTimes() {
+		return fullMinusCourseTimes;
+	}
+
+	public void setFullMinusCourseTimes(Integer fullMinusCourseTimes) {
+		this.fullMinusCourseTimes = fullMinusCourseTimes;
+	}
+
+	public String getGiveCourseType() {
+		return giveCourseType;
+	}
+
+	public void setGiveCourseType(String giveCourseType) {
+		this.giveCourseType = giveCourseType;
+	}
+
+	public Integer getGiveCategoryId() {
+		return giveCategoryId;
+	}
+
+	public void setGiveCategoryId(Integer giveCategoryId) {
+		this.giveCategoryId = giveCategoryId;
+	}
+
+	public Integer getGiveCourseNum() {
+		return giveCourseNum;
+	}
+
+	public void setGiveCourseNum(Integer giveCourseNum) {
+		this.giveCourseNum = giveCourseNum;
+	}
+
+	public Integer getMemberRankId() {
+		return memberRankId;
+	}
+
+	public void setMemberRankId(Integer memberRankId) {
+		this.memberRankId = memberRankId;
+	}
+
+	public Integer getMemberTime() {
+		return memberTime;
+	}
+
+	public void setMemberTime(Integer memberTime) {
+		this.memberTime = memberTime;
+	}
+
+	public String getSalarySettlementJson() {
+		return salarySettlementJson;
+	}
+
+	public void setSalarySettlementJson(String salarySettlementJson) {
+		this.salarySettlementJson = salarySettlementJson;
+	}
+
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityUserMapper.java

@@ -0,0 +1,239 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 对应数据库表(activity_user_mapper):
+ */
+public class ActivityUserMapper {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer activityId;
+	
+	/**  */
+	private Integer userId;
+
+	/**  */
+	private Integer teacherId;
+	
+	/** vip课排课标记0没有排课资格1未排课2已排课 */
+	private Integer vipFlag = 0;
+	
+	/**  */
+	private Integer giveVipFlag = 0;
+	
+	/**  */
+	private Integer practiceFlag = 0;
+	
+	/**  */
+	private Integer givePracticeFlag = 0;
+
+	/**  */
+	private Integer memberFlag = 0;
+
+	/**  */
+	private Integer giveMemberFlag = 0;
+
+	private Long paymentOrderId;
+
+	private Long vipGroupId;
+
+	private Long giveVipGroupId;
+
+	private Long memberOrderId;
+
+	private Long giveMemberOrderId;
+
+	private Long practiceGroupId;
+
+	private Long givePracticeGroupId;
+
+	private Boolean returnFee = false;
+
+	private BigDecimal actualPrice = BigDecimal.ZERO;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	public BigDecimal getActualPrice() {
+		return actualPrice;
+	}
+
+	public void setActualPrice(BigDecimal actualPrice) {
+		this.actualPrice = actualPrice;
+	}
+
+	public Integer getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(Integer teacherId) {
+		this.teacherId = teacherId;
+	}
+
+	public Long getMemberOrderId() {
+		return memberOrderId;
+	}
+
+	public void setMemberOrderId(Long memberOrderId) {
+		this.memberOrderId = memberOrderId;
+	}
+
+	public Long getGiveMemberOrderId() {
+		return giveMemberOrderId;
+	}
+
+	public void setGiveMemberOrderId(Long giveMemberOrderId) {
+		this.giveMemberOrderId = giveMemberOrderId;
+	}
+
+	public Integer getMemberFlag() {
+		return memberFlag;
+	}
+
+	public void setMemberFlag(Integer memberFlag) {
+		this.memberFlag = memberFlag;
+	}
+
+	public Integer getGiveMemberFlag() {
+		return giveMemberFlag;
+	}
+
+	public void setGiveMemberFlag(Integer giveMemberFlag) {
+		this.giveMemberFlag = giveMemberFlag;
+	}
+
+	public Boolean getReturnFee() {
+		return returnFee;
+	}
+
+	public void setReturnFee(Boolean returnFee) {
+		this.returnFee = returnFee;
+	}
+
+	public Long getVipGroupId() {
+		return vipGroupId;
+	}
+
+	public void setVipGroupId(Long vipGroupId) {
+		this.vipGroupId = vipGroupId;
+	}
+
+	public Long getGiveVipGroupId() {
+		return giveVipGroupId;
+	}
+
+	public void setGiveVipGroupId(Long giveVipGroupId) {
+		this.giveVipGroupId = giveVipGroupId;
+	}
+
+	public Long getPracticeGroupId() {
+		return practiceGroupId;
+	}
+
+	public void setPracticeGroupId(Long practiceGroupId) {
+		this.practiceGroupId = practiceGroupId;
+	}
+
+	public Long getGivePracticeGroupId() {
+		return givePracticeGroupId;
+	}
+
+	public void setGivePracticeGroupId(Long givePracticeGroupId) {
+		this.givePracticeGroupId = givePracticeGroupId;
+	}
+
+	public Long getPaymentOrderId() {
+		return paymentOrderId;
+	}
+
+	public void setPaymentOrderId(Long paymentOrderId) {
+		this.paymentOrderId = paymentOrderId;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setActivityId(Integer activityId){
+		this.activityId = activityId;
+	}
+	
+	public Integer getActivityId(){
+		return this.activityId;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setVipFlag(Integer vipFlag){
+		this.vipFlag = vipFlag;
+	}
+	
+	public Integer getVipFlag(){
+		return this.vipFlag;
+	}
+			
+	public void setGiveVipFlag(Integer giveVipFlag){
+		this.giveVipFlag = giveVipFlag;
+	}
+	
+	public Integer getGiveVipFlag(){
+		return this.giveVipFlag;
+	}
+			
+	public void setPracticeFlag(Integer practiceFlag){
+		this.practiceFlag = practiceFlag;
+	}
+	
+	public Integer getPracticeFlag(){
+		return this.practiceFlag;
+	}
+			
+	public void setGivePracticeFlag(Integer givePracticeFlag){
+		this.givePracticeFlag = givePracticeFlag;
+	}
+	
+	public Integer getGivePracticeFlag(){
+		return this.givePracticeFlag;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -205,6 +205,9 @@ public class ClassGroup {
 	}
 
 	public void setStudentNum(Integer studentNum) {
+		if(studentNum == null || studentNum < 0){
+			studentNum = 0;
+		}
 		this.studentNum = studentNum;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeInfo.java

@@ -134,6 +134,17 @@ public class EmployeeInfo {
 	/**  */
 	private java.util.Date updateTime;
 
+	@ApiModelProperty(value = "是否覆盖", required = false)
+	private Boolean isCover = false;
+
+	public Boolean getCover() {
+		return isCover;
+	}
+
+	public void setCover(Boolean cover) {
+		isCover = cover;
+	}
+
 	public String getHrbpName() {
 		return hrbpName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawCount.java

@@ -14,6 +14,16 @@ public class LuckDrawCount {
 
 	private Date modifyOn;
 
+	private Integer groupId;
+
+	public Integer getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+
 	public Long getUserId() {
 		return userId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MarketActivity.java

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.util.Date;
+
+/**
+ * 对应数据库表(market_activity):
+ */
+public class MarketActivity {
+
+	private Integer id;
+
+	private String name;
+
+	private String activityIds;
+
+	private Date createTime;
+
+	private Date updateTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getActivityIds() {
+		return activityIds;
+	}
+
+	public void setActivityIds(String activityIds) {
+		this.activityIds = activityIds;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicEnlightenmentQuestionnaire.java

@@ -0,0 +1,204 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
+
+/**
+ * 对应数据库表(music_enlightenment_questionnaire):
+ */
+public class MusicEnlightenmentQuestionnaire {
+
+	/**  */
+	private Long id;
+	
+	/** 乐团编号 */
+	@ApiModelProperty("乐团编号")
+	private String musicGroupId;
+	
+	/**  */
+	@ApiModelProperty("用户编号")
+	private Integer userId;
+	
+	/**  */
+	@ApiModelProperty("用户名")
+	private String userName;
+	
+	/**  */
+	@ApiModelProperty("联系方式")
+	private String phone;
+	
+	/** 年级 */
+	@ApiModelProperty("年级")
+	private String currentGrade;
+	
+	/** 年级数字 */
+	@ApiModelProperty("年级数字")
+	private Integer currentGradeNum;
+	
+	/** 班级 */
+	@ApiModelProperty("班级")
+	private String currentClass;
+	
+	/** 教师推荐专业 */
+	@ApiModelProperty("教师推荐专业")
+	private Integer teacherRecommandSubjectId;
+
+	@ApiModelProperty("专业名称")
+	private String subjectName;
+	
+	/** 是否正在学习某乐器 */
+	@ApiModelProperty("是否正在学习某乐器")
+	private Boolean musicalInstrumentsLearning = false;
+	
+	/** 学习乐器名称 */
+	@ApiModelProperty("学习乐器名称")
+	private String musicalInstrumentsName;
+	
+	/** 是否参加家长会 */
+	@ApiModelProperty("是否参加家长会")
+	private Boolean joinParentMeeting = false;
+	
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remark;
+
+	private Date createTime;
+
+	private Date updateTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getCurrentGrade() {
+		return currentGrade;
+	}
+
+	public void setCurrentGrade(String currentGrade) {
+		this.currentGrade = currentGrade;
+	}
+
+	public Integer getCurrentGradeNum() {
+		return currentGradeNum;
+	}
+
+	public void setCurrentGradeNum(Integer currentGradeNum) {
+		this.currentGradeNum = currentGradeNum;
+	}
+
+	public String getCurrentClass() {
+		return currentClass;
+	}
+
+	public void setCurrentClass(String currentClass) {
+		this.currentClass = currentClass;
+	}
+
+	public Integer getTeacherRecommandSubjectId() {
+		return teacherRecommandSubjectId;
+	}
+
+	public void setTeacherRecommandSubjectId(Integer teacherRecommandSubjectId) {
+		this.teacherRecommandSubjectId = teacherRecommandSubjectId;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
+	public Boolean getMusicalInstrumentsLearning() {
+		return musicalInstrumentsLearning;
+	}
+
+	public void setMusicalInstrumentsLearning(Boolean musicalInstrumentsLearning) {
+		this.musicalInstrumentsLearning = musicalInstrumentsLearning;
+	}
+
+	public String getMusicalInstrumentsName() {
+		return musicalInstrumentsName;
+	}
+
+	public void setMusicalInstrumentsName(String musicalInstrumentsName) {
+		this.musicalInstrumentsName = musicalInstrumentsName;
+	}
+
+	public Boolean getJoinParentMeeting() {
+		return joinParentMeeting;
+	}
+
+	public void setJoinParentMeeting(Boolean joinParentMeeting) {
+		this.joinParentMeeting = joinParentMeeting;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -192,6 +192,17 @@ public class MusicGroup {
 	@ApiModelProperty(value = "作业是否发送消息",required = true)
 	private Integer homeworkPushFlag = 1;
 
+	@ApiModelProperty(value = "有乐保的人数",required = true)
+	private Integer hasInstrumentNum;
+
+	public Integer getHasInstrumentNum() {
+		return hasInstrumentNum;
+	}
+
+	public void setHasInstrumentNum(Integer hasInstrumentNum) {
+		this.hasInstrumentNum = hasInstrumentNum;
+	}
+
 	public Integer getHomeworkPushFlag() {
 		return homeworkPushFlag;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupReturnFeeDto.java

@@ -4,25 +4,25 @@ import java.math.BigDecimal;
 
 public class MusicGroupReturnFeeDto {
 
-	private Boolean isReturnCourseFee;
+	private Boolean isReturnCourseFee = false;
 	
-	private BigDecimal courseFee;
+	private BigDecimal courseFee = BigDecimal.ZERO;
 	
-	private Boolean isReturnMemberFee;
+	private Boolean isReturnMemberFee = false;
 	
-	private BigDecimal memberFee;
+	private BigDecimal memberFee = BigDecimal.ZERO;
 	
-	private Boolean isReturnMusicalFee;
+	private Boolean isReturnMusicalFee = false;
 	
-	private BigDecimal musicalFee;
+	private BigDecimal musicalFee = BigDecimal.ZERO;
 	
-	private Boolean isReturnAccessoriesFee;
+	private Boolean isReturnAccessoriesFee = false;
 	
-	private BigDecimal accessoriesFee;
+	private BigDecimal accessoriesFee = BigDecimal.ZERO;
 	
-	private Boolean isReturnMaintenanceFee;
+	private Boolean isReturnMaintenanceFee = false;
 	
-	private BigDecimal maintenanceFee;
+	private BigDecimal maintenanceFee = BigDecimal.ZERO;
 
 	public Boolean getIsReturnCourseFee() {
 		return isReturnCourseFee;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicMemberDto.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -29,6 +31,17 @@ public class MusicMemberDto {
 
 	private Boolean hasNoStartCloudTeacher;
 
+	@ApiModelProperty(value = "0已过期，1即将过期,2待生效", required = false)
+	private Integer hasMember;
+
+	public Integer getHasMember() {
+		return hasMember;
+	}
+
+	public void setHasMember(Integer hasMember) {
+		this.hasMember = hasMember;
+	}
+
 	public Boolean getHasNoStartCloudTeacher() {
 		return hasNoStartCloudTeacher;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/PracticeGroup.java

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PracticeGroupType;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -21,10 +24,11 @@ public class PracticeGroup {
 	private Integer subjectId;
 	
 	private PracticeGroupType type;
-	
-	/**  */
+
+	@ApiModelProperty(value = "教师ID",required = false)
 	private Integer userId;
 
+	@ApiModelProperty(value = "学员ID",required = false)
 	private Integer studentId;
 	
 	/**  */
@@ -62,10 +66,97 @@ public class PracticeGroup {
 
 	private GroupStatusEnum groupStatus;
 
+	@ApiModelProperty(value = "审批状态",required = false)
+	private AuditStatusEnum auditStatus;
+
 	private Long beRenewGroupId;
 
 	private Integer educationalTeacherId;
 
+	private Integer vipGroupActivityId;
+
+	@ApiModelProperty(value = "课程规划",required = false)
+	private String courseScheduleJson;
+
+	@ApiModelProperty(value = "报名截止时间",required = false)
+	private Date paymentExpireDate;
+
+	@ApiModelProperty(value = "报名开始时间",required = false)
+	private Date registrationStartTime;
+
+	@ApiModelProperty(value = "课时总数")
+	private Integer allCourseNum;
+
+	@ApiModelProperty(value = "学员购买的活动已课程关联")
+	private Integer activityUserMapperId;
+
+	@ApiModelProperty(value = "总金额",required = false)
+	private BigDecimal totalPrice = BigDecimal.ZERO;
+
+	public Integer getActivityUserMapperId() {
+		return activityUserMapperId;
+	}
+
+	public void setActivityUserMapperId(Integer activityUserMapperId) {
+		this.activityUserMapperId = activityUserMapperId;
+	}
+
+	public BigDecimal getTotalPrice() {
+		return totalPrice;
+	}
+
+	public void setTotalPrice(BigDecimal totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+
+	public Integer getAllCourseNum() {
+		return allCourseNum;
+	}
+
+	public void setAllCourseNum(Integer allCourseNum) {
+		this.allCourseNum = allCourseNum;
+	}
+
+	public Date getPaymentExpireDate() {
+		return paymentExpireDate;
+	}
+
+	public void setPaymentExpireDate(Date paymentExpireDate) {
+		this.paymentExpireDate = paymentExpireDate;
+	}
+
+	public Date getRegistrationStartTime() {
+		return registrationStartTime;
+	}
+
+	public void setRegistrationStartTime(Date registrationStartTime) {
+		this.registrationStartTime = registrationStartTime;
+	}
+
+	public String getCourseScheduleJson() {
+		return courseScheduleJson;
+	}
+
+	public void setCourseScheduleJson(String courseScheduleJson) {
+		this.courseScheduleJson = courseScheduleJson;
+	}
+
+	public AuditStatusEnum getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(AuditStatusEnum auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
+	public Integer getVipGroupActivityId() {
+		return vipGroupActivityId;
+	}
+
+	public void setVipGroupActivityId(Integer vipGroupActivityId) {
+		this.vipGroupActivityId = vipGroupActivityId;
+	}
+
 	public String getCoursesStartDates() {
 		return coursesStartDates;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/PracticeGroupSellPrice.java

@@ -43,10 +43,20 @@ public class PracticeGroupSellPrice {
 
     private BigDecimal comeOnPackagePrice;
 
+    private BigDecimal singleClassMinutesPrice;
+
     private Date createTime;
 
     private Date updateTime;
 
+    public BigDecimal getSingleClassMinutesPrice() {
+        return singleClassMinutesPrice;
+    }
+
+    public void setSingleClassMinutesPrice(BigDecimal singleClassMinutesPrice) {
+        this.singleClassMinutesPrice = singleClassMinutesPrice;
+    }
+
     public BigDecimal getOnceQuartActivityPrice() {
         return onceQuartActivityPrice;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SellOrder.java

@@ -206,6 +206,17 @@ public class SellOrder {
     @ApiModelProperty(value="优惠券减免")
     private BigDecimal couponRemitAmount = BigDecimal.ZERO;
 
+    @ApiModelProperty(value="订单金额")
+    private BigDecimal orderAmount = BigDecimal.ZERO;
+
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
     public BigDecimal getCouponRemitAmount() {
         return couponRemitAmount;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentOrder.java

@@ -128,6 +128,26 @@ public class StudentPaymentOrder {
 	@ApiModelProperty(value = "优惠券减免总额",required = true)
 	private BigDecimal couponRemitFee = BigDecimal.ZERO;
 
+	private String activityId;
+
+	private Integer activityBuyNum = 0;
+
+	public Integer getActivityBuyNum() {
+		return activityBuyNum;
+	}
+
+	public void setActivityBuyNum(Integer activityBuyNum) {
+		this.activityBuyNum = activityBuyNum;
+	}
+
+	public String getActivityId() {
+		return activityId;
+	}
+
+	public void setActivityId(String activityId) {
+		this.activityId = activityId;
+	}
+
 	public String getCouponCodeId() {
 		return couponCodeId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentRouteOrder.java

@@ -59,6 +59,8 @@ public class StudentPaymentRouteOrder {
     
     private BigDecimal serviceAmount;
     
+    private BigDecimal serviceFee;
+    
     private String memo;
     
     private String goodsIds;
@@ -201,6 +203,14 @@ public class StudentPaymentRouteOrder {
 		this.serviceAmount = serviceAmount;
 	}
 
+	public BigDecimal getServiceFee() {
+		return serviceFee;
+	}
+
+	public void setServiceFee(BigDecimal serviceFee) {
+		this.serviceFee = serviceFee;
+	}
+
 	public String getMemo() {
 		return memo;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCashAccountDetail.java

@@ -90,6 +90,17 @@ public class SysUserCashAccountDetail {
 
 	private String organName;
 
+	/** vip课程后台添加学员时关联的id */
+	private Long groupId;
+
+	public Long getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Long groupId) {
+		this.groupId = groupId;
+	}
+
 	public String getOrganName() {
 		return organName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCashAccountLog.java

@@ -0,0 +1,179 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.ReturnFeeEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 对应数据库表(sys_user_cash_account_log):
+ */
+public class SysUserCashAccountLog {
+
+	@ApiModelProperty(value = "id")
+	private Integer id;
+
+	@ApiModelProperty(value = "用户编号")
+	private Integer userId;
+
+	@ApiModelProperty(value = "学员姓名")
+	private String username;
+
+	@ApiModelProperty(value = "分部")
+	private Integer organId;
+
+	@ApiModelProperty(value = "分部")
+	private String organName;
+
+	@ApiModelProperty(value = "课程组类型")
+	private GroupType groupType;
+
+	@ApiModelProperty(value = "课程组编号")
+	private String groupId;
+
+	@ApiModelProperty(value = "课程组名称")
+	private String groupName;
+
+	@ApiModelProperty(value = "退费金额")
+	private BigDecimal amount;
+
+	@ApiModelProperty(value = "退费类型")
+	private ReturnFeeEnum returnFeeType;
+
+	@ApiModelProperty(value = "打款时间")
+	private Date payTime;
+
+	@ApiModelProperty(value = "交易流水号")
+	private String transNo;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "备注")
+	private String comment;
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
+	public GroupType getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(GroupType groupType) {
+		this.groupType = groupType;
+	}
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public ReturnFeeEnum getReturnFeeType() {
+		return returnFeeType;
+	}
+
+	public void setReturnFeeType(ReturnFeeEnum returnFeeType) {
+		this.returnFeeType = returnFeeType;
+	}
+
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+
+	public String getTransNo() {
+		return transNo;
+	}
+
+	public void setTransNo(String transNo) {
+		this.transNo = transNo;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCoursesAccountDetail.java

@@ -67,6 +67,17 @@ public class SysUserCoursesAccountDetail {
 
 	private String organName;
 
+	/** vip课程后台添加学员时关联的id */
+	private Long groupId;
+
+	public Long getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Long groupId) {
+		this.groupId = groupId;
+	}
+
 	public String getOrganName() {
 		return organName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultVipGroupSalary.java

@@ -25,9 +25,7 @@ public class TeacherDefaultVipGroupSalary {
 
 	private Boolean musicTheory;
 	
-	/** 线上课薪酬 */
-	@ApiModelProperty(value = "线上课薪酬", required = false)
-	private java.math.BigDecimal onlineClassesSalary;
+//	private java.math.BigDecimal onlineClassesSalary;
 	
 	/** 线下课薪酬 */
 	@ApiModelProperty(value = "线下课薪酬", required = false)
@@ -71,14 +69,6 @@ public class TeacherDefaultVipGroupSalary {
 		return this.vipGroupCategoryId;
 	}
 			
-	public void setOnlineClassesSalary(java.math.BigDecimal onlineClassesSalary){
-		this.onlineClassesSalary = onlineClassesSalary;
-	}
-	
-	public java.math.BigDecimal getOnlineClassesSalary(){
-		return this.onlineClassesSalary;
-	}
-			
 	public void setOfflineClassesSalary(java.math.BigDecimal offlineClassesSalary){
 		this.offlineClassesSalary = offlineClassesSalary;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -1,8 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.VipGroupActivityTypeEnum;
+import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static com.ym.mec.biz.dal.enums.PeriodEnum.DAY;
+import static com.ym.mec.biz.dal.enums.PeriodEnum.MONTH;
 
 /**
  * 对应数据库表(vip_group_activity):
@@ -15,7 +20,16 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "活动名称")
 	private String name;
 
-	@ApiModelProperty(value = "活动描述\n")
+	@ApiModelProperty(value = "活动类型，课程或者会员,0课程，1会员")
+	private Integer activityType = 0;
+
+	@ApiModelProperty(value = "单节课时长")
+	private Integer singleCourseTime = 45;
+
+	@ApiModelProperty(value = "单节课时长")
+	private Integer giveSingleCourseTime = 45;
+
+	@ApiModelProperty(value = "活动描述")
 	private String description;
 
 	@ApiModelProperty(value = "课程形式")
@@ -36,26 +50,50 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "可排课截至时间")
 	private java.util.Date coursesEndTime;
 
-	@ApiModelProperty(value = "活动类型（基础活动、折扣、赠送课时）")
-	private VipGroupActivityTypeEnum type;
+//	@ApiModelProperty(value = "活动类型（基础活动、折扣、赠送课时）")
+//	private VipGroupActivityTypeEnum type;
+
+	@ApiModelProperty(value = "折扣）")
+	private BigDecimal discount = new BigDecimal(100);
+
+	@ApiModelProperty(value = "满赠达标课时:-1：没有满赠）")
+	private Integer fullMinusCourseTimes = -1;
+
+	@ApiModelProperty(value = "赠课类型")
+	private String giveCourseType;
+
+	@ApiModelProperty(value = "课类型")
+	private String courseType;
+
+	@ApiModelProperty(value = "赠课形式")
+	private String giveCategoryId;
+
+	@ApiModelProperty(value = "赠课形式")
+	private String giveCategoryName;
+
+	@ApiModelProperty(value = "人数")
+	private Integer giveCategoryNum;
 
-	@ApiModelProperty(value = "活动变量1")
-	private String attribute1;
+	@ApiModelProperty(value = "赠课数量")
+	private Integer giveCourseNum = 0;
 
-	@ApiModelProperty(value = "活动变量2")
-	private String attribute2;
+	@ApiModelProperty(value = "会员编号")
+	private Integer memberRankId = 1;
 
-	@ApiModelProperty(value = "活动变量3")
-	private String attribute3;
+	@ApiModelProperty(value = "会员时长")
+	private Integer memberTime = 0;
 
-	@ApiModelProperty(value = "薪水只读标识（1-只读 0-可写）")
-	private String salaryReadonlyFlag;
+	@ApiModelProperty(value = "赠送会员编号")
+	private Integer giveMemberRankId = 1;
 
-	@ApiModelProperty(value = "单节课程费用只读标识")
-	private String paymentReadonlyFlag;
+	@ApiModelProperty(value = "赠送会员时长")
+	private Integer giveMemberTime = 0;
 
-	@ApiModelProperty(value = "赠送课时支付薪水标识（1-计课酬  0-不计课酬）")
-	private String giveClassPaySalaryFlag;
+	@ApiModelProperty(value = "赠送抽奖次数")
+	private Integer givePrizeNum = 0;
+
+	@ApiModelProperty(value = "是否充值到余额")
+	private boolean isPayToBalance = true;
 
 	@ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;
@@ -68,249 +106,337 @@ public class VipGroupActivity {
 
 	private String vipGroupCategoryNames;
 
+	@ApiModelProperty(value = "学员数量")
+	private Integer vipGroupCategoryNum;
+
 	@ApiModelProperty(value = "是否删除")
 	private Boolean delFlag = false;
 
 	@ApiModelProperty(value = "是否可用")
-	private Integer enable;
+	private Boolean enable = false;
 
 	@ApiModelProperty(value = "线上课是否参与梯度奖励")
-	private Integer onlineClassJoinGradientRewards;
+	private Integer onlineClassJoinGradientRewards = 0;
 
 	@ApiModelProperty(value = "线下课是否参与梯度奖励")
-	private Integer offlineClassJoinGradientRewards;
+	private Integer offlineClassJoinGradientRewards = 0;
 
 	@ApiModelProperty(value = "最少课程数量")
-	private Integer minCourseNum;
+	private Integer minCourseNum = -1;
 
 	@ApiModelProperty(value = "最多可排课数量")
-	private Integer maxCourseNum;
+	private Integer maxCourseNum = -1;
 
-	@ApiModelProperty(value = "每位学员最大使用次数")
-	private Integer studentMaxUsedTimes;
+	@ApiModelProperty(value = "每位学员最大购买次数")
+	private Integer studentMaxUsedTimes = -1;
 
-	@ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户")
-	private Integer  applyToStudentType = -1;
+	@ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户，2会员，3非会员")
+	private String applyToStudentType;
 
-	@ApiModelProperty(value = "课程可调整方向：0双向可调，1禁止线上到线下，2禁止线下到线上，3双向不可调")
-	private Integer allowOnlineToOffline = 0;
+	@ApiModelProperty(value = "课程可调整方向：1不限制，0线上不可到线下，2禁止线下到线上，3双向不可调")
+	private Integer allowOnlineToOffline = 1;
 
-	public Integer getAllowOnlineToOffline() {
-		return allowOnlineToOffline;
-	}
+	@ApiModelProperty(value = "赠送课程可调整方向：1不限制，0线上不可到线下，2禁止线下到线上，3双向不可调")
+	private Integer giveAllowOnlineToOffline = 1;
 
-	public void setAllowOnlineToOffline(Integer allowOnlineToOffline) {
-		this.allowOnlineToOffline = allowOnlineToOffline;
+	@ApiModelProperty(value = "-1：所有；0：线上；1：线下")
+	private Integer teachMode = -1;
+
+	@ApiModelProperty(value = "-1：所有；0：线上；1：线下")
+	private Integer giveTeachMode = -1;
+
+	private PeriodEnum periodEnum = MONTH;
+
+	private PeriodEnum givePeriodEnum = DAY;
+
+	private String status = "DRAFT";
+
+	@ApiModelProperty(value = "活动价格")
+	private BigDecimal marketPrice = BigDecimal.ZERO;
+
+	//用于标记活动类型，购买的活动类型1、1v1 20节，2、1v1 40节，3、1v2 20节，4、1v2 40节，5、乐理课
+	private Integer code;
+
+	public Integer getCode() {
+		return code;
 	}
 
-	public Integer getApplyToStudentType() {
-		return applyToStudentType;
+	public void setCode(Integer code) {
+		this.code = code;
 	}
 
-	public void setApplyToStudentType(Integer applyToStudentType) {
-		this.applyToStudentType = applyToStudentType;
+	public Integer getGivePrizeNum() {
+		return givePrizeNum;
 	}
 
-	public Integer getMinCourseNum() {
-		return minCourseNum;
+	public void setGivePrizeNum(Integer givePrizeNum) {
+		this.givePrizeNum = givePrizeNum;
 	}
 
-	public void setMinCourseNum(Integer minCourseNum) {
-		this.minCourseNum = minCourseNum;
+	public Integer getGiveAllowOnlineToOffline() {
+		return giveAllowOnlineToOffline;
 	}
 
-	public Integer getMaxCourseNum() {
-		return maxCourseNum;
+	public void setGiveAllowOnlineToOffline(Integer giveAllowOnlineToOffline) {
+		this.giveAllowOnlineToOffline = giveAllowOnlineToOffline;
 	}
 
-	public void setMaxCourseNum(Integer maxCourseNum) {
-		this.maxCourseNum = maxCourseNum;
+	public BigDecimal getMarketPrice() {
+		return marketPrice;
 	}
 
-	public Integer getOnlineClassJoinGradientRewards() {
-		return onlineClassJoinGradientRewards;
+	public void setMarketPrice(BigDecimal marketPrice) {
+		this.marketPrice = marketPrice;
 	}
 
-	public void setOnlineClassJoinGradientRewards(Integer onlineClassJoinGradientRewards) {
-		this.onlineClassJoinGradientRewards = onlineClassJoinGradientRewards;
+	public Integer getGiveCategoryNum() {
+		return giveCategoryNum;
 	}
 
-	public Integer getOfflineClassJoinGradientRewards() {
-		return offlineClassJoinGradientRewards;
+	public void setGiveCategoryNum(Integer giveCategoryNum) {
+		this.giveCategoryNum = giveCategoryNum;
 	}
 
-	public void setOfflineClassJoinGradientRewards(Integer offlineClassJoinGradientRewards) {
-		this.offlineClassJoinGradientRewards = offlineClassJoinGradientRewards;
+	public Integer getVipGroupCategoryNum() {
+		return vipGroupCategoryNum;
 	}
 
-	public String getPaymentReadonlyFlag() {
-		return paymentReadonlyFlag;
+	public void setVipGroupCategoryNum(Integer vipGroupCategoryNum) {
+		this.vipGroupCategoryNum = vipGroupCategoryNum;
 	}
 
-	public void setPaymentReadonlyFlag(String paymentReadonlyFlag) {
-		this.paymentReadonlyFlag = paymentReadonlyFlag;
+	public String getGiveCategoryName() {
+		return giveCategoryName;
 	}
 
-	public Integer getEnable() {
-		return enable;
+	public void setGiveCategoryName(String giveCategoryName) {
+		this.giveCategoryName = giveCategoryName;
 	}
 
-	public void setEnable(Integer enable) {
-		this.enable = enable;
+	public String getStatus() {
+		return status;
 	}
 
-	public String getVipGroupCategoryNames() {
-		return vipGroupCategoryNames;
+	public void setStatus(String status) {
+		this.status = status;
 	}
 
-	public void setVipGroupCategoryNames(String vipGroupCategoryNames) {
-		this.vipGroupCategoryNames = vipGroupCategoryNames;
+	public Integer getId() {
+		return id;
 	}
 
-	public void setId(Integer id){
+	public void setId(Integer id) {
 		this.id = id;
 	}
-	
-	public Integer getId(){
-		return this.id;
+
+	public String getName() {
+		return name;
 	}
-			
-	public void setName(String name){
+
+	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getName(){
-		return this.name;
+
+	public Integer getActivityType() {
+		return activityType;
+	}
+
+	public void setActivityType(Integer activityType) {
+		this.activityType = activityType;
+	}
+
+	public Integer getSingleCourseTime() {
+		return singleCourseTime;
+	}
+
+	public void setSingleCourseTime(Integer singleCourseTime) {
+		this.singleCourseTime = singleCourseTime;
 	}
-			
-	public void setDescription(String description){
+
+	public Integer getGiveSingleCourseTime() {
+		return giveSingleCourseTime;
+	}
+
+	public void setGiveSingleCourseTime(Integer giveSingleCourseTime) {
+		this.giveSingleCourseTime = giveSingleCourseTime;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
 		this.description = description;
 	}
-	
-	public String getDescription(){
-		return this.description;
+
+	public String getVipGroupCategoryIdList() {
+		return vipGroupCategoryIdList;
 	}
-			
-	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList){
+
+	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList) {
 		this.vipGroupCategoryIdList = vipGroupCategoryIdList;
 	}
-	
-	public String getVipGroupCategoryIdList(){
-		return this.vipGroupCategoryIdList;
+
+	public Date getStartTime() {
+		return startTime;
 	}
-			
-	public void setStartTime(java.util.Date startTime){
+
+	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
-	
-	public java.util.Date getStartTime(){
-		return this.startTime;
+
+	public Date getEndTime() {
+		return endTime;
 	}
-			
-	public void setEndTime(java.util.Date endTime){
+
+	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
 	}
-	
-	public java.util.Date getEndTime(){
-		return this.endTime;
+
+	public String getOrganId() {
+		return organId;
 	}
-			
-	public void setOrganId(String organId){
+
+	public void setOrganId(String organId) {
 		this.organId = organId;
 	}
-	
-	public String getOrganId(){
-		return this.organId;
+
+	public Date getCoursesStartTime() {
+		return coursesStartTime;
 	}
-			
-	public void setCoursesStartTime(java.util.Date coursesStartTime){
+
+	public void setCoursesStartTime(Date coursesStartTime) {
 		this.coursesStartTime = coursesStartTime;
 	}
-	
-	public java.util.Date getCoursesStartTime(){
-		return this.coursesStartTime;
+
+	public Date getCoursesEndTime() {
+		return coursesEndTime;
 	}
-			
-	public void setCoursesEndTime(java.util.Date coursesEndTime){
+
+	public void setCoursesEndTime(Date coursesEndTime) {
 		this.coursesEndTime = coursesEndTime;
 	}
-	
-	public java.util.Date getCoursesEndTime(){
-		return this.coursesEndTime;
+
+	public BigDecimal getDiscount() {
+		return discount;
+	}
+
+	public void setDiscount(BigDecimal discount) {
+		this.discount = discount;
+	}
+
+	public Integer getFullMinusCourseTimes() {
+		return fullMinusCourseTimes;
+	}
+
+	public void setFullMinusCourseTimes(Integer fullMinusCourseTimes) {
+		this.fullMinusCourseTimes = fullMinusCourseTimes;
+	}
+
+	public String getGiveCourseType() {
+		return giveCourseType;
+	}
+
+	public void setGiveCourseType(String giveCourseType) {
+		this.giveCourseType = giveCourseType;
+	}
+
+	public String getCourseType() {
+		return courseType;
+	}
+
+	public void setCourseType(String courseType) {
+		this.courseType = courseType;
+	}
+
+	public String getGiveCategoryId() {
+		return giveCategoryId;
+	}
+
+	public void setGiveCategoryId(String giveCategoryId) {
+		this.giveCategoryId = giveCategoryId;
+	}
+
+	public Integer getGiveCourseNum() {
+		return giveCourseNum;
 	}
 
-	public VipGroupActivityTypeEnum getType() {
-		return type;
+	public void setGiveCourseNum(Integer giveCourseNum) {
+		this.giveCourseNum = giveCourseNum;
 	}
 
-	public void setType(VipGroupActivityTypeEnum type) {
-		this.type = type;
+	public Integer getMemberRankId() {
+		return memberRankId;
 	}
 
-	public void setAttribute1(String attribute1){
-		this.attribute1 = attribute1;
+	public void setMemberRankId(Integer memberRankId) {
+		this.memberRankId = memberRankId;
 	}
-	
-	public String getAttribute1(){
-		return this.attribute1;
+
+	public Integer getMemberTime() {
+		return memberTime;
 	}
-			
-	public void setAttribute2(String attribute2){
-		this.attribute2 = attribute2;
+
+	public void setMemberTime(Integer memberTime) {
+		this.memberTime = memberTime;
 	}
-	
-	public String getAttribute2(){
-		return this.attribute2;
+
+	public Integer getGiveMemberRankId() {
+		return giveMemberRankId;
 	}
-			
-	public void setAttribute3(String attribute3){
-		this.attribute3 = attribute3;
+
+	public void setGiveMemberRankId(Integer giveMemberRankId) {
+		this.giveMemberRankId = giveMemberRankId;
 	}
-	
-	public String getAttribute3(){
-		return this.attribute3;
+
+	public Integer getGiveMemberTime() {
+		return giveMemberTime;
 	}
-			
-	public void setSalaryReadonlyFlag(String salaryReadonlyFlag){
-		this.salaryReadonlyFlag = salaryReadonlyFlag;
+
+	public void setGiveMemberTime(Integer giveMemberTime) {
+		this.giveMemberTime = giveMemberTime;
 	}
-	
-	public String getSalaryReadonlyFlag(){
-		return this.salaryReadonlyFlag;
+
+	public boolean isPayToBalance() {
+		return isPayToBalance;
 	}
-			
-	public void setGiveClassPaySalaryFlag(String giveClassPaySalaryFlag){
-		this.giveClassPaySalaryFlag = giveClassPaySalaryFlag;
+
+	public void setPayToBalance(boolean payToBalance) {
+		isPayToBalance = payToBalance;
 	}
-	
-	public String getGiveClassPaySalaryFlag(){
-		return this.giveClassPaySalaryFlag;
+
+	public Date getCreateTime() {
+		return createTime;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
+
+	public Date getUpdateTime() {
+		return updateTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
+
+	public String getSalarySettlementJson() {
+		return salarySettlementJson;
 	}
-			
-	public void setSalarySettlementJson(String salarySettlementJson){
+
+	public void setSalarySettlementJson(String salarySettlementJson) {
 		this.salarySettlementJson = salarySettlementJson;
 	}
-	
-	public String getSalarySettlementJson(){
-		return this.salarySettlementJson;
+
+	public String getVipGroupCategoryNames() {
+		return vipGroupCategoryNames;
 	}
-			
+
+	public void setVipGroupCategoryNames(String vipGroupCategoryNames) {
+		this.vipGroupCategoryNames = vipGroupCategoryNames;
+	}
+
 	public Boolean getDelFlag() {
 		return delFlag;
 	}
@@ -319,6 +445,46 @@ public class VipGroupActivity {
 		this.delFlag = delFlag;
 	}
 
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+	public Integer getOnlineClassJoinGradientRewards() {
+		return onlineClassJoinGradientRewards;
+	}
+
+	public void setOnlineClassJoinGradientRewards(Integer onlineClassJoinGradientRewards) {
+		this.onlineClassJoinGradientRewards = onlineClassJoinGradientRewards;
+	}
+
+	public Integer getOfflineClassJoinGradientRewards() {
+		return offlineClassJoinGradientRewards;
+	}
+
+	public void setOfflineClassJoinGradientRewards(Integer offlineClassJoinGradientRewards) {
+		this.offlineClassJoinGradientRewards = offlineClassJoinGradientRewards;
+	}
+
+	public Integer getMinCourseNum() {
+		return minCourseNum;
+	}
+
+	public void setMinCourseNum(Integer minCourseNum) {
+		this.minCourseNum = minCourseNum;
+	}
+
+	public Integer getMaxCourseNum() {
+		return maxCourseNum;
+	}
+
+	public void setMaxCourseNum(Integer maxCourseNum) {
+		this.maxCourseNum = maxCourseNum;
+	}
+
 	public Integer getStudentMaxUsedTimes() {
 		return studentMaxUsedTimes;
 	}
@@ -327,9 +493,51 @@ public class VipGroupActivity {
 		this.studentMaxUsedTimes = studentMaxUsedTimes;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
+	public String getApplyToStudentType() {
+		return applyToStudentType;
+	}
+
+	public void setApplyToStudentType(String applyToStudentType) {
+		this.applyToStudentType = applyToStudentType;
+	}
+
+	public Integer getAllowOnlineToOffline() {
+		return allowOnlineToOffline;
+	}
+
+	public void setAllowOnlineToOffline(Integer allowOnlineToOffline) {
+		this.allowOnlineToOffline = allowOnlineToOffline;
+	}
+
+	public Integer getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(Integer teachMode) {
+		this.teachMode = teachMode;
 	}
 
-}
+	public Integer getGiveTeachMode() {
+		return giveTeachMode;
+	}
+
+	public void setGiveTeachMode(Integer giveTeachMode) {
+		this.giveTeachMode = giveTeachMode;
+	}
+
+	public PeriodEnum getPeriodEnum() {
+		return periodEnum;
+	}
+
+	public void setPeriodEnum(PeriodEnum periodEnum) {
+		this.periodEnum = periodEnum;
+	}
+
+	public PeriodEnum getGivePeriodEnum() {
+		return givePeriodEnum;
+	}
+
+	public void setGivePeriodEnum(PeriodEnum givePeriodEnum) {
+		this.givePeriodEnum = givePeriodEnum;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportTypeEnum.java

@@ -5,7 +5,8 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum ExportTypeEnum implements BaseEnum<Integer, ExportTypeEnum> {
 	ORDER(1, "订单列表"),
 	COURSE_SCHEDULE(3, "课表列表"),
-	ROUTE_ORDER(2, "财务管理");
+	ROUTE_ORDER(2, "财务管理"),
+	STUDENT_VIP_PRACTICE(4, "学员小课记录");
 
 	private Integer code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupType.java

@@ -16,6 +16,7 @@ public enum GroupType implements BaseEnum<String, GroupType> {
 	MAINTENANCE("乐保"),
 	REPLACEMENT("乐器置换"),
 	DEGREE("6.1考级活动"),
+	ACTIVITY("活动购买"),
 	MEMBER("购买会员");
 
 	private String desc;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/HeardLevelEnum.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum HeardLevelEnum implements BaseEnum<String, HeardLevelEnum> {
-    BEGINNER("BEGINNER","入门级", 0.1f, 0.7f, 1.5f),
+	BEGINNER("BEGINNER","入门级", 0.1f, 0.7f, 1.5f),
     ADVANCED("ADVANCED","进阶级", 1, 0.9f, 1.3f),
     PERFORMER("PERFORMER","大师级", 3, 0.93f, 1.1f);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/JobNatureEnum.java

@@ -6,7 +6,8 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum JobNatureEnum implements BaseEnum<String,JobNatureEnum> {
     PART_TIME("PART_TIME","兼职"),
     FULL_TIME("FULL_TIME","全职"),
-    TEMPORARY("TEMPORARY","零时工");
+    TEMPORARY("TEMPORARY","零时工"),
+    LABOUR("LABOUR","劳务");
 
     private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -169,6 +169,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     //    BACKSTAGE_MUSIC_GROUP_CLOSE("BACKSTAGE_MUSIC_GROUP_CLOSE", "乐团结束"),
 //    BACKSTAGE_VIP_COURSE_APPLY("BACKSTAGE_VIP_COURSE_APPLY", "VIP课申请"),
     BACKSTAGE_TEACHER_APPLY_VIP("BACKSTAGE_TEACHER_APPLY_VIP", "VIP课申请"),
+    BACKSTAGE_TEACHER_APPLY_PRACTICE("BACKSTAGE_TEACHER_APPLY_PRACTICE", "网管课申请"),
     //    BACKSTAGE_VIP_COURSE_STOP("BACKSTAGE_VIP_COURSE_STOP", "VIP课停止"),
 //    BACKSTAGE_TEACHER_FREEZE("BACKSTAGE_TEACHER_FREEZE", "老师冻结"),
 //    BACKSTAGE_TEACHER_POSITIVE("BACKSTAGE_TEACHER_POSITIVE", "老师转正"),

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -17,6 +17,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	COURSE_GROUP_BUY("COURSE_GROUP_BUY","对外课程购买"),
 	LUCK("LUCK", "福袋活动"),
 	DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020","2020双十一活动"),
+	DOUBLE_ELEVEN2021("DOUBLE_ELEVEN2021","2021双十一活动"),
 	TENANT_RECHARGE("TENANT_RECHARGE","租户充值"),
 	GOODS_SELL("GOODS_SELL","商品销售"),
 	OUTORDER("OUTORDER", "外部订单"),
@@ -26,6 +27,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	MAINTENANCE("MAINTENANCE","乐保"),
 	REPLACEMENT("REPLACEMENT","乐器置换"),
 	DEGREE("DEGREE","6.1考级活动"),
+	ACTIVITY("ACTIVITY","活动排课"),
 	MEMBER("MEMBER", "购买会员");
 
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ReturnFeeEnum.java

@@ -0,0 +1,39 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 退费类型 (VIP vip退课，关闭,PRACTICE 网管课关闭,MUSIC 退团,GOODS 退商品)
+ */
+public enum ReturnFeeEnum implements BaseEnum<String, ReturnFeeEnum> {
+	VIP("VIP", "VIP退学"),
+	PRACTICE("PRACTICE", "网管课关闭"),
+	MUSIC("MUSIC", "乐团退团"),
+	GOODS("GOODS", "商品退费");
+
+	private String code;
+
+	private String msg;
+
+	ReturnFeeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/AccountLogQueryInfo.java

@@ -0,0 +1,93 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class AccountLogQueryInfo extends QueryInfo {
+
+    private String organId;
+
+    private String groupType;
+
+    private String returnFeeType;
+
+    private String payStartTime;
+
+    private String payEndTime;
+
+    private String createStartTime;
+
+    private String createEndTime;
+
+    private Boolean returnFeeFlag;
+
+    public Boolean getReturnFeeFlag() {
+        return returnFeeFlag;
+    }
+
+    public void setReturnFeeFlag(Boolean returnFeeFlag) {
+        this.returnFeeFlag = returnFeeFlag;
+    }
+
+    public String getReturnFeeType() {
+        return returnFeeType;
+    }
+
+    public void setReturnFeeType(String returnFeeType) {
+        this.returnFeeType = returnFeeType;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getPayStartTime() {
+        return payStartTime;
+    }
+
+    public void setPayStartTime(String payStartTime) {
+        this.payStartTime = payStartTime;
+    }
+
+    public String getPayEndTime() {
+        return payEndTime;
+    }
+
+    public void setPayEndTime(String payEndTime) {
+        this.payEndTime = payEndTime;
+    }
+
+    public String getCreateStartTime() {
+        return createStartTime;
+    }
+
+    public void setCreateStartTime(String createStartTime) {
+        this.createStartTime = createStartTime;
+    }
+
+    public String getCreateEndTime() {
+        return createEndTime;
+    }
+
+    public void setCreateEndTime(String createEndTime) {
+        this.createEndTime = createEndTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ActivityPlanQueryInfo.java

@@ -0,0 +1,42 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class ActivityPlanQueryInfo extends QueryInfo {
+
+    private String organId;
+
+    private Boolean enable;
+
+    @ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户")
+    private Integer  applyToStudentType;
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public Integer getApplyToStudentType() {
+        return applyToStudentType;
+    }
+
+    public void setApplyToStudentType(Integer applyToStudentType) {
+        this.applyToStudentType = applyToStudentType;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ActivityStudentQueryInfo.java

@@ -0,0 +1,41 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class ActivityStudentQueryInfo extends QueryInfo {
+
+    private Integer activityId;
+
+    private Integer userId;
+
+    private Boolean giveFlag;
+
+    public Boolean getGiveFlag() {
+        return giveFlag;
+    }
+
+    public void setGiveFlag(Boolean giveFlag) {
+        this.giveFlag = giveFlag;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/DoubleEleven2021QueryInfo.java

@@ -0,0 +1,64 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class DoubleEleven2021QueryInfo extends QueryInfo {
+
+    private String organId;
+
+    @ApiModelProperty(value = "购买的活动类型1、1v1 20节，2、1v1 40节，3、1v2 20节，4、1v2 40节，5、乐理课",required = false)
+    private Integer type;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Boolean giveMemberFlag;
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Boolean getGiveMemberFlag() {
+        return giveMemberFlag;
+    }
+
+    public void setGiveMemberFlag(Boolean giveMemberFlag) {
+        this.giveMemberFlag = giveMemberFlag;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EmployeeInfoQueryInfo.java

@@ -43,6 +43,17 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	
 	private String hrbp;
 
+	@ApiModelProperty(value = "是否没有手机号和微信", required = false)
+	private Boolean notMobileAndWechat;
+
+	public Boolean getNotMobileAndWechat() {
+		return notMobileAndWechat;
+	}
+
+	public void setNotMobileAndWechat(Boolean notMobileAndWechat) {
+		this.notMobileAndWechat = notMobileAndWechat;
+	}
+
 	public String getUserNameOrIdOrMobile() {
 		return userNameOrIdOrMobile;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/LuckDrawQueryInfo.java

@@ -20,6 +20,26 @@ public class LuckDrawQueryInfo extends QueryInfo {
 	
 	private Integer organId;
 
+	private Boolean defaultFlag;
+
+	private Boolean allFlag = true;
+
+	public Boolean getAllFlag() {
+		return allFlag;
+	}
+
+	public void setAllFlag(Boolean allFlag) {
+		this.allFlag = allFlag;
+	}
+
+	public Boolean getDefaultFlag() {
+		return defaultFlag;
+	}
+
+	public void setDefaultFlag(Boolean defaultFlag) {
+		this.defaultFlag = defaultFlag;
+	}
+
 	public String getName() {
 		return name;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicEnlightenmentQuestionnaireQueryInfo.java

@@ -0,0 +1,55 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/10/13 0013
+ */
+public class MusicEnlightenmentQuestionnaireQueryInfo extends QueryInfo {
+
+    @ApiModelProperty("乐团编号")
+    private String musicGroupId;
+
+    @ApiModelProperty("年级数字")
+    private Integer currentGradeNum;
+
+    @ApiModelProperty("教师推荐专业")
+    private Integer teacherRecommandSubjectId;
+
+    @ApiModelProperty("是否正在学习某乐器")
+    private Boolean musicalInstrumentsLearning;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public Integer getCurrentGradeNum() {
+        return currentGradeNum;
+    }
+
+    public void setCurrentGradeNum(Integer currentGradeNum) {
+        this.currentGradeNum = currentGradeNum;
+    }
+
+    public Integer getTeacherRecommandSubjectId() {
+        return teacherRecommandSubjectId;
+    }
+
+    public void setTeacherRecommandSubjectId(Integer teacherRecommandSubjectId) {
+        this.teacherRecommandSubjectId = teacherRecommandSubjectId;
+    }
+
+    public Boolean getMusicalInstrumentsLearning() {
+        return musicalInstrumentsLearning;
+    }
+
+    public void setMusicalInstrumentsLearning(Boolean musicalInstrumentsLearning) {
+        this.musicalInstrumentsLearning = musicalInstrumentsLearning;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupQueryInfo.java

@@ -29,6 +29,9 @@ public class MusicGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "教务老师编号")
     private Integer educationalTeacherId;
 
+    @ApiModelProperty(value = "合作单位编号")
+    private Integer cooperationOrganId;
+
     private MusicGroupStatusEnum status;
 
     private Boolean noClassStudentMusicGroup;
@@ -47,6 +50,25 @@ public class MusicGroupQueryInfo extends QueryInfo {
     
     private Date billEndDate;
 
+    @ApiModelProperty(value = "维修技师")
+    private Integer repairUserId;
+
+    public Integer getRepairUserId() {
+        return repairUserId;
+    }
+
+    public void setRepairUserId(Integer repairUserId) {
+        this.repairUserId = repairUserId;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
     public CourseViewTypeEnum getCourseViewType() {
         return courseViewType;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicMemberQueryInfo.java

@@ -7,8 +7,8 @@ import java.util.Date;
 
 public class MusicMemberQueryInfo extends QueryInfo {
 
-	@ApiModelProperty(value = "0已过期，1即将过期", required = false)
-	private Integer hasMember;
+	@ApiModelProperty(value = "0已过期，1即将过期,2待生效", required = false)
+	private Integer hasMember = 0;
 
 	private String memberEndAutoQuitMusic;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentInstrumentQueryInfo.java

@@ -29,7 +29,6 @@ public class StudentInstrumentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "商品分类id")
     private Integer goodsCategoryId;
 
-
     @ApiModelProperty(value = "乐器品牌")
     private String goodsBrand;
 
@@ -42,6 +41,15 @@ public class StudentInstrumentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否乐保 0-不是 1-是")
     private Integer status;
 
+    private String musicGroupId;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
 
     public Integer getStudentId() {
         return studentId;

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupActivityQueryInfo.java

@@ -9,15 +9,70 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class VipGroupActivityQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "可用分部")
     private String organId;
 
+    @ApiModelProperty(value = "是否可用")
     private Boolean enable;
 
+    @ApiModelProperty(value = "是否赠送")
+    private Boolean giveFlag;
+
+    @ApiModelProperty(value = "赠送类型，VIP、PRACTICE、MEMBER")
+    private String giveType;
+
+    @ApiModelProperty(value = "活动状态草稿、进行中")
+    private String status;
+
     @ApiModelProperty(value = "适用学生类型:-1：所有；0：老用户；1：新用户")
     private Integer  applyToStudentType;
 
     private Integer allowOnlineToOffline;
 
+    private Integer memberFlag;
+
+    private Integer newStudent;
+
+    public Integer getMemberFlag() {
+        return memberFlag;
+    }
+
+    public void setMemberFlag(Integer memberFlag) {
+        this.memberFlag = memberFlag;
+    }
+
+    public Integer getNewStudent() {
+        return newStudent;
+    }
+
+    public void setNewStudent(Integer newStudent) {
+        this.newStudent = newStudent;
+    }
+
+    public Boolean getGiveFlag() {
+        return giveFlag;
+    }
+
+    public void setGiveFlag(Boolean giveFlag) {
+        this.giveFlag = giveFlag;
+    }
+
+    public String getGiveType() {
+        return giveType;
+    }
+
+    public void setGiveType(String giveType) {
+        this.giveType = giveType;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public Integer getAllowOnlineToOffline() {
         return allowOnlineToOffline;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/ActivityApplyStudentTypeService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.ActivityApplyStudentType;
+import com.ym.mec.common.service.BaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface ActivityApplyStudentTypeService extends BaseService<Integer, ActivityApplyStudentType> {
+
+}