Merge branch 'dev_1_2_20220802'

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-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/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("锁用户结算"),
 
-
     ;
     /***
      * 缓存描述

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/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/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-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanDao.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.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-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
+	 */
+	ActivityPlanVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
+	 */
+	List<ActivityPlanVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanSearch activityPlan);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityProjectDao.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.ActivityProject;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
+
+
+public interface ActivityProjectDao extends BaseMapper<ActivityProject>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo
+	 */
+	ActivityProjectVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo
+	 */
+	List<ActivityProjectVo> selectPage(@Param("page") IPage page, @Param("param") ActivityProjectSearch activityProject);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityProjectRecordDao.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.ActivityProjectRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
+
+
+public interface ActivityProjectRecordDao extends BaseMapper<ActivityProjectRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo
+	 */
+	ActivityProjectRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo
+	 */
+	List<ActivityProjectRecordVo> selectPage(@Param("page") IPage page, @Param("param") ActivityProjectRecordSearch activityProjectRecord);
+	
+}

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-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
+	 */
+	ActivityRegistrationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @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,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.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-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
+	 */
+	ActivityRewardVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @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/ActivityUserAwardDao.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.ActivityUserAward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
+
+
+public interface ActivityUserAwardDao extends BaseMapper<ActivityUserAward>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo
+	 */
+	ActivityUserAwardVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 10:36:44
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo
+	 */
+	List<ActivityUserAwardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserAwardSearch activityUserAward);
+	
+}

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<MyFollow> page, @Param("param") QueryMyFollowSearch query);
 
 }

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

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

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

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

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

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

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-03 10:36:44
+ */
+@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,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityRewardDto对象", description = "活动奖品表数据传输对象")
+public class ActivityRewardDto extends ActivityReward{
+	private static final long serialVersionUID = 1L;
+}

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

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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityPlanSearch.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-03 10:36:44
+ */
+@ApiModel(value = "ActivityPlanSearch对象", description = "活动计划表查询对象")
+public class ActivityPlanSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityProjectRecordSearch.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-03 10:36:44
+ */
+@ApiModel(value = "ActivityProjectRecordSearch对象", description = "活动项目参与记录表查询对象")
+public class ActivityProjectRecordSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityProjectSearch.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-03 10:36:44
+ */
+@ApiModel(value = "ActivityProjectSearch对象", description = "活动项目表查询对象")
+public class ActivityProjectSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRegistrationSearch.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-03 10:36:44
+ */
+@ApiModel(value = "ActivityRegistrationSearch对象", description = "活动报名表查询对象")
+public class ActivityRegistrationSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

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-03 10:36:44
+ */
+@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/ActivityUserAwardSearch.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-03 10:36:44
+ */
+@ApiModel(value = "ActivityUserAwardSearch对象", description = "活动用户获奖表查询对象")
+public class ActivityUserAwardSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+}

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/entity/ActivityPlan.java

@@ -0,0 +1,230 @@
+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 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("活动类型 EVALUATION 评测活动 ")
+	@TableField(value = "activity_type_")
+    private String activityType;
+    @ApiModelProperty("活动名称 ")
+	@TableField(value = "activity_name_")
+    private String activityName;
+    @ApiModelProperty("活动描述 ")
+	@TableField(value = "describe_")
+    private String describe;
+    @ApiModelProperty("规则描述 ")
+	@TableField(value = "rule_describe_")
+    private String ruleDescribe;
+    @ApiModelProperty("主题图片 ")
+	@TableField(value = "subject_url_")
+    private String subjectUrl;
+    @ApiModelProperty("平铺背景 ")
+	@TableField(value = "background_url_")
+    private String backgroundUrl;
+    @ApiModelProperty("活动时间-开始 ")
+	@TableField(value = "activity_start_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    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")
+    private Date activityEnd;
+    @ApiModelProperty("报名方式 FREE 免费 CHARGE 收费 ")
+	@TableField(value = "registration_method_")
+    private String registrationMethod;
+    @ApiModelProperty("报名价格 ")
+	@TableField(value = "registration_price_")
+    private BigDecimal registrationPrice;
+    @ApiModelProperty("评测难度 BEGINNER 入门级 ADVANCED 进阶级 PERFORMER 大师级 ")
+	@TableField(value = "evaluation_difficulty_")
+    private String evaluationDifficulty;
+    @ApiModelProperty("创建状态 0 正式 1 草稿 ")
+	@TableField(value = "draft_flag_")
+    private Integer draftFlag;
+    @ApiModelProperty("活动状态 0 停用 1 启用 ")
+	@TableField(value = "activity_state_")
+    private Integer activityState;
+    @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 String getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(String 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 String getRegistrationMethod() {
+        return registrationMethod;
+    }
+
+    public void setRegistrationMethod(String registrationMethod) {
+        this.registrationMethod = registrationMethod;
+    }
+    
+	public BigDecimal getRegistrationPrice() {
+        return registrationPrice;
+    }
+
+    public void setRegistrationPrice(BigDecimal registrationPrice) {
+        this.registrationPrice = registrationPrice;
+    }
+    
+	public String getEvaluationDifficulty() {
+        return evaluationDifficulty;
+    }
+
+    public void setEvaluationDifficulty(String evaluationDifficulty) {
+        this.evaluationDifficulty = evaluationDifficulty;
+    }
+    
+	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;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityProject.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_project")
+@ApiModel(value = "ActivityProject对象", description = "活动项目表")
+public class ActivityProject 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("业务类型 MUSIC 曲目 ")
+	@TableField(value = "biz_type_")
+    private String bizType;
+    @ApiModelProperty("业务id(曲目id) ")
+	@TableField(value = "biz_id_")
+    private Long bizId;
+    @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 String getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(String bizType) {
+        this.bizType = bizType;
+    }
+    
+	public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+    
+	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/ActivityProjectRecord.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_project_record")
+@ApiModel(value = "ActivityProjectRecord对象", description = "活动项目参与记录表")
+public class ActivityProjectRecord 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 = "project_id_")
+    private Long projectId;
+    @ApiModelProperty("用户id ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    @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 getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+    
+	public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    
+	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/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,102 @@
+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_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_")
+    private Long activityId;
+    @ApiModelProperty("奖品名称 ")
+	@TableField(value = "reward_name_")
+    private String rewardName;
+    @ApiModelProperty("奖品描述 ")
+	@TableField(value = "reward_describe_")
+    private String rewardDescribe;
+    @ApiModelProperty("奖品图片 ")
+	@TableField(value = "img_url_")
+    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;
+
+	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;
+    }
+    
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityUserAward.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_award")
+@ApiModel(value = "ActivityUserAward对象", description = "活动用户获奖表")
+public class ActivityUserAward 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 = "project_id_")
+    private Long projectId;
+    @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 getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+    
+	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/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/UserBankCard.java

@@ -55,7 +55,7 @@ public class UserBankCard implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
-    @ApiModelProperty("逻辑删除 ")
+    @ApiModelProperty("删除 ")
     @TableField(value = "del_flag_")
     private Boolean delFlag;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityPlanService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+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;
+
+/**
+ * 活动计划表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityPlanService extends IService<ActivityPlan>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityPlanVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityPlanVo> selectPage(IPage<ActivityPlanVo> page, ActivityPlanSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityProjectRecordService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
+
+/**
+ * 活动项目参与记录表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityProjectRecordService extends IService<ActivityProjectRecord>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityProjectRecordVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityProjectRecordVo> selectPage(IPage<ActivityProjectRecordVo> page, ActivityProjectRecordSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityProjectService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
+
+/**
+ * 活动项目表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityProjectService extends IService<ActivityProject>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityProjectVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityProjectVo> selectPage(IPage<ActivityProjectVo> page, ActivityProjectSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityRegistrationService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+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;
+
+/**
+ * 活动报名表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityRegistrationService extends IService<ActivityRegistration>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityRegistrationVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityRegistrationVo> selectPage(IPage<ActivityRegistrationVo> page, ActivityRegistrationSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityRewardService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+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;
+
+/**
+ * 活动奖品表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityRewardService extends IService<ActivityReward>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityRewardVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityUserAwardService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
+
+/**
+ * 活动用户获奖表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface ActivityUserAwardService extends IService<ActivityUserAward>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	ActivityUserAwardVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<ActivityUserAwardVo> selectPage(IPage<ActivityUserAwardVo> page, ActivityUserAwardSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentService.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+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;
@@ -75,10 +76,10 @@ public interface StudentService extends IService<Student> {
      * 我的关注
      *
      * @param page
-     * @param studentId
+     * @param query
      * @return
      */
-    IPage<MyFollow> queryMyFollow(IPage<MyFollow> page, Long studentId);
+    IPage<MyFollow> queryMyFollow(IPage<MyFollow> page, QueryMyFollowSearch query);
 
     /**
      * 学院绑定老师

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+import com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+
+
+@Service
+public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, ActivityPlan> implements ActivityPlanService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityPlanServiceImpl.class);
+
+	@Override
+    public ActivityPlanVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityPlanVo> selectPage(IPage<ActivityPlanVo> page, ActivityPlanSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityProjectRecordServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityProjectRecordDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityProjectRecordService;
+
+
+@Service
+public class ActivityProjectRecordServiceImpl extends ServiceImpl<ActivityProjectRecordDao, ActivityProjectRecord> implements ActivityProjectRecordService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityProjectRecordServiceImpl.class);
+
+	@Override
+    public ActivityProjectRecordVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityProjectRecordVo> selectPage(IPage<ActivityProjectRecordVo> page, ActivityProjectRecordSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityProjectServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
+import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityProjectDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityProjectService;
+
+
+@Service
+public class ActivityProjectServiceImpl extends ServiceImpl<ActivityProjectDao, ActivityProject> implements ActivityProjectService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityProjectServiceImpl.class);
+
+	@Override
+    public ActivityProjectVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityProjectVo> selectPage(IPage<ActivityProjectVo> page, ActivityProjectSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRegistrationServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+import com.yonge.cooleshow.biz.dal.dao.ActivityRegistrationDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityRegistrationService;
+
+
+@Service
+public class ActivityRegistrationServiceImpl extends ServiceImpl<ActivityRegistrationDao, ActivityRegistration> implements ActivityRegistrationService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityRegistrationServiceImpl.class);
+
+	@Override
+    public ActivityRegistrationVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityRegistrationVo> selectPage(IPage<ActivityRegistrationVo> page, ActivityRegistrationSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+import com.yonge.cooleshow.biz.dal.dao.ActivityRewardDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
+
+
+@Service
+public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, ActivityReward> implements ActivityRewardService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityRewardServiceImpl.class);
+
+	@Override
+    public ActivityRewardVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityUserAwardServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityUserAwardDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserAwardService;
+
+
+@Service
+public class ActivityUserAwardServiceImpl extends ServiceImpl<ActivityUserAwardDao, ActivityUserAward> implements ActivityUserAwardService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityUserAwardServiceImpl.class);
+
+	@Override
+    public ActivityUserAwardVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityUserAwardVo> selectPage(IPage<ActivityUserAwardVo> page, ActivityUserAwardSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1123,7 +1123,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             teacherId = payment.getTeacherId();
             studentId = payment.getUserId();
         }
-        if(CollectionUtils.isNotEmpty(teacherSalaryList)){
+        if (CollectionUtils.isNotEmpty(teacherSalaryList)) {
             courseScheduleTeacherSalaryService.getDao().insertBatch(teacherSalaryList);
             log.info("buyPracticeCourseSuccess ok");
             //写老师账户
@@ -1730,18 +1730,21 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 recordDao.insertBatch(records);
 
                 //释放冻结课时
-                List<PianoRoomTime> roomTimeList = new ArrayList<>();
                 Map<Long, List<CourseScheduleRecord>> collect = records.stream().collect(Collectors.groupingBy(CourseScheduleRecord::getTeacherId, Collectors.toList()));
                 collect.forEach((key, list) -> {
-                    PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, key));
-                    Integer frozenTime = pianoRoomTime.getFrozenTime();
-
-                    PianoRoomTime roomTime = new PianoRoomTime();
-                    roomTime.setTeacherId(key);
-                    roomTime.setFrozenTime(frozenTime - list.stream().mapToInt(CourseScheduleRecord::getConsumTime).sum());
-                    roomTimeList.add(roomTime);
+                    //入琴房账户
+                    DistributedLock.of(redissonClient)
+                            .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(key)
+                                    , (o) -> {
+                                        PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, key));
+                                        Integer frozenTime = pianoRoomTime.getFrozenTime();
+
+                                        PianoRoomTime roomTime = new PianoRoomTime();
+                                        roomTime.setFrozenTime(frozenTime - list.stream().mapToInt(CourseScheduleRecord::getConsumTime).sum());
+                                        pianoRoomTimeDao.update(roomTime, Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, key));
+                                        return null;
+                                    }, null, 10l);
                 });
-                pianoRoomTimeDao.updateBatch(roomTimeList);
             }
 
             List<CourseScheduleStudentVo> courseList = userList.stream()
@@ -1979,10 +1982,26 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
 
         //扣减piano_room_time
-        PianoRoomTime roomTime = new PianoRoomTime();
-        roomTime.setRemainTime(remainTime - consumTime);
-        roomTime.setFrozenTime(frozenTime + consumTime);
-        pianoRoomTimeDao.update(roomTime, Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
+        DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(teacherId)
+                        , (o) -> {
+                            //校验时长
+                            PianoRoomTime pianoRoomTimeLock = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
+                            if (pianoRoomTimeLock == null) {
+                                throw new BizException("未查询到老师剩余时长");
+                            }
+                            Integer remainTimeLock = pianoRoomTimeLock.getRemainTime();
+                            Integer frozenTimeLock = pianoRoomTimeLock.getFrozenTime();
+                            if (consumTime > remainTimeLock) {
+                                throw new BizException("剩余时长不足");
+                            }
+
+                            PianoRoomTime roomTimeLock = new PianoRoomTime();
+                            roomTimeLock.setRemainTime(remainTimeLock - consumTime);
+                            roomTimeLock.setFrozenTime(frozenTimeLock + consumTime);
+                            pianoRoomTimeDao.update(roomTimeLock, Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
+                            return null;
+                        }, null, 10l);
 
         //创建群聊
         try {
@@ -2092,18 +2111,31 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
         Integer time = schedule.getSingleCourseTime() * n;//消耗时长 课程数*单课时长*人数
 
-        PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
-        if (pianoRoomTime == null) {
-            throw new BizException("未查到剩余时长");
-        }
-        if (pianoRoomTime.getFrozenTime() - time < 0) {
-            throw new BizException("冻结时长计算错误");
-        }
-        pianoRoomTimeDao.update(null, Wrappers.<PianoRoomTime>lambdaUpdate()
-                .eq(PianoRoomTime::getTeacherId, teacherId)
-                .set(PianoRoomTime::getRemainTime, pianoRoomTime.getRemainTime() + time)
-                .set(PianoRoomTime::getFrozenTime, pianoRoomTime.getFrozenTime() - time));
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("teacherId", teacherId);
+        paramMap.put("time", time);
 
+        //更新老师琴房时长账户
+        DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(teacherId)
+                        , (objectMap) -> {
+                            Long objectId = Long.parseLong(objectMap.get("teacherId").toString());
+                            Integer objectTime = Integer.parseInt(objectMap.get("time").toString());
+
+                            PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery()
+                                    .eq(PianoRoomTime::getTeacherId, objectId));
+                            if (pianoRoomTime == null) {
+                                throw new BizException("未查到剩余时长");
+                            }
+                            if (pianoRoomTime.getFrozenTime() - objectTime < 0) {
+                                throw new BizException("冻结时长计算错误");
+                            }
+                            pianoRoomTimeDao.update(null, Wrappers.<PianoRoomTime>lambdaUpdate()
+                                    .eq(PianoRoomTime::getTeacherId, objectId)
+                                    .set(PianoRoomTime::getRemainTime, pianoRoomTime.getRemainTime() + objectTime)
+                                    .set(PianoRoomTime::getFrozenTime, pianoRoomTime.getFrozenTime() - objectTime));
+                            return null;
+                        }, paramMap, 10l);
         //删除课程
         baseMapper.deleteById(courseId);
         //删除payment
@@ -2244,27 +2276,33 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             throw new BizException("未查到排课学员");
         }
 
-        PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
-        if (pianoRoomTime == null) {
-            throw new BizException("未查到剩余时长");
-        }
-        Integer frozenTime = pianoRoomTime.getFrozenTime();//冻结时长
-        Integer remainTime = pianoRoomTime.getRemainTime();//剩余时长
+        //更新老师琴房时长账户
+        DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(teacherId)
+                        , (o) -> {
+                            PianoRoomTime pianoRoomTime = pianoRoomTimeDao.selectOne(Wrappers.<PianoRoomTime>lambdaQuery().eq(PianoRoomTime::getTeacherId, teacherId));
+                            if (pianoRoomTime == null) {
+                                throw new BizException("未查到剩余时长");
+                            }
+                            Integer frozenTime = pianoRoomTime.getFrozenTime();//冻结时长
+                            Integer remainTime = pianoRoomTime.getRemainTime();//剩余时长
 
-        String formula = sysConfigService.findConfigValue(SysConfigConstant.PIANO_ROOM_TIME_FORMULA);
-        Integer after = (Integer) WrapperUtil.strToFormula(formula, "n", String.valueOf(studentIds.size() + 1));//变更后
-        Integer before = (Integer) WrapperUtil.strToFormula(formula, "n", String.valueOf(paymentList.size() + 1));//变更前
-        if (after == null || before == null) {
-            throw new BizException("公式转换失败");
-        }
-        int diffTime = singleCourseTime * (after - before);//人数变更后单课耗时
-        if (remainTime - diffTime < 0) {
-            throw new BizException("剩余时长不足");
-        }
-        pianoRoomTimeDao.update(null, Wrappers.<PianoRoomTime>lambdaUpdate()
-                .eq(PianoRoomTime::getTeacherId, teacherId)
-                .set(PianoRoomTime::getRemainTime, remainTime - diffTime)
-                .set(PianoRoomTime::getFrozenTime, frozenTime + diffTime));
+                            String formula = sysConfigService.findConfigValue(SysConfigConstant.PIANO_ROOM_TIME_FORMULA);
+                            Integer after = (Integer) WrapperUtil.strToFormula(formula, "n", String.valueOf(studentIds.size() + 1));//变更后
+                            Integer before = (Integer) WrapperUtil.strToFormula(formula, "n", String.valueOf(paymentList.size() + 1));//变更前
+                            if (after == null || before == null) {
+                                throw new BizException("公式转换失败");
+                            }
+                            int diffTime = singleCourseTime * (after - before);//人数变更后单课耗时
+                            if (remainTime - diffTime < 0) {
+                                throw new BizException("剩余时长不足");
+                            }
+                            pianoRoomTimeDao.update(null, Wrappers.<PianoRoomTime>lambdaUpdate()
+                                    .eq(PianoRoomTime::getTeacherId, teacherId)
+                                    .set(PianoRoomTime::getRemainTime, remainTime - diffTime)
+                                    .set(PianoRoomTime::getFrozenTime, frozenTime + diffTime));
+                            return null;
+                        }, null, 10l);
 
         //删除原学员
         paymentDao.delete(Wrappers.<CourseScheduleStudentPayment>lambdaQuery().eq(CourseScheduleStudentPayment::getCourseId, courseId));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PianoRoomBuyRecordServiceImpl.java

@@ -6,13 +6,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomTime;
 import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
+import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
+import com.yonge.toolset.payment.util.DistributedLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
@@ -37,6 +41,8 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
     private TeacherService teacherService;
     @Autowired
     private PlatformCashAccountRecordService platformCashAccountRecordService;
+    @Autowired
+    private RedissonClient redissonClient;
 
     @Override
     public PianoRoomBuyRecordVo detail(Long id) {
@@ -83,18 +89,24 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
         record.setTimes(detail.getTimes());
         save(record);
 
-        PianoRoomTime pianoRoomTime = pianoRoomTimeService.getOne(Wrappers.<PianoRoomTime>lambdaQuery()
-                .eq(PianoRoomTime::getTeacherId, orderDetailVo.getUserId()));
-        if (null == pianoRoomTime) {
-            pianoRoomTime = new PianoRoomTime();
-            pianoRoomTime.setTeacherId(orderDetailVo.getUserId());
-            pianoRoomTime.setRemainTime(detail.getTimes());
-            pianoRoomTimeService.save(pianoRoomTime);
-        } else {
-            pianoRoomTime.setRemainTime(pianoRoomTime.getRemainTime() + detail.getTimes());
-            pianoRoomTime.setUpdateTime(new Date());
-            pianoRoomTimeService.updateById(pianoRoomTime);
-        }
+        //入琴房账户
+        DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(orderDetailVo.getUserId())
+                        , (o) -> {
+                            PianoRoomTime pianoRoomTime = pianoRoomTimeService.getOne(Wrappers.<PianoRoomTime>lambdaQuery()
+                                    .eq(PianoRoomTime::getTeacherId, orderDetailVo.getUserId()));
+                            if (null == pianoRoomTime) {
+                                pianoRoomTime = new PianoRoomTime();
+                                pianoRoomTime.setTeacherId(orderDetailVo.getUserId());
+                                pianoRoomTime.setRemainTime(detail.getTimes());
+                                pianoRoomTimeService.save(pianoRoomTime);
+                            } else {
+                                pianoRoomTime.setRemainTime(pianoRoomTime.getRemainTime() + detail.getTimes());
+                                pianoRoomTime.setUpdateTime(new Date());
+                                pianoRoomTimeService.updateById(pianoRoomTime);
+                            }
+                            return null;
+                        }, null, 10l);
     }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao;
+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.StudentTotal;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.UserBindingTeacher;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
 import com.yonge.cooleshow.biz.dal.vo.*;
@@ -44,6 +46,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     private StudentService studentService;
     @Autowired
     private TeacherDao teacherDao;
+    @Autowired
+    private TeacherService teacherService;
 
     @Override
     public StudentVo detail(Long userId) {
@@ -107,8 +111,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         return subjectList;
     }
 
-    public IPage<MyFollow> queryMyFollow(IPage<MyFollow> page, Long studentId) {
-        List<MyFollow> teacherVos = baseMapper.queryMyFollow(page, studentId);
+    public IPage<MyFollow> queryMyFollow(IPage<MyFollow> page,  QueryMyFollowSearch query) {
+        List<MyFollow> teacherVos = baseMapper.queryMyFollow(page, query);
+        for(MyFollow myFollow : teacherVos){
+            TeacherHomeVo data = teacherService.queryTeacherHome(query.getUserId(), Long.parseLong(myFollow.getUserId())).getData();
+            myFollow.setTeacher(data);
+        }
         return page.setRecords(teacherVos);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityPlanVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityPlanVo对象", description = "活动计划表查询视图对象")
+public class ActivityPlanVo extends ActivityPlan{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityProjectRecordVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityProjectRecordVo对象", description = "活动项目参与记录表查询视图对象")
+public class ActivityProjectRecordVo extends ActivityProjectRecord{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityProjectVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityProjectVo对象", description = "活动项目表查询视图对象")
+public class ActivityProjectVo extends ActivityProject{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityRegistrationVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityRegistrationVo对象", description = "活动报名表查询视图对象")
+public class ActivityRegistrationVo extends ActivityRegistration{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityRewardVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityRewardVo对象", description = "活动奖品表查询视图对象")
+public class ActivityRewardVo extends ActivityReward{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityUserAwardVo.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 10:36:44
+ */
+@ApiModel(value = "ActivityUserAwardVo对象", description = "活动用户获奖表查询视图对象")
+public class ActivityUserAwardVo extends ActivityUserAward{
+	private static final long serialVersionUID = 1L;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2022/5/12
  */
 public class MyFollow extends BaseEntity {
-    @ApiModelProperty("昵称")
+    @ApiModelProperty("用户id")
     private String userId;
     @ApiModelProperty("昵称")
     private String userName;
@@ -37,6 +37,8 @@ public class MyFollow extends BaseEntity {
     private Integer entryFlag;
     @ApiModelProperty("专业技能")
     private String subjectName;
+    @ApiModelProperty("老师对象")
+    private TeacherHomeVo teacher;
 
     public String getRoomUid() {
         return roomUid;
@@ -147,4 +149,12 @@ public class MyFollow extends BaseEntity {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName;
     }
+
+    public TeacherHomeVo getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(TeacherHomeVo teacher) {
+        this.teacher = teacher;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/PianoRoomSettingsVo.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -10,5 +11,4 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "PianoRoomSettingsVo对象", description = "查询视图对象")
 public class PianoRoomSettingsVo extends PianoRoomSettings{
 	private static final long serialVersionUID = 1L;
-
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityPlan">
+            <result column="id_" property="id" />
+	        <result column="activity_type_" property="activityType" />
+	        <result column="activity_name_" property="activityName" />
+	        <result column="describe_" property="describe" />
+	        <result column="rule_describe_" property="ruleDescribe" />
+	        <result column="subject_url_" property="subjectUrl" />
+	        <result column="background_url_" property="backgroundUrl" />
+	        <result column="activity_start_" property="activityStart" />
+	        <result column="activity_end_" property="activityEnd" />
+	        <result column="registration_method_" property="registrationMethod" />
+	        <result column="registration_price_" property="registrationPrice" />
+	        <result column="evaluation_difficulty_" property="evaluationDifficulty" />
+	        <result column="draft_flag_" property="draftFlag" />
+	        <result column="activity_state_" property="activityState" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="create_by_" property="createBy" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="update_by_" property="updateBy" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_type_ as activityType
+        , t.activity_name_ as activityName
+        , t.describe_ as describe
+        , t.rule_describe_ as ruleDescribe
+        , t.subject_url_ as subjectUrl
+        , t.background_url_ as backgroundUrl
+        , t.activity_start_ as activityStart
+        , t.activity_end_ as activityEnd
+        , t.registration_method_ as registrationMethod
+        , t.registration_price_ as registrationPrice
+        , t.evaluation_difficulty_ as evaluationDifficulty
+        , t.draft_flag_ as draftFlag
+        , t.activity_state_ as activityState
+        , t.create_time_ as createTime
+        , t.create_by_ as createBy
+        , t.update_time_ as updateTime
+        , t.update_by_ as updateBy
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_plan t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_plan t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityProjectMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityProjectDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityProject">
+            <result column="id_" property="id" />
+	        <result column="activity_id_" property="activityId" />
+	        <result column="biz_type_" property="bizType" />
+	        <result column="biz_id_" property="bizId" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="create_by_" property="createBy" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_id_ as activityId
+        , t.biz_type_ as bizType
+        , t.biz_id_ as bizId
+        , t.create_time_ as createTime
+        , t.create_by_ as createBy
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_project t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_project t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityProjectRecordMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityProjectRecordDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord">
+            <result column="id_" property="id" />
+	        <result column="activity_id_" property="activityId" />
+	        <result column="project_id_" property="projectId" />
+	        <result column="user_id_" property="userId" />
+	        <result column="score_" property="score" />
+	        <result column="create_time_" property="createTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_id_ as activityId
+        , t.project_id_ as projectId
+        , t.user_id_ as userId
+        , t.score_ as score
+        , t.create_time_ as createTime
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_project_record t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_project_record t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRegistrationMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityRegistrationDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityRegistration">
+            <result column="id_" property="id" />
+	        <result column="activity_id_" property="activityId" />
+	        <result column="user_id_" property="userId" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="sub_order_no_" property="subOrderNo" />
+	        <result column="create_time_" property="createTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_id_ as activityId
+        , t.user_id_ as userId
+        , t.order_no_ as orderNo
+        , t.sub_order_no_ as subOrderNo
+        , t.create_time_ as createTime
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_registration t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_registration t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityRewardDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityReward">
+            <result column="id_" property="id" />
+	        <result column="activity_id_" property="activityId" />
+	        <result column="reward_name_" property="rewardName" />
+	        <result column="reward_describe_" property="rewardDescribe" />
+	        <result column="img_url_" property="imgUrl" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="create_by_" property="createBy" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_id_ as activityId
+        , t.reward_name_ as rewardName
+        , t.reward_describe_ as rewardDescribe
+        , t.img_url_ as imgUrl
+        , t.create_time_ as createTime
+        , t.create_by_ as createBy
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_reward t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_reward t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityUserAwardMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityUserAwardDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityUserAward">
+            <result column="id_" property="id" />
+	        <result column="activity_id_" property="activityId" />
+	        <result column="project_id_" property="projectId" />
+	        <result column="user_id_" property="userId" />
+	        <result column="reward_id_" property="rewardId" />
+	        <result column="receive_flag_" property="receiveFlag" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.activity_id_ as activityId
+        , t.project_id_ as projectId
+        , t.user_id_ as userId
+        , t.reward_id_ as rewardId
+        , t.receive_flag_ as receiveFlag
+        , t.create_time_ as createTime
+        , t.update_time_ as updateTime
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_user_award t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_user_award t
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -159,6 +159,9 @@
         LEFT JOIN teacher_total t ON s.teacher_id_ = t.user_id_
         LEFT JOIN teacher tr ON s.teacher_id_ = tr.user_id_
         LEFT JOIN (SELECT room_uid_,speaker_id_ FROM live_room WHERE live_state_=1) r ON t.user_id_= r.speaker_id_
-        WHERE s.student_id_ = #{studentId}
+        WHERE s.student_id_ = #{param.userId}
+        <if test="param.username != null and param.username != ''">
+            and u.username_ LIKE CONCAT('%', #{param.username}, '%')
+        </if>
     </select>
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.student.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.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
@@ -77,13 +78,13 @@ public class StudentController extends BaseController {
 
     @ApiOperation(value = "我的关注")
     @PostMapping(value = "/queryMyFollow")
-    public HttpResponseResult<PageInfo<MyFollow>> queryMyFollow(@RequestBody QueryInfo query) {
+    public HttpResponseResult<PageInfo<MyFollow>> queryMyFollow(@RequestBody QueryMyFollowSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null || sysUser.getId() == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-
-        IPage<MyFollow> pages = studentService.queryMyFollow(PageUtil.getPage(query), sysUser.getId());
+        query.setUserId(sysUser.getId());
+        IPage<MyFollow> pages = studentService.queryMyFollow(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }
 

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/StudentController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.website.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.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
@@ -82,13 +83,13 @@ public class StudentController extends BaseController {
 
     @ApiOperation(value = "我的关注")
     @PostMapping(value = "/queryMyFollow")
-    public HttpResponseResult<PageInfo<MyFollow>> queryMyFollow(@RequestBody QueryInfo query) {
+    public HttpResponseResult<PageInfo<MyFollow>> queryMyFollow(@RequestBody QueryMyFollowSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null || sysUser.getId() == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-
-        IPage<MyFollow> pages = studentService.queryMyFollow(PageUtil.getPage(query), sysUser.getId());
+        query.setUserId(sysUser.getId());
+        IPage<MyFollow> pages = studentService.queryMyFollow(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }