Merge branch 'dev_1_2_20220802' into online

# Conflicts:
#	cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml
#	cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml
#	cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenVideoGroupController.java

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 import javax.sound.sampled.AudioFormat;
 
+import com.yonge.cooleshow.common.enums.HardLevelEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/AdminFeignService.java

@@ -78,4 +78,7 @@ public interface AdminFeignService {
     @GetMapping("/open/userOrder/contractRecord")
     HttpResponseResult<Boolean> contractRecord(@RequestBody ContractDto contract);
 
+    //老师课酬
+    @PostMapping(value = "/task/activityState")
+    HttpResponseResult activityState();
 }

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/AdminFeignServiceFallback.java

@@ -60,4 +60,9 @@ public class AdminFeignServiceFallback implements AdminFeignService {
     public HttpResponseResult<Boolean> contractRecord(ContractDto contract) {
         return null;
     }
+
+    @Override
+    public HttpResponseResult activityState() {
+        return null;
+    }
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/UserSetReq.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -17,6 +18,7 @@ public class UserSetReq {
     @ApiModelProperty("头像地址")
     private String avatar;
     @ApiModelProperty("昵称")
+    @Size(max = 7, message = "昵称长度不能超过7个字")
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
     private Integer gender;

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -61,8 +61,8 @@ public class SysMenu {
 	/** 更新时间 */
 	private java.util.Date updateTime;
 
-	/** 逻辑删除标记(0--正常 1--删除) */
-	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
+	/** 删除标记(0--正常 1--删除) */
+	@ApiModelProperty(value = "删除标记(0--正常 1--删除)",required = false)
 	private Boolean delFlag= false;
 
 	private Integer hid;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserDeviceService.java

@@ -21,7 +21,7 @@ public interface SysUserDeviceService extends BaseService<Long, SysUserDevice> {
 	boolean bindDevice(String clientId, Long userId, String deviceNum);
 
 	/**
-	 * 逻辑删除
+	 * 删除
 	 * @param id
 	 * @return
 	 */

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -559,7 +559,7 @@ public class UserController extends BaseController {
 
     @PostMapping("/submitSetDetail")
     @ApiOperation(value = "修改设置信息", notes = "传入teacher")
-    public HttpResponseResult<UserSetVo> submitSetDetail(@RequestBody UserSetReq setReq) {
+    public HttpResponseResult<UserSetVo> submitSetDetail(@RequestBody @Valid UserSetReq setReq) {
         AuthUser authUser = SecurityUtils.getUser();
         if (authUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/controller/BbsCollectController.java

@@ -93,7 +93,7 @@ public class BbsCollectController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
 			return failed("参数不能为空");

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/controller/BbsConfigLabelController.java

@@ -70,7 +70,7 @@ public class BbsConfigLabelController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "逻辑删除")
+    @ApiOperation(value = "删除")
     @PostMapping("/remove")
     public HttpResponseResult remove(@Validated @RequestBody BbsConfigLabelSearch query) {
         SysUser user = sysUserFeignService.queryUserInfo();

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/controller/BbsFollowController.java

@@ -93,7 +93,7 @@ public class BbsFollowController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
 			return failed("参数不能为空");

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dao/BbsConfigLabelDao.java

@@ -37,7 +37,7 @@ public interface BbsConfigLabelDao extends BaseMapper<BbsConfigLabel> {
     List<BbsConfigLabel> selectAll(Integer delFlag);
 
     /**
-     * 逻辑删除
+     * 删除
      *
      * @param query
      * @param userId

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/service/BbsConfigLabelService.java

@@ -40,7 +40,7 @@ public interface BbsConfigLabelService extends IService<BbsConfigLabel> {
     List<BbsConfigLabel> selectAll(Integer delFlag);
 
     /**
-     * 逻辑删除
+     * 删除
      *
      * @param query
      * @param userId

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/MusicTheoryController.java

@@ -98,7 +98,7 @@ public class MusicTheoryController {
      * 删除
      */
     @PostMapping("/remove/{id}")
-    @ApiOperation(value = "乐理章节详情逻辑删除", notes = "传入id")
+    @ApiOperation(value = "乐理章节详情删除", notes = "传入id")
     public HttpResponseResult<Boolean> remove(@ApiParam(value = "编号", required = true) @PathVariable Long id) {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsInformationDao.java

@@ -19,7 +19,7 @@ public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation>
 	List<SysNewsInformation> queryByType(Integer type);
 
 	/**
-	 * 逻辑删除
+	 * 删除
 	 *
 	 * @param id
 	 * @return

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsInformationService.java

@@ -21,7 +21,7 @@ public interface SysNewsInformationService extends BaseService<Long, SysNewsInfo
 	List<SysNewsInformation> queryByType(Integer type);
 
 	/**
-	 * 逻辑删除
+	 * 删除
 	 * @param id
 	 * @return
 	 */

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -140,6 +140,13 @@ public interface SysConfigConstant {
      * @updateTime 2022/4/20 11:43
      */
     String GOOD_LOGO_PIANO_ROOM = "good_logo_piano_room";
+    /***
+     * 商品活动报名图片
+     * @author liweifan
+     * @updateTime 2022/4/20 11:43
+     */
+    String GOOD_LOGO_ACTI_REGIST = "good_logo_acti_regist";
+
 
     /**
      * 琴房学员解绑未上课天数
@@ -297,6 +304,10 @@ public interface SysConfigConstant {
      */
     String MUSIC_ACCOUNT_PERIOD = "music_account_period";
     /**
+     * 活动报名账期
+     */
+    String ACTI_REGIST_ACCOUNT_PERIOD = "acti_regist_account_period";
+    /**
      * 商品账期
      */
     String MALL_ACCOUNT_PERIOD = "mall_account_period";

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ActivityTypeEnum.java

@@ -0,0 +1,34 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 活动类型 EVALUATION 评测活动
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum ActivityTypeEnum implements BaseEnum<String, ActivityTypeEnum> {
+
+    EVALUATION("评测活动")
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ActivityTypeEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/CacheNameEnum.java

@@ -23,9 +23,9 @@ public enum CacheNameEnum implements BaseEnum<String, CacheNameEnum> {
     LOCK_EXECUTE_ORDER("用户下单/付款/取消订单锁"),
     LOCK_RECORD_ACCOUNT("账户记录锁"),
     LOCK_CHANGE_ACCOUNT("账户变更锁"),
+    LOCK_CHANGE_PIANO_ROOM_ACCOUNT("琴房账户变更锁"),
     LOCK_WITHDRAWAL("锁用户结算"),
 
-
     ;
     /***
      * 缓存描述

audio-analysis/src/main/java/com/yonge/netty/dto/HardLevelEnum.java → cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/HardLevelEnum.java

@@ -1,5 +1,6 @@
-package com.yonge.netty.dto;
+package com.yonge.cooleshow.common.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
@@ -23,6 +24,8 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * 完成度范围, 未演奏的范围
 	 */
 	PERFORMER("大师级", 3, 3, 5, 10, 13, 15, 95, 10);
+	@EnumValue
+	private String code;
 
 	private String msg;
 
@@ -58,6 +61,7 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	HardLevelEnum(String msg, int amplitudeThreshold, int frequencyThreshold, int tempoEffectiveRangeOf1, int tempoEffectiveRangeOf2,
 			int tempoEffectiveRangeOf4, int tempoEffectiveRangeOf8, int integrityRange,
 			int notPlayRange) {
+		this.code = this.name();
 		this.msg = msg;
 		this.amplitudeThreshold = amplitudeThreshold;
 		this.frequencyThreshold = frequencyThreshold;

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/RegistrationMethodEnum.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 报名方式 FREE 免费 CHARGE 收费
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum RegistrationMethodEnum implements BaseEnum<String, RegistrationMethodEnum> {
+
+    FREE("免费"),
+    CHARGE("收费")
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    RegistrationMethodEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -176,10 +176,15 @@ public class PaymentController extends BaseController {
                     }
                 }
             }
-            if (MethodNameEnum.refundPayment.equals(data.getMethodName())) {
-                //退款
-                portalOrderReturnApplyService.refundPaymentCallBack(data);
+            try {
+                if (MethodNameEnum.refundPayment.equals(data.getMethodName())) {
+                    //退款
+                    portalOrderReturnApplyService.refundPaymentCallBack(data);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
+
         }
         return res.getData().getResMsg();
     }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/ActivityStateTask.java

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.AdminFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ActivityStateTask extends BaseTask {
+
+    @Autowired
+    private AdminFeignService adminFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = adminFeignService.activityState();
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationController.java

@@ -0,0 +1,105 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.ActivityEvaluationDto;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityEvaluation")
+@Api(value = "评测活动表", tags = "评测活动表")
+public class ActivityEvaluationController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationService activityEvaluationService;
+	@Resource
+	private SysUserFeignService sysUserFeignService;
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationSearch")
+	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/page')")
+	public HttpResponseResult<PageInfo<ActivityEvaluationVo>> page(@RequestBody ActivityEvaluationSearch query) {
+		IPage<ActivityEvaluationVo> pages = activityEvaluationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+
+	@PostMapping("/list")
+	@ApiOperation(value = "查询列表", notes = "传入activityEvaluationSearch")
+	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/list')")
+	public HttpResponseResult<List<ActivityEvaluationVo>> selectAll(@RequestBody ActivityEvaluationSearch query) {
+		List<ActivityEvaluationVo> list = activityEvaluationService.selectAll(query);
+		return succeed(list);
+	}
+    
+    /**
+	 * 批量增加曲目
+	 */
+	@PostMapping("/addBatch")
+	@ApiOperation(value = "批量增加曲目")
+	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/addBatch')")
+	public HttpResponseResult addBatch(@Valid @RequestBody ActivityEvaluationDto param) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+    	return status(activityEvaluationService.addBatch(param,user));
+	}
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/remove')")
+	public HttpResponseResult remove(
+			@ApiParam(value = "主键集合", required = true)
+			@RequestParam(value = "ids") String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityEvaluationService.removeByIds(StringUtil.toLongList(ids)));
+	}
+
+
+	@ApiOperation(value = "分页查询曲目", httpMethod="POST", consumes="application/json", produces="application/json")
+	@PostMapping(value="/musicPage", consumes="application/json", produces="application/json")
+	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/musicPage')")
+	public HttpResponseResult<PageInfo<MusicSheetVo>> musicPage(@RequestBody MusicSheetSearch query) {
+		if(null == query.getActivityId()){
+			return failed("活动id不能为空");
+		}
+		query.setAuditStatus(AuthStatusEnum.PASS);
+		query.setState(YesOrNoEnum.YES);
+		query.setAuditVersion(YesOrNoEnum.NO);
+
+		IPage<MusicSheetVo> musicSheetVoIPage = activityEvaluationService.musicPage(PageUtil.getPage(query), query);
+		return succeed(PageUtil.pageInfo(musicSheetVoIPage));
+	}
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationRecordController.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
+
+@RestController
+@RequestMapping("/activityEvaluationRecord")
+@Api(value = "评测活动参与记录表", tags = "评测活动参与记录表")
+public class ActivityEvaluationRecordController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationRecordService activityEvaluationRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityEvaluationRecord/detail')")
+    public HttpResponseResult<ActivityEvaluationRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityEvaluationRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationRecordSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityEvaluationRecord/page')")
+    public HttpResponseResult<PageInfo<ActivityEvaluationRecordVo>> page(@RequestBody ActivityEvaluationRecordSearch query) {
+		IPage<ActivityEvaluationRecordVo> pages = activityEvaluationRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityPlanController.java

@@ -0,0 +1,88 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+
+@RestController
+@RequestMapping("/activityPlan")
+@Api(value = "活动计划表", tags = "活动计划表")
+public class ActivityPlanController extends BaseController {
+
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/detail')")
+    public HttpResponseResult<ActivityPlanVo> detail(@PathVariable("id") Long id) {
+        return succeed(activityPlanService.detail(id));
+    }
+
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityPlanSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/page')")
+    public HttpResponseResult<PageInfo<ActivityPlanVo>> page(@RequestBody ActivityPlanSearch query) {
+        IPage<ActivityPlanVo> pages = activityPlanService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    /**
+     * 新增或修改
+     */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityPlan")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/submit')")
+    public HttpResponseResult<ActivityPlan> submit(@Valid @RequestBody ActivityPlanDto activityPlan) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return HttpResponseResult.succeed(activityPlanService.submit(activityPlan, user));
+    }
+
+    /**
+     * 启用/停用
+     */
+    @GetMapping("/updateActivityState")
+    @ApiOperation(value = "启用/停用")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/updateActivityState')")
+    public HttpResponseResult updateActivityState(
+            @ApiParam(value = "活动id", required = true) @RequestParam("activityId") Long activityId,
+            @ApiParam(value = "活动状态 0 停用 1 启用", required = true) @RequestParam("activityState") Integer activityState) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return status(activityPlanService.updateActivityState(activityId, activityState, user.getId()));
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRegistrationController.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRegistrationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import com.yonge.cooleshow.biz.dal.service.ActivityRegistrationService;
+
+@RestController
+@RequestMapping("/activityRegistration")
+@Api(value = "活动报名表", tags = "活动报名表")
+public class ActivityRegistrationController extends BaseController {
+
+    @Autowired
+    private ActivityRegistrationService activityRegistrationService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityRegistration/detail')")
+    public HttpResponseResult<ActivityRegistrationVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRegistrationService.detail(id));
+	}
+    
+    /**
+     * 参与名单
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRegistrationSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityRegistration/page')")
+    public HttpResponseResult<PageInfo<ActivityRegistrationVo>> page(@Valid @RequestBody ActivityRegistrationSearch query) {
+		IPage<ActivityRegistrationVo> pages = activityRegistrationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -0,0 +1,81 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
+
+@RestController
+@RequestMapping("/activityReward")
+@Api(value = "活动奖品表", tags = "活动奖品表")
+public class ActivityRewardController extends BaseController {
+
+    @Autowired
+    private ActivityRewardService activityRewardService;
+	@Resource
+	private SysUserFeignService sysUserFeignService;
+
+	/**
+     * 通过奖品id查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "通过奖品id查询单条", notes = "传入id")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/detail')")
+	public HttpResponseResult<ActivityRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRewardService.detail(id));
+	}
+
+	/**
+	 * 通过活动id查询单条
+	 */
+	@GetMapping("/detailByActivityId/{id}")
+	@ApiOperation(value = "通过活动id查询单条", notes = "传入id")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/detailByActivityId')")
+	public HttpResponseResult<ActivityRewardVo> detailByActivityId(@PathVariable("id") Long id) {
+		return succeed(activityRewardService.detailByActivityId(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRewardSearch")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/page')")
+	public HttpResponseResult<PageInfo<ActivityRewardVo>> page(@RequestBody ActivityRewardSearch query) {
+		IPage<ActivityRewardVo> pages = activityRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityReward")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/submit')")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityRewardDto activityReward) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+        return status(activityRewardService.submit(activityReward, user));
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityUserRewardController.java

@@ -0,0 +1,57 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+
+@RestController
+@RequestMapping("/activityUserReward")
+@Api(value = "活动用户获奖表", tags = "活动用户获奖表")
+public class ActivityUserRewardController extends BaseController {
+
+    @Autowired
+    private ActivityUserRewardService activityUserRewardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityUserRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityUserRewardService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityUserRewardSearch")
+    public HttpResponseResult<PageInfo<ActivityUserRewardVo>> page(@RequestBody ActivityUserRewardSearch query) {
+		IPage<ActivityUserRewardVo> pages = activityUserRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityUserReward")
+	public HttpResponseResult update(@Valid @RequestBody ActivityUserReward activityUserReward) {
+        return status(activityUserRewardService.updateById(activityUserReward));
+	}
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AdminCourseGroupController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.LiveSaleOutDto;
 import com.yonge.cooleshow.biz.dal.dto.search.LiveCourseGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.LiveCourseGroupStudentCourseSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.LiveCourseGroupStudentSearch;
@@ -92,6 +93,22 @@ public class AdminCourseGroupController extends BaseController {
     }
 
 
+    @ApiOperation(value = "直播课下架")
+    @PostMapping(value="/live/saleOut")
+    public HttpResponseResult<Boolean> liveSaleOut(@RequestBody @Valid LiveSaleOutDto dto) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        if (dto.getCourseGroupId() == null) {
+            return failed("课程组id不能为空");
+        }
+
+        return succeed(courseGroupService.liveSaleOut(dto));
+    }
+
+
+
     @ApiOperation(value = "老师详情-直播课购买学员信息", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/live/student", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<LiveCourseGroupStudentVo>> student(@Valid @RequestBody LiveCourseGroupStudentSearch query) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseGroupController.java

@@ -32,8 +32,6 @@ public class CourseGroupController extends BaseController {
     @Autowired
     private CourseGroupService courseGroupService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private CourseScheduleService courseScheduleService;
 
     @ApiOperation(value = "课程组管理-陪练课", notes = "{\n" +

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseScheduleRepliedController.java

@@ -76,7 +76,7 @@ public class CourseScheduleRepliedController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
 			return failed("参数不能为空");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicAlbumController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.MusicAlbumSheetDto;
+import com.yonge.cooleshow.biz.dal.dto.MusicAlbumSheetSortDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
@@ -17,6 +18,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -161,6 +163,23 @@ public class MusicAlbumController extends BaseController {
     }
 
 
+    /**
+     * 修改曲目的排序值
+     */
+    @PostMapping(value = "/detail/updateMusicSheet" ,consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情修改曲目排序",  httpMethod="POST", consumes="application/json", produces="application/json")
+    @PreAuthorize("@pcs.hasPermissions('music/album/detail/updateMusicSheet')")
+    public HttpResponseResult<Boolean> updateMusicSheet(@Valid @RequestBody MusicAlbumSheetSortDto query) {
+        if (StringUtil.isEmpty(query.getAlbumId())) {
+            return failed("专辑编号ID不能为空");
+        }
+        if (StringUtil.isEmpty(query.getMusicSheetId())) {
+            return failed("曲目编号不能为空");
+        }
+        return succeed(musicAlbumService.updateMusicSheet(query));
+    }
+
+
 
     /**
      * 专辑详情添加曲目列表
@@ -176,10 +195,10 @@ public class MusicAlbumController extends BaseController {
         if (StringUtil.isEmpty(query.getAlbumId())) {
             return failed("专辑编号ID不能为空");
         }
-        if (StringUtil.isEmpty(query.getMusicSheetIds())) {
-            return failed("曲目编号不能为空");
+        if (CollectionUtils.isEmpty(query.getAlbumMusicList())) {
+            return failed("曲目不能为空");
         }
-        return status(musicAlbumService.addMusicSheet(query.getAlbumId(),query.getMusicSheetIds(),sysUser.getId()));
+        return status(musicAlbumService.addMusicSheet(query.getAlbumId(),query.getAlbumMusicList(),sysUser.getId()));
     }
 
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetExport;
+import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
@@ -180,11 +181,19 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/state')")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        return status(musicSheetService.state(id));
+        MusicSheet musicSheet = musicSheetService.getById(id);
+        if (musicSheet == null) {
+            return failed("未找到曲目");
+        }
+        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
+                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
+            return failed("请填写下架原因");
+        }
+        return status(musicSheetService.state(id,reasonDto.getReason()));
     }
 
     /**
@@ -267,4 +276,19 @@ public class MusicSheetController extends BaseController {
         }
     }
 
+
+    /**
+     * 置顶
+     */
+    @PostMapping("/top/{id}")
+    @ApiOperation(value = "置顶曲目", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('music/sheet/top')")
+    public HttpResponseResult<Boolean> top(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
+        if (StringUtil.isEmpty(id)) {
+            return failed("参数不能为空");
+        }
+        return status(musicSheetService.top(id));
+    }
+
+
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicTagController.java

@@ -98,7 +98,7 @@ public class MusicTagController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove/{id}")
-	@ApiOperation(value = "逻辑删除", notes = "传入id")
+	@ApiOperation(value = "删除", notes = "传入id")
 	@PreAuthorize("@pcs.hasPermissions('MusicTag/remove')")
 	public HttpResponseResult<Boolean> remove(@ApiParam(value = "标签编号", required = true) @PathVariable Long id) {
         if (StringUtil.isEmpty(id)) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PianoRoomChangeRecordController.java

@@ -0,0 +1,64 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomChangeRecordService;
+
+@RestController
+@RequestMapping("/pianoRoomChangeRecord")
+@Api(value = "琴房时长变更记录表", tags = "琴房时长变更记录表")
+public class PianoRoomChangeRecordController extends BaseController {
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private PianoRoomChangeRecordService pianoRoomChangeRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<PianoRoomChangeRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(pianoRoomChangeRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入pianoRoomChangeRecordSearch")
+    public HttpResponseResult<PageInfo<PianoRoomChangeRecordVo>> page(@RequestBody PianoRoomChangeRecordSearch query) {
+		IPage<PianoRoomChangeRecordVo> pages = pianoRoomChangeRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/add")
+	@ApiOperation(value = "新增", notes = "传入pianoRoomChangeRecord")
+	public HttpResponseResult add(@Valid @RequestBody PianoRoomChangeRecord pianoRoomChangeRecord) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		pianoRoomChangeRecord.setCreateBy(user.getId());
+    	return status(pianoRoomChangeRecordService.add(pianoRoomChangeRecord));
+	}
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PianoRoomSettingsController.java

@@ -103,7 +103,7 @@ public class PianoRoomSettingsController extends BaseController {
      * 删除
      */
     @PostMapping("/remove")
-    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @ApiOperation(value = "删除", notes = "传入ids")
     public HttpResponseResult remove(@ApiParam(value = "主键集合(多个id,分割)", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
             return failed("参数不能为空");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentAttendanceController.java

@@ -76,7 +76,7 @@ public class StudentAttendanceController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
 			return failed("参数不能为空");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentCourseHomeworkController.java

@@ -76,7 +76,7 @@ public class StudentCourseHomeworkController extends BaseController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
 	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
 			return failed("参数不能为空");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.valid.AddGroup;
 import com.yonge.cooleshow.biz.dal.valid.SelectGroup;
@@ -23,7 +24,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,7 +38,7 @@ import java.util.List;
 @Api(tags = "视频课")
 @Validated
 public class VideoLessonController extends BaseController {
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private VideoLessonGroupService lessonGroupService;
@@ -134,6 +137,28 @@ public class VideoLessonController extends BaseController {
         return succeed();
     }
 
+    /**
+     * @Description: 更新上架状态
+     * @Author: cy
+     * @Date: 2022/4/25
+     */
+    @ApiOperation(value = "更新上架状态", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/updateShelves", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<Object> updateShelves(@Validated @RequestBody VideoLessonShelvesVo shelvesVo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        if (shelvesVo.getShelvesFlag() == 0 && StringUtil.isEmpty(shelvesVo.getShelvesReason())) {
+            return failed( "下架必须要有下架原因");
+        }
+
+        shelvesVo.setShelvesId(user.getId());
+        shelvesVo.setShelvesTime(new Date());
+        lessonGroupService.updateShelves(shelvesVo);
+        return succeed();
+    }
+
     @ApiOperation(value = "首页-视频课统计")
     @GetMapping("/countVideoGroup")
     public HttpResponseResult<CountVideoGroupVo> countVideoGroup() {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.controller.open;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderPayment;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import com.yonge.cooleshow.common.entity.ContractDto;
@@ -134,7 +135,7 @@ public class UserOrderClient extends BaseController {
      */
     @PostMapping("/testCallback")
     public void testCallback(@RequestBody PaymentCallBack data) {
-        if(!debugMode){
+        if (!debugMode) {
             return;
         }
         if (MethodNameEnum.executePayment.equals(data.getMethodName())) {
@@ -152,7 +153,7 @@ public class UserOrderClient extends BaseController {
     @GetMapping("/setSuccessStatus")
     @ApiOperation(value = "完成所有订单（测试用）")
     public HttpResponseResult<Boolean> setSuccessStatus() {
-        if(!debugMode){
+        if (!debugMode) {
             return HttpResponseResult.failed("当前环境不允许调用");
         }
         userOrderService.setSuccessStatus();
@@ -164,18 +165,24 @@ public class UserOrderClient extends BaseController {
     public HttpResponseResult<Boolean> setOrderStatus(
             @RequestParam("orderNo") String orderNo,
             @RequestParam("orderStatus") OrderStatusEnum orderStatus) {
-        if(!debugMode){
+        if (!debugMode) {
             return HttpResponseResult.failed("当前环境不允许调用");
         }
-        userOrderService.setOrderStatus(orderNo, orderStatus);
-        return succeed(true);
+
+        UserOrder param = new UserOrder();
+        param.setOrderNo(orderNo);
+        param.setStatus(orderStatus);
+        Boolean aBoolean = DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey(orderNo)
+                        , userOrderService::setOrderStatus, param, 10L);
+        return succeed(aBoolean);
     }
 
     @GetMapping("/orderRefound")
     @ApiOperation(value = "退款（测试用）")
     public HttpResponseResult<UserOrderRefundBill> orderRefound(
             @RequestParam("orderNo") String orderNo) {
-        if(!debugMode){
+        if (!debugMode) {
             return HttpResponseResult.failed("当前环境不允许调用");
         }
         return userOrderRefundService.orderRefound(orderNo);
@@ -187,7 +194,7 @@ public class UserOrderClient extends BaseController {
     @PostMapping("/contractRecord")
     @ApiOperation(value = "签协议 商城调用", notes = "签协议 商城调用")
     public HttpResponseResult<Boolean> contractRecord(@RequestBody ContractDto contract) {
-        paymentService.setContractRecord(contract.getType(),contract.getUserId());
+        paymentService.setContractRecord(contract.getType(), contract.getUserId());
         return succeed(true);
     }
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/task/TaskController.java

@@ -1,13 +1,9 @@
 package com.yonge.cooleshow.admin.task;
 
-import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.wordfilter.WordContext;
-import com.yonge.cooleshow.biz.dal.wordfilter.WordFilter;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import io.swagger.annotations.Api;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +35,8 @@ public class TaskController extends BaseController {
     private RedissonClient redissonClient;
     @Autowired
     private PlatformCashAccountRecordService platformCashAccountRecordService;
+    @Autowired
+    private ActivityPlanService activityPlanService;
 
     /***
      * 轮询用户订单
@@ -89,4 +87,11 @@ public class TaskController extends BaseController {
         bucket.set(file.lastModified());
         return HttpResponseResult.succeed();
     }
+
+    //营销活动
+    @PostMapping(value = "/activityState")
+    public HttpResponseResult<Object> activityState() {
+        activityPlanService.activityState();
+        return HttpResponseResult.succeed();
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationDao.java

@@ -0,0 +1,70 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+
+
+public interface ActivityEvaluationDao extends BaseMapper<ActivityEvaluation> {
+    /**
+     * 查询详情
+     *
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+     */
+    ActivityEvaluationVo detail(@Param("id") Long id);
+    /**
+     * 分页查询
+     *
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+     */
+    List<ActivityEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationSearch activityEvaluation);
+
+	List<ActivityEvaluationVo> selectAll(@Param("param") ActivityEvaluationSearch activityEvaluation);
+
+    /**
+     * 批量给活动添加曲目
+     *
+     * @param activityId
+     * @param musicSheetIds
+     * @return
+     */
+    Integer addBatch(@Param("activityId") Long activityId,@Param("userId") Long userId , @Param("musicSheetIds") List<Long> musicSheetIds);
+
+	/**
+	 * 获取活动曲目信息
+	 *
+	 * @param activityPlanId 活动id
+	 * @param userId         用户id
+	 * @return
+	 */
+    List<ActivityMusicVo> selectActivityMusic(@Param("activityPlanId") Long activityPlanId, @Param("userId") Long userId);
+
+	/**
+	 * 获取活动排名用户信息
+	 *
+	 * @param activityPlanId 活动id
+	 * @return
+	 */
+	List<ActivityMusicVo> selectActivityUser(@Param("activityPlanId") Long activityPlanId);
+
+	/**
+	 * 查询曲子
+	 * @param page
+	 * @param query
+	 * @return
+	 */
+	List<MusicSheetVo> musicPage(@Param("page") IPage<MusicSheetVo> page, @Param("param") MusicSheetSearch query);
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationRecordDao.java

@@ -0,0 +1,38 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+
+
+public interface ActivityEvaluationRecordDao extends BaseMapper<ActivityEvaluationRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	ActivityEvaluationRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	List<ActivityEvaluationRecordVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationRecordSearch activityEvaluationRecord);
+
+	/**
+	 * 获取参与 的活动项目id集合
+	 *
+	 * @param userId     用户id
+	 * @param activityId 活动id
+	 * @return
+	 */
+    List<Long> getJoinEvaluationIdList(@Param("activityId") Long activityId, @Param("userId") Long userId);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanDao.java

@@ -0,0 +1,75 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
+
+
+public interface ActivityPlanDao extends BaseMapper<ActivityPlan> {
+	/**
+	 * 查询详情
+	 *
+	 * @author liweifan
+	 * @date 2022-08-04 10:19:49
+	 * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
+	 */
+	ActivityPlanVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+	 *
+	 * @author liweifan
+	 * @date 2022-08-04 10:19:49
+	 * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
+	 */
+	List<ActivityPlanVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanSearch activityPlan);
+	/**
+	 <if test="param.startTime !=null or param.endTime !=null">
+		 and NOT (
+			 <trim prefixOverrides="OR">
+				 <if test="param.startTime !=null">
+					OR t.activity_end_ &lt; #{param.startTime}
+				 </if>
+				 <if test="param.endTime !=null">
+					OR t.activity_start_ &gt; #{param.endTime}
+				 </if>
+			 </trim>
+		 )
+	 </if>
+	 */
+
+	/**
+	 * 评测活动 活动难度
+	 *
+	 * @param activityPlanId 活动id
+	 * @return
+	 */
+	String selectActivityPlanEvaluation(@Param("activityPlanId") Long activityPlanId);
+
+	/**
+	 * 查询需要变更状态的活动
+	 * @return
+	 */
+    List<ActivityPlan> activityState();
+
+	/**
+	 * 需要发奖的活动
+	 * @return
+	 */
+    List<ActivityPlan> activityReward();
+
+	/**
+	 *
+	 * @param activityPlanId
+	 * @param activityType
+	 * @return
+	 */
+	List<ActivityUserReward> getUserReward(@Param("activityPlanId")Long activityPlanId,@Param("activityType") String activityType);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanEvaluationDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
+
+
+public interface ActivityPlanEvaluationDao extends BaseMapper<ActivityPlanEvaluation>{
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityRegistrationDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRegistrationSearch;
+
+
+public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
+	 */
+	ActivityRegistrationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
+	 */
+	List<ActivityRegistrationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRegistrationSearch activityRegistration);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityRewardDao.java

@@ -0,0 +1,31 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
+
+
+public interface ActivityRewardDao extends BaseMapper<ActivityReward>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
+	 */
+	ActivityRewardVo detail(@Param("id") Long id);
+	ActivityRewardVo detailByActivityId(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
+	 */
+	List<ActivityRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRewardSearch activityReward);
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityUserRewardDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+
+
+public interface ActivityUserRewardDao extends BaseMapper<ActivityUserReward>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
+	 */
+	ActivityUserRewardVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
+	 */
+	List<ActivityUserRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserRewardSearch activityUserReward);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentDao.java

@@ -1,19 +0,0 @@
-//package com.yonge.cooleshow.biz.dal.dao;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudent;
-//import com.yonge.cooleshow.biz.dal.vo.CourseScheduleStudentVo;
-//
-//import java.util.List;
-//
-///**
-// * @Author: cy
-// * @Date: 2022/5/27
-// */
-//public interface CourseScheduleStudentDao extends BaseMapper<CourseScheduleStudent> {
-//    //批量添加学员
-//    void insertBatch(List<CourseScheduleStudent> list);
-//
-//    //查询课程对应的老师学员
-//    List<CourseScheduleStudentVo> selectUser();
-//}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PianoRoomChangeRecordDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+
+
+public interface PianoRoomChangeRecordDao extends BaseMapper<PianoRoomChangeRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-03 16:44:34
+     * @return: com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo
+	 */
+	PianoRoomChangeRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 16:44:34
+     * @return: com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo
+	 */
+	List<PianoRoomChangeRecordVo> selectPage(@Param("page") IPage page, @Param("param") PianoRoomChangeRecordSearch pianoRoomChangeRecord);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PianoRoomSettingsDao.java

@@ -50,7 +50,7 @@ public interface PianoRoomSettingsDao extends BaseMapper<PianoRoomSettings> {
     Integer changeStatus(@Param("id") Long id, @Param("status") Integer status);
 
     /**
-     * 批量逻辑删除
+     * 批量删除
      * @param idList
      * @return
      */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentDao.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
@@ -58,9 +59,9 @@ public interface StudentDao extends BaseMapper<Student> {
      * 我的关注
      *
      * @param page
-     * @param studentId
+     * @param query
      * @return
      */
-    List<MyFollow> queryMyFollow(@Param("page") IPage<MyFollow> page, @Param("studentId") Long studentId);
+    List<MyFollow> queryMyFollow(@Param("page") IPage page, @Param("param") QueryMyFollowSearch query);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDao.java

@@ -27,6 +27,8 @@ public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
 
     void updateExamine(VideoLessonExamineVo examineVo);
 
+    void updateShelves(VideoLessonShelvesVo shelvesVo);
+
     //学员详情-查询视频课列表
     List<VideoLessonStudentDetailVo> selectStudentPage(IPage page, @Param("param") VideoLessonSearch videoLessonSearch);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityEvaluationDto.java

@@ -0,0 +1,41 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityEvaluationDto对象", description = "评测活动表数据传输对象")
+public class ActivityEvaluationDto extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("活动id ")
+	@NotNull(message = "活动id不能为空")
+	private Long activityId;
+	@ApiModelProperty("曲目id 多个用,分割 ")
+	@NotBlank(message = "曲子id不能为空")
+	private String musicSheetIds;
+
+	public Long getActivityId() {
+		return activityId;
+	}
+
+	public void setActivityId(Long activityId) {
+		this.activityId = activityId;
+	}
+
+	public String getMusicSheetIds() {
+
+		return musicSheetIds;
+	}
+
+	public void setMusicSheetIds(String musicSheetIds) {
+		this.musicSheetIds = musicSheetIds;
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityEvaluationRecordDto.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityEvaluationRecordDto对象", description = "评测活动参与记录表数据传输对象")
+public class ActivityEvaluationRecordDto extends ActivityEvaluationRecord{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityPlanDto.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.Valid;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityPlanDto对象", description = "活动计划表数据传输对象")
+public class ActivityPlanDto extends ActivityPlan{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "活动计划-评测活动拓展")
+	private ActivityPlanEvaluation planEvaluation;
+
+
+	public ActivityPlanEvaluation getPlanEvaluation() {
+		return planEvaluation;
+	}
+
+	public void setPlanEvaluation(ActivityPlanEvaluation planEvaluation) {
+		this.planEvaluation = planEvaluation;
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityPlanPayDto.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-05
+ */
+@ApiModel("活动购买信息")
+public class ActivityPlanPayDto {
+
+    private Long activityId;
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityRegistrationDto.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityRegistrationDto对象", description = "活动报名表数据传输对象")
+public class ActivityRegistrationDto extends ActivityRegistration{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityRewardDto.java

@@ -0,0 +1,26 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityRewardDto对象", description = "活动奖品表数据传输对象")
+public class ActivityRewardDto extends ActivityReward{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建状态 0 正式 1 草稿 ")
+	private Integer draftFlag;
+
+	public Integer getDraftFlag() {
+		return draftFlag;
+	}
+
+	public void setDraftFlag(Integer draftFlag) {
+		this.draftFlag = draftFlag;
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityUserRewardDto.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityUserRewardDto对象", description = "活动用户获奖表数据传输对象")
+public class ActivityUserRewardDto extends ActivityUserReward{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EvaluationRecordDto.java

@@ -0,0 +1,49 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-09
+ */
+@ApiModel("参与活动分数")
+public class EvaluationRecordDto {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("活动项目")
+    private Long evaluationId;
+
+    @ApiModelProperty("分数")
+    private BigDecimal score;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getEvaluationId() {
+        return evaluationId;
+    }
+
+    public void setEvaluationId(Long evaluationId) {
+        this.evaluationId = evaluationId;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/LiveCourseGroupDto.java

@@ -28,7 +28,7 @@ public class LiveCourseGroupDto implements Serializable {
     private Long teacherId;
 
     @NotNull(message = "课程组名称不能为空")
-    @Size(max = 50, message = "课程组名称长度不能超过50个字")
+    @Size(max = 20, message = "课程组名称长度不能超过20个字")
     @ApiModelProperty(value = "课程组名称")
     private String name;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/LiveSaleOutDto.java

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description 直播课下架
+ *
+ * @author liujunchi
+ * @date 2022-08-03
+ */
+@ApiModel("直播课下架参数")
+public class LiveSaleOutDto {
+
+    @NotNull(message = "课程组id不能为空")
+    @ApiModelProperty(value = "直播课课程组id",required = true)
+    private Long courseGroupId;
+
+    @NotNull(message = "上下架状态不能为空")
+    @ApiModelProperty(value = "上下架  0：下架 1：上架",required = true)
+    private Long status;
+
+
+    @ApiModelProperty("下架原因")
+    private String reason;
+
+
+    public Long getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicAlbumSheetDto.java

@@ -3,6 +3,8 @@ package com.yonge.cooleshow.biz.dal.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * Description 专辑新增或删除曲目
  *
@@ -15,9 +17,12 @@ public class MusicAlbumSheetDto {
     @ApiModelProperty("专辑id")
     private Long albumId;
 
-    @ApiModelProperty("曲目id，多个逗号隔开")
+    @ApiModelProperty("曲目id，多个逗号隔开 （删除专辑内的曲目使用）")
     private String musicSheetIds;
 
+    @ApiModelProperty("曲目id，多个逗号隔开 （添加专辑内的曲目使用）")
+    private List<AlbumMusic> albumMusicList;
+
 
     public Long getAlbumId() {
         return albumId;
@@ -34,4 +39,36 @@ public class MusicAlbumSheetDto {
     public void setMusicSheetIds(String musicSheetIds) {
         this.musicSheetIds = musicSheetIds;
     }
+
+    public List<AlbumMusic> getAlbumMusicList() {
+        return albumMusicList;
+    }
+
+    public void setAlbumMusicList(List<AlbumMusic> albumMusicList) {
+        this.albumMusicList = albumMusicList;
+    }
+
+    public static class AlbumMusic{
+        @ApiModelProperty("曲目id")
+        private Long musicSheetId;
+
+        @ApiModelProperty("排序")
+        private Integer sortNumber;
+
+        public Long getMusicSheetId() {
+            return musicSheetId;
+        }
+
+        public void setMusicSheetId(Long musicSheetId) {
+            this.musicSheetId = musicSheetId;
+        }
+
+        public Integer getSortNumber() {
+            return sortNumber;
+        }
+
+        public void setSortNumber(Integer sortNumber) {
+            this.sortNumber = sortNumber;
+        }
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicAlbumSheetSortDto.java

@@ -0,0 +1,48 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-08
+ */
+@ApiModel("设置专辑中曲目的排序值")
+public class MusicAlbumSheetSortDto {
+
+    @ApiModelProperty("专辑id")
+    private Long albumId;
+
+    @ApiModelProperty("曲目id")
+    private Long musicSheetId;
+
+    @ApiModelProperty("排序值")
+    private Integer sortNumber;
+
+
+    public Long getAlbumId() {
+        return albumId;
+    }
+
+    public void setAlbumId(Long albumId) {
+        this.albumId = albumId;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomChangeRecordDto.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 16:44:34
+ */
+@ApiModel(value = "PianoRoomChangeRecordDto对象", description = "琴房时长变更记录表数据传输对象")
+public class PianoRoomChangeRecordDto extends PianoRoomChangeRecord{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ReasonDto.java

@@ -0,0 +1,25 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-08
+ */
+@ApiModel("曲目下架原因")
+public class ReasonDto {
+
+    @ApiModelProperty("曲目下架原因")
+    private String  reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/OrderReq.java

@@ -32,7 +32,7 @@ public class OrderReq {
     @ApiModelProperty(value = "订单名称 ", required = true)
     private String orderName;
     @NotNull(message = "订单类型不能为空")
-    @ApiModelProperty(value = "订单类型: 学生端（ VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ） 老师端（VIP、开通会员 PINAO_ROOM、琴房时长）", required = true)
+    @ApiModelProperty(value = "订单类型: 学生端（ VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名 ） 老师端（VIP、开通会员 PINAO_ROOM、琴房时长 ACTI_REGIST 活动报名）", required = true)
     private OrderTypeEnum orderType;
     @ApiModelProperty(value = "订单描述信息 ")
     private String orderDesc;
@@ -61,7 +61,7 @@ public class OrderReq {
         @ApiModelProperty(value = "订单详情号", hidden = true)
         private String subOrderNo;
         @NotNull(message = "商品类型不能为空")
-        @ApiModelProperty(value = "商品类型: 学生端（ VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播） 老师端（ PINAO_ROOM、琴房时长）", required = true)
+        @ApiModelProperty(value = "商品类型: 学生端（ VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名） 老师端（ PINAO_ROOM、琴房时长 ACTI_REGIST 活动报名）", required = true)
         private GoodTypeEnum goodType;
         @ApiModelProperty("商品名称 ")
         private String goodName;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityEvaluationRecordSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityEvaluationRecordSearch对象", description = "评测活动参与记录表查询对象")
+public class ActivityEvaluationRecordSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityEvaluationSearch.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityEvaluationSearch对象", description = "评测活动表查询对象")
+public class ActivityEvaluationSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "活动id",required = true)
+	@NotNull(message = "活动id不能为空")
+	private Long activityId;
+
+	public Long getActivityId() {
+		return activityId;
+	}
+
+	public void setActivityId(Long activityId) {
+		this.activityId = activityId;
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityPlanSearch.java

@@ -0,0 +1,74 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Date;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityPlanSearch对象", description = "活动计划表查询对象")
+public class ActivityPlanSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty("活动名称 ")
+	private String activityName;
+	@ApiModelProperty("创建状态 0 正式 1 草稿 ")
+	private Integer draftFlag;
+	@ApiModelProperty("活动状态 0 停用 1 启用 ")
+	private Integer activityState;
+	@ApiModelProperty(value = "活动开始时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date startTime;
+	@ApiModelProperty(value = "活动结束时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date endTime;
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public Integer getDraftFlag() {
+		return draftFlag;
+	}
+
+	public void setDraftFlag(Integer draftFlag) {
+		this.draftFlag = draftFlag;
+	}
+
+	public Integer getActivityState() {
+		return activityState;
+	}
+
+	public void setActivityState(Integer activityState) {
+		this.activityState = activityState;
+	}
+
+	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;
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRegistrationSearch.java

@@ -0,0 +1,68 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityRegistrationSearch对象", description = "活动报名表查询对象")
+public class ActivityRegistrationSearch extends QueryInfo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "活动id", required = true)
+    @NotNull(message = "活动id不能为空")
+    private Long activityId;
+    @ApiModelProperty(value = "活动类型 EVALUATION 评测活动 ", required = true)
+    @NotNull(message = "活动类型不能为空")
+    private ActivityTypeEnum activityType;
+    /**
+     * 曲目id
+     */
+    @ApiModelProperty(value = "曲目id集合")
+    private List<Long> musicSheetIds;
+    /**
+     * 是否获奖 0 否 1 是
+     */
+    @ApiModelProperty(value = "是否获奖 0 否 1 是")
+    private YesOrNoEnum rewardFlag;
+
+    public ActivityTypeEnum getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(ActivityTypeEnum activityType) {
+        this.activityType = activityType;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public List<Long> getMusicSheetIds() {
+        return musicSheetIds;
+    }
+
+    public void setMusicSheetIds(List<Long> musicSheetIds) {
+        this.musicSheetIds = musicSheetIds;
+    }
+
+    public YesOrNoEnum getRewardFlag() {
+        return rewardFlag;
+    }
+
+    public void setRewardFlag(YesOrNoEnum rewardFlag) {
+        this.rewardFlag = rewardFlag;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRewardSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityRewardSearch对象", description = "活动奖品表查询对象")
+public class ActivityRewardSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityUserRewardSearch.java

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityUserRewardSearch对象", description = "活动用户获奖表查询对象")
+public class ActivityUserRewardSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/CourseGroupSearch.java

@@ -51,6 +51,9 @@ public class CourseGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "老师id")
     private Long teacherId;
 
+    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
+    private Integer shelvesFlag;
+
     public Long getStudentId() {
         return studentId;
     }
@@ -140,4 +143,12 @@ public class CourseGroupSearch extends QueryInfo {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public Integer getShelvesFlag() {
+        return shelvesFlag;
+    }
+
+    public void setShelvesFlag(Integer shelvesFlag) {
+        this.shelvesFlag = shelvesFlag;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -48,12 +48,48 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
+    @ApiModelProperty("活动id（活动添加曲目列表必传）")
+    private Long activityId;
+
     @ApiModelProperty(value = "假删除 false : 未删除 true：已删除",hidden = true)
     private Boolean delFlag = false;
 
     @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
+    @ApiModelProperty(value = "查看我自己的曲目")
+    private Boolean myself;
+
+
+    @ApiModelProperty(value = "是否置顶(0:否;1:是)")
+    private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
+
+    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
+    private YesOrNoEnum auditVersion;
+
+    public YesOrNoEnum getAuditVersion() {
+        return auditVersion;
+    }
+
+    public void setAuditVersion(YesOrNoEnum auditVersion) {
+        this.auditVersion = auditVersion;
+    }
+
+    public YesOrNoEnum getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(YesOrNoEnum topFlag) {
+        this.topFlag = topFlag;
+    }
+
+    public Boolean getMyself() {
+        return myself;
+    }
+
+    public void setMyself(Boolean myself) {
+        this.myself = myself;
+    }
 
     public ChargeTypeEnum getChargeType() {
         return chargeType;
@@ -148,4 +184,12 @@ public class MusicSheetSearch  extends QueryInfo{
     public void setSourceType(SourceTypeEnum sourceType) {
         this.sourceType = sourceType;
     }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -17,7 +17,7 @@ public class OrderSearch extends QueryInfo{
 	private String searchNo;
 	@ApiModelProperty("下单应用：STUDENT 学生端 TEACHER 老师端")
 	private String orderClient;
-	@ApiModelProperty("交易类型:  VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 （多选用,分割）")
+	@ApiModelProperty("交易类型:  VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）")
 	private String orderType;
 	@ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 FAIL 支付失败 （多选用,分割）")
 	private String status;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/PianoRoomChangeRecordSearch.java

@@ -0,0 +1,83 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 16:44:34
+ */
+@ApiModel(value = "PianoRoomChangeRecordSearch对象", description = "琴房时长变更记录表查询对象")
+public class PianoRoomChangeRecordSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("用户id ")
+	private Long userId;
+
+	@ApiModelProperty("操作类型：IN、增加 OUT、减少 ")
+	private InOrOutEnum inOrOut;
+
+	@ApiModelProperty("操作人")
+	private String operaUser;
+
+	@ApiModelProperty(value = "交易开始时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime startTime;
+
+	@ApiModelProperty(value = "交易结束时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime endTime;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public InOrOutEnum getInOrOut() {
+		return inOrOut;
+	}
+
+	public void setInOrOut(InOrOutEnum inOrOut) {
+		this.inOrOut = inOrOut;
+	}
+
+	public String getOperaUser() {
+		return operaUser;
+	}
+
+	public void setOperaUser(String operaUser) {
+		this.operaUser = operaUser;
+	}
+
+	public LocalDateTime getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(LocalDateTime startTime) {
+		if(null != startTime){
+			this.startTime = LocalDateTime.of(startTime.toLocalDate(), LocalTime.MIN);
+		}
+	}
+
+	public LocalDateTime getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(LocalDateTime endTime) {
+		if(null != endTime){
+			this.endTime = LocalDateTime.of(endTime.toLocalDate(), LocalTime.MAX);
+		}
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/PlatformCashAccountRecordSearch.java

@@ -20,7 +20,8 @@ public class PlatformCashAccountRecordSearch extends QueryInfo {
 	@ApiModelProperty("收支类型（IN-收入  OUT-支出）")
 	private String inOrOut;
 
-	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ")
+	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 ACTI_REGIST、活动报名 WITHDRAWAL、提现 " +
+			"LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ACTI_REGIST_SHARE、活动报名分润 ")
 	private AccountBizTypeEnum bizType;
 
 	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/QueryMyFollowSearch.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value = "QueryMyFollowSearch")
+public class QueryMyFollowSearch extends QueryInfo {
+    @ApiModelProperty(value = "查询用户id",hidden = true)
+    private Long userId;
+    @ApiModelProperty(value = "老师名称")
+    private String username;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentMusicSheetSearch.java

@@ -26,8 +26,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     private ClientEnum userType;
 
 
-    @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
-    private YesOrNoEnum auditVersion;
 
     @ApiModelProperty(value = "版本号")
     private String version;
@@ -36,8 +34,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     private String platform;
 
 
-    @ApiModelProperty(value = "查看我自己的曲目",required = true)
-    private Boolean myself = true;
 
     public ClientEnum getUserType() {
         return userType;
@@ -47,21 +43,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
         this.userType = userType;
     }
 
-    public Boolean getMyself() {
-        return myself;
-    }
-
-    public void setMyself(Boolean myself) {
-        this.myself = myself;
-    }
-
-    public YesOrNoEnum getAuditVersion() {
-        return auditVersion;
-    }
-
-    public void setAuditVersion(YesOrNoEnum auditVersion) {
-        this.auditVersion = auditVersion;
-    }
 
     public String getVersion() {
         return version;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserAccountRecordSearch.java

@@ -32,7 +32,8 @@ public class UserAccountRecordSearch extends QueryInfo{
 	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
 	private PostStatusEnum postStatus;
 
-	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ")
+	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 ACTI_REGIST、活动报名 WITHDRAWAL、提现 " +
+			"LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ACTI_REGIST_SHARE、活动报名分润 ")
 	private AccountBizTypeEnum bizType;
 
 	@ApiModelProperty("查询时间（yyyy-mm） ")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoGroupSearch.java

@@ -23,6 +23,9 @@ public class VideoGroupSearch extends QueryInfo {
     @ApiModelProperty("声部id")
     private Integer subjectId;
 
+    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
+    private Integer shelvesFlag;
+
     @ApiModelProperty(value = "审核状态(DOING:待审核 PASS:通过 UNPASS:未通过)")
     private String auditStatus;
 
@@ -60,6 +63,14 @@ public class VideoGroupSearch extends QueryInfo {
         this.subjectId = subjectId;
     }
 
+    public Integer getShelvesFlag() {
+        return shelvesFlag;
+    }
+
+    public void setShelvesFlag(Integer shelvesFlag) {
+        this.shelvesFlag = shelvesFlag;
+    }
+
     public String getAuditStatus() {
         return auditStatus;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonGroupSearch.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -12,8 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
 public class VideoLessonGroupSearch extends QueryInfo {
-    @ApiModelProperty(value = "审核状态(DOING:待审核 PASS:通过 UNPASS:未通过)")
-    private AuthStatusEnum auditStatus;
+    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
+    private Integer shelvesFlag;
+
+    @ApiModelProperty(value = "审核状态(DOING:审核中 PASS:已上架 UNPASS:审核失败 OUT_SALE: 下架)")
+    private String auditStatus;
 
     @ApiModelProperty(value = "视频课组id")
     private Long groupId;
@@ -54,6 +56,14 @@ public class VideoLessonGroupSearch extends QueryInfo {
     @ApiModelProperty("当前课程组id（查看其他课程时，筛选掉）")
     private Long videoLessonGroupId;
 
+    public Integer getShelvesFlag() {
+        return shelvesFlag;
+    }
+
+    public void setShelvesFlag(Integer shelvesFlag) {
+        this.shelvesFlag = shelvesFlag;
+    }
+
     public Long getVideoLessonGroupId() {
         return videoLessonGroupId;
     }
@@ -110,11 +120,11 @@ public class VideoLessonGroupSearch extends QueryInfo {
         this.studentId = studentId;
     }
 
-    public AuthStatusEnum getAuditStatus() {
+    public String getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuthStatusEnum auditStatus) {
+    public void setAuditStatus(String auditStatus) {
         this.auditStatus = auditStatus;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonSearch.java

@@ -48,6 +48,9 @@ public class VideoLessonSearch extends QueryInfo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
+    @ApiModelProperty(value = "是否上架 （0:否  1：是）")
+    private Integer shelvesFlag;
+
     public Long getVideoLessonGroupId() {
         return videoLessonGroupId;
     }
@@ -113,4 +116,12 @@ public class VideoLessonSearch extends QueryInfo {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public Integer getShelvesFlag() {
+        return shelvesFlag;
+    }
+
+    public void setShelvesFlag(Integer shelvesFlag) {
+        this.shelvesFlag = shelvesFlag;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityEvaluation.java

@@ -0,0 +1,80 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 评测活动表
+ */
+@TableName("activity_evaluation")
+@ApiModel(value = "ActivityEvaluation对象", description = "评测活动表")
+public class ActivityEvaluation implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("活动id ")
+    @TableField(value = "activity_id_")
+    private Long activityId;
+    @ApiModelProperty("曲目id ")
+    @TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    @ApiModelProperty("创建时间 ")
+    @TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+    @TableField(value = "create_by_")
+    private Long createBy;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityEvaluationRecord.java

@@ -0,0 +1,91 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 评测活动参与记录表
+ */
+@TableName("activity_evaluation_record")
+@ApiModel(value = "ActivityEvaluationRecord对象", description = "评测活动参与记录表")
+public class ActivityEvaluationRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("活动id ")
+    @TableField(value = "activity_id_")
+    private Long activityId;
+    @ApiModelProperty("用户id ")
+    @TableField(value = "user_id_")
+    private Long userId;
+    @ApiModelProperty("评测活动id ")
+    @TableField(value = "evaluation_id_")
+    private Long evaluationId;
+    @ApiModelProperty("分数 ")
+    @TableField(value = "score_")
+    private Double score;
+    @ApiModelProperty("创建时间 ")
+    @TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getEvaluationId() {
+        return evaluationId;
+    }
+
+    public void setEvaluationId(Long evaluationId) {
+        this.evaluationId = evaluationId;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlan.java

@@ -0,0 +1,278 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
+import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 活动计划表
+ */
+@TableName("activity_plan")
+@ApiModel(value = "ActivityPlan对象", description = "活动计划表")
+public class ActivityPlan implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty(value = "活动类型 EVALUATION 评测活动 ",required = true)
+	@TableField(value = "activity_type_")
+    @NotNull(message = "活动类型不能为空")
+    private ActivityTypeEnum activityType;
+    @ApiModelProperty("活动名称 ")
+	@TableField(value = "activity_name_")
+    @NotBlank(message = "活动名称不能为空")
+    private String activityName;
+    @ApiModelProperty("活动描述 ")
+	@TableField(value = "describe_")
+    @NotBlank(message = "活动描述不能为空")
+    private String describe;
+    @ApiModelProperty("规则描述 ")
+	@TableField(value = "rule_describe_")
+    @NotBlank(message = "活动规则不能为空")
+    private String ruleDescribe;
+    @ApiModelProperty("主题图片 ")
+	@TableField(value = "subject_url_")
+    @NotBlank(message = "主题图片不能为空")
+    private String subjectUrl;
+    @ApiModelProperty("平铺背景 ")
+	@TableField(value = "background_url_")
+    @NotBlank(message = "平铺背景不能为空")
+    private String backgroundUrl;
+    @ApiModelProperty("分享图片 ")
+    @TableField(value = "share_url_")
+    @NotBlank(message = "分享图片不能为空")
+    private String shareUrl;
+    @ApiModelProperty("活动链接 ")
+    @TableField(value = "activity_url_")
+    private String activityUrl;
+    @ApiModelProperty("活动时间-开始 ")
+	@TableField(value = "activity_start_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @NotNull(message = "活动开始时间不能为空")
+    private Date activityStart;
+    @ApiModelProperty("活动时间-结束 ")
+	@TableField(value = "activity_end_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @NotNull(message = "活动结束时间不能为空")
+    private Date activityEnd;
+    @ApiModelProperty("报名方式 FREE 免费 CHARGE 收费 ")
+	@TableField(value = "registration_method_")
+    @NotNull(message = "报名缴费方式不能为空")
+    private RegistrationMethodEnum registrationMethod;
+    @ApiModelProperty("报名价格 ")
+	@TableField(value = "registration_price_")
+    private BigDecimal registrationPrice;
+    @ApiModelProperty("分润比例 ")
+    @TableField(value = "share_rate_")
+    private BigDecimal shareRate;
+    @ApiModelProperty("创建状态 0 正式 1 草稿 ")
+	@TableField(value = "draft_flag_")
+    private Integer draftFlag;
+    @ApiModelProperty("活动状态 0 停用 1 启用 ")
+	@TableField(value = "activity_state_")
+    private Integer activityState;
+    @ApiModelProperty("发奖状态 0 未发奖 1 已发奖 ")
+    @TableField(value = "reward_flag_")
+    private Integer rewardFlag;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public ActivityTypeEnum getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(ActivityTypeEnum activityType) {
+        this.activityType = activityType;
+    }
+    
+	public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+    
+	public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+    
+	public String getRuleDescribe() {
+        return ruleDescribe;
+    }
+
+    public void setRuleDescribe(String ruleDescribe) {
+        this.ruleDescribe = ruleDescribe;
+    }
+    
+	public String getSubjectUrl() {
+        return subjectUrl;
+    }
+
+    public void setSubjectUrl(String subjectUrl) {
+        this.subjectUrl = subjectUrl;
+    }
+    
+	public String getBackgroundUrl() {
+        return backgroundUrl;
+    }
+
+    public void setBackgroundUrl(String backgroundUrl) {
+        this.backgroundUrl = backgroundUrl;
+    }
+    
+	public Date getActivityStart() {
+        return activityStart;
+    }
+
+    public void setActivityStart(Date activityStart) {
+        this.activityStart = activityStart;
+    }
+    
+	public Date getActivityEnd() {
+        return activityEnd;
+    }
+
+    public void setActivityEnd(Date activityEnd) {
+        this.activityEnd = activityEnd;
+    }
+    
+	public RegistrationMethodEnum getRegistrationMethod() {
+        return registrationMethod;
+    }
+
+    public void setRegistrationMethod(RegistrationMethodEnum registrationMethod) {
+        this.registrationMethod = registrationMethod;
+    }
+    
+	public BigDecimal getRegistrationPrice() {
+        return registrationPrice;
+    }
+
+    public void setRegistrationPrice(BigDecimal registrationPrice) {
+        this.registrationPrice = registrationPrice;
+    }
+    
+	public Integer getDraftFlag() {
+        return draftFlag;
+    }
+
+    public void setDraftFlag(Integer draftFlag) {
+        this.draftFlag = draftFlag;
+    }
+    
+	public Integer getActivityState() {
+        return activityState;
+    }
+
+    public void setActivityState(Integer activityState) {
+        this.activityState = activityState;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+	public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getActivityUrl() {
+        return activityUrl;
+    }
+
+    public void setActivityUrl(String activityUrl) {
+        this.activityUrl = activityUrl;
+    }
+
+    public String getShareUrl() {
+        return shareUrl;
+    }
+
+    public void setShareUrl(String shareUrl) {
+        this.shareUrl = shareUrl;
+    }
+
+    public BigDecimal getShareRate() {
+        return shareRate;
+    }
+
+    public void setShareRate(BigDecimal shareRate) {
+        this.shareRate = shareRate;
+    }
+
+    public Integer getRewardFlag() {
+        return rewardFlag;
+    }
+
+    public void setRewardFlag(Integer rewardFlag) {
+        this.rewardFlag = rewardFlag;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlanEvaluation.java

@@ -0,0 +1,94 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.common.enums.HardLevelEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 活动计划-评测活动拓展字段表
+ */
+@TableName("activity_plan_evaluation")
+@ApiModel(value = "ActivityPlanEvaluation对象", description = "活动计划-评测活动拓展字段表")
+public class ActivityPlanEvaluation implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键(活动id) ")
+    @TableId(value = "id_")
+    private Long id;
+    @ApiModelProperty("评测难度 BEGINNER 入门级 ADVANCED 进阶级 PERFORMER 大师级 ")
+	@TableField(value = "evaluation_difficulty_")
+    private HardLevelEnum evaluationDifficulty;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public HardLevelEnum getEvaluationDifficulty() {
+        return evaluationDifficulty;
+    }
+
+    public void setEvaluationDifficulty(HardLevelEnum evaluationDifficulty) {
+        this.evaluationDifficulty = evaluationDifficulty;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+	public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityRegistration.java

@@ -0,0 +1,91 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 活动报名表
+ */
+@TableName("activity_registration")
+@ApiModel(value = "ActivityRegistration对象", description = "活动报名表")
+public class ActivityRegistration implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("活动id ")
+	@TableField(value = "activity_id_")
+    private Long activityId;
+    @ApiModelProperty("用户id ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    @ApiModelProperty("订单号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    @ApiModelProperty("订单详情号 ")
+	@TableField(value = "sub_order_no_")
+    private String subOrderNo;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+    
+	public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    
+	public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    
+	public String getSubOrderNo() {
+        return subOrderNo;
+    }
+
+    public void setSubOrderNo(String subOrderNo) {
+        this.subOrderNo = subOrderNo;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityReward.java

@@ -0,0 +1,132 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 活动奖品表
+ */
+@TableName("activity_reward")
+@ApiModel(value = "ActivityReward对象", description = "活动奖品表")
+public class ActivityReward implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("活动id ")
+	@TableField(value = "activity_id_")
+    @NotNull(message = "活动id不能为空")
+    private Long activityId;
+    @ApiModelProperty("奖品名称 ")
+	@TableField(value = "reward_name_")
+    @NotBlank(message = "奖品名称不能为空")
+    private String rewardName;
+    @ApiModelProperty("奖品描述 ")
+	@TableField(value = "reward_describe_")
+    @NotBlank(message = "奖品描述不能为空")
+    private String rewardDescribe;
+    @ApiModelProperty("奖品图片 ")
+	@TableField(value = "img_url_")
+    @NotBlank(message = "奖品图片不能为空")
+    private String imgUrl;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    @ApiModelProperty("更新时间 ")
+    @TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    @ApiModelProperty("更新人 ")
+    @TableField(value = "update_by_")
+    private Long updateBy;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+    
+	public String getRewardName() {
+        return rewardName;
+    }
+
+    public void setRewardName(String rewardName) {
+        this.rewardName = rewardName;
+    }
+    
+	public String getRewardDescribe() {
+        return rewardDescribe;
+    }
+
+    public void setRewardDescribe(String rewardDescribe) {
+        this.rewardDescribe = rewardDescribe;
+    }
+    
+	public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityUserReward.java

@@ -0,0 +1,115 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 活动用户获奖表
+ */
+@TableName("activity_user_reward")
+@ApiModel(value = "ActivityUserReward对象", description = "活动用户获奖表")
+public class ActivityUserReward implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("活动id ")
+    @TableField(value = "activity_id_")
+    private Long activityId;
+    @ApiModelProperty("活动具体项目id ")
+    @TableField(value = "biz_id_")
+    private Long bizId;
+    @ApiModelProperty("用户id ")
+    @TableField(value = "user_id_")
+    private Long userId;
+    @ApiModelProperty("奖品id ")
+    @TableField(value = "reward_id_")
+    private Long rewardId;
+    @ApiModelProperty("是否领取奖品 0 否 1 是 ")
+    @TableField(value = "receive_flag_")
+    private Integer receiveFlag;
+    @ApiModelProperty("创建时间 ")
+    @TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("更新时间 ")
+    @TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
+    public Integer getReceiveFlag() {
+        return receiveFlag;
+    }
+
+    public void setReceiveFlag(Integer receiveFlag) {
+        this.receiveFlag = receiveFlag;
+    }
+
+    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;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseGroup.java

@@ -61,9 +61,13 @@ public class CourseGroup implements Serializable {
     private BigDecimal coursePrice;
 
     @TableField("status_")
-    @ApiModelProperty(value = "课程组状态 ING进行中 COMPLETE已完成 DISSOLVE-未成课(解散课程) CANCEL已取消-未开始报名前可取消 APPLY报名中 NOT_SALE未开售")
+    @ApiModelProperty(value = "课程组状态 ING进行中 COMPLETE已完成 DISSOLVE-未成课(解散课程) CANCEL已取消-未开始报名前可取消 APPLY报名中 NOT_SALE未开售 OUT_SALE:下架")
     private String status;
 
+    @TableField("reason_")
+    @ApiModelProperty(value = "曲目停用原因")
+    private String reason;
+
     @TableField("sales_start_date_")
     @ApiModelProperty(value = "课程组售卖开始日期")
     private Date salesStartDate;
@@ -112,6 +116,14 @@ public class CourseGroup implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updatedTime;
 
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public Long getId() {
         return id;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseScheduleStudent.java

@@ -1,54 +0,0 @@
-//package com.yonge.cooleshow.biz.dal.entity;
-//
-//import com.baomidou.mybatisplus.annotation.IdType;
-//import com.baomidou.mybatisplus.annotation.TableField;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import io.swagger.annotations.ApiModel;
-//import io.swagger.annotations.ApiModelProperty;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * @Author: cy
-// * @Date: 2022/5/26
-// */
-//@ApiModel
-//public class CourseScheduleStudent implements Serializable {
-//    @TableId(value = "id_", type = IdType.AUTO)
-//    @ApiModelProperty(value = "主键")
-//    private Long id;
-//
-//    @TableField("course_id_")
-//    @ApiModelProperty(value = "课程id")
-//    private Long courseId;
-//
-//    @TableField("student_id_")
-//    @ApiModelProperty(value = "学生id")
-//    private Long studentId;
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public Long getCourseId() {
-//        return courseId;
-//    }
-//
-//    public void setCourseId(Long courseId) {
-//        this.courseId = courseId;
-//    }
-//
-//    public Long getStudentId() {
-//        return studentId;
-//    }
-//
-//    public void setStudentId(Long studentId) {
-//        this.studentId = studentId;
-//    }
-//}
-//

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -93,6 +93,10 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
 	private YesOrNoEnum state;
 
+	@TableField("reason_")
+	@ApiModelProperty(value = "曲目停用原因")
+	private String reason;
+
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
     private AuthStatusEnum auditStatus;
@@ -179,6 +183,14 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "假删除标识 0：未删除 1：已删除")
 	private Boolean delFlag;
 
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
 	public String getExtConfigJson() {
 		return extConfigJson;
 	}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PianoRoomBuyRecord.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -48,7 +49,18 @@ public class PianoRoomBuyRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-	public Long getId() {
+    public PianoRoomBuyRecord() {
+    }
+
+    public PianoRoomBuyRecord(Long userId, Long settingsId, String orderNo, String subOrderNo, Integer times) {
+        this.userId = userId;
+        this.settingsId = settingsId;
+        this.orderNo = orderNo;
+        this.subOrderNo = subOrderNo;
+        this.times = times;
+    }
+
+    public Long getId() {
         return id;
     }
 
@@ -111,5 +123,5 @@ public class PianoRoomBuyRecord implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PianoRoomChangeRecord.java

@@ -0,0 +1,112 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
+
+/**
+ * 琴房时长变更记录表
+ */
+@TableName("piano_room_change_record")
+@ApiModel(value = "PianoRoomChangeRecord对象", description = "琴房时长变更记录表")
+public class PianoRoomChangeRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("购买记录id ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("用户id ")
+	@TableField(value = "user_id_")
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+    @ApiModelProperty("时长（分） ")
+	@TableField(value = "times_")
+    @NotNull(message = "时长不能为空")
+    @Positive(message = "时长必须大于0")
+    private Integer times;
+    @ApiModelProperty("操作类型：IN、增加 OUT、减少 ")
+	@TableField(value = "in_or_out_")
+    @NotNull(message = "操作类型不能为空")
+    private InOrOutEnum inOrOut;
+    @ApiModelProperty("原因 ")
+	@TableField(value = "reason_")
+    @NotBlank(message = "原因不能为空")
+    private String reason;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+    @TableField(value = "create_by_")
+    private Long createBy;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    
+	public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+    
+	public InOrOutEnum getInOrOut() {
+        return inOrOut;
+    }
+
+    public void setInOrOut(InOrOutEnum inOrOut) {
+        this.inOrOut = inOrOut;
+    }
+    
+	public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PianoRoomTime.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @Date: 2022/5/26
  */
 @ApiModel
+@TableName("piano_room_time")
 public class PianoRoomTime implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "主键")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PlatformCashAccountRecord.java

@@ -44,11 +44,11 @@ public class PlatformCashAccountRecord implements Serializable {
     private PostStatusEnum postStatus;
 
     @TableField("biz_type_")
-    @ApiModelProperty(value = "业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱")
+    @ApiModelProperty(value = "业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 VIP、会员充值 MALL、商品购买 PIAON_ROOM、琴房充值 ACTI_REGIST、活动报名 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润  MUSIC_SHARE、乐谱分润  VIP_SHARE、会员分润  MALL_SHARE、商品分润")
     private AccountBizTypeEnum bizType;
 
     @TableField("biz_id_")
-    @ApiModelProperty(value = "业务id(陪练课,直播课course_schedule_id_ | 视频课,乐谱为课程组曲子id | 提现为提现记录id)")
+    @ApiModelProperty(value = "业务id(PRACTICE,LIVE,LIVE_SHARE为课程组id | VIDEO,VIDEO_SHARE为视频组id |MUSIC,MUSIC_SHARE为曲谱id | VIP,VIP_SHARE,PIAON_ROOM为会员琴房价格表id | MALL,MALL_SHARE为商品id | ACTI_REGIST为活动id )")
     private Long bizId;
 
     @TableField("memo_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -31,6 +31,9 @@ public class Subject implements Serializable {
 	
 	@ApiModelProperty(value = "图片地址",required = false)
 	private String img;
+
+	@ApiModelProperty("声部默认频率")
+	private Integer aiDefaultFrequency;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -48,6 +51,14 @@ public class Subject implements Serializable {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
 
+	public Integer getAiDefaultFrequency() {
+		return aiDefaultFrequency;
+	}
+
+	public void setAiDefaultFrequency(Integer aiDefaultFrequency) {
+		this.aiDefaultFrequency = aiDefaultFrequency;
+	}
+
 	public List<Subject> getSubjects() {
 		return subjects;
 	}