Merge branch 'dev_1_2_20220802'

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

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

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+
+@RestController
+@RequestMapping("/activityEvaluation")
+@Api(value = "活动项目表", tags = "活动项目表")
+public class ActivityEvaluationController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationService activityEvaluationService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityEvaluationVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityEvaluationService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationSearch")
+    public HttpResponseResult<PageInfo<ActivityEvaluationVo>> page(@RequestBody ActivityEvaluationSearch query) {
+		IPage<ActivityEvaluationVo> pages = activityEvaluationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityEvaluation")
+	public HttpResponseResult save(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+    	return status(activityEvaluationService.save(activityEvaluation));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityEvaluation")
+	public HttpResponseResult update(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+        return status(activityEvaluationService.updateById(activityEvaluation));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityEvaluation")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+        return status(activityEvaluationService.saveOrUpdate(activityEvaluation));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityEvaluationService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
+
+@RestController
+@RequestMapping("/activityEvaluationRecord")
+@Api(value = "活动项目参与记录表", tags = "活动项目参与记录表")
+public class ActivityEvaluationRecordController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationRecordService activityEvaluationRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityEvaluationRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityEvaluationRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationRecordSearch")
+    public HttpResponseResult<PageInfo<ActivityEvaluationRecordVo>> page(@RequestBody ActivityEvaluationRecordSearch query) {
+		IPage<ActivityEvaluationRecordVo> pages = activityEvaluationRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult save(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+    	return status(activityEvaluationRecordService.save(activityEvaluationRecord));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult update(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+        return status(activityEvaluationRecordService.updateById(activityEvaluationRecord));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+        return status(activityEvaluationRecordService.saveOrUpdate(activityEvaluationRecord));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityEvaluationRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+
+@RestController
+@RequestMapping("/activityPlan")
+@Api(value = "活动计划表", tags = "活动计划表")
+public class ActivityPlanController extends BaseController {
+
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityPlanVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityPlanService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityPlanSearch")
+    public HttpResponseResult<PageInfo<ActivityPlanVo>> page(@RequestBody ActivityPlanSearch query) {
+		IPage<ActivityPlanVo> pages = activityPlanService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityPlan")
+	public HttpResponseResult save(@Valid @RequestBody ActivityPlan activityPlan) {
+    	return status(activityPlanService.save(activityPlan));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityPlan")
+	public HttpResponseResult update(@Valid @RequestBody ActivityPlan activityPlan) {
+        return status(activityPlanService.updateById(activityPlan));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityPlan")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityPlan activityPlan) {
+        return status(activityPlanService.saveOrUpdate(activityPlan));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityPlanService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRegistrationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import com.yonge.cooleshow.biz.dal.service.ActivityRegistrationService;
+
+@RestController
+@RequestMapping("/activityRegistration")
+@Api(value = "活动报名表", tags = "活动报名表")
+public class ActivityRegistrationController extends BaseController {
+
+    @Autowired
+    private ActivityRegistrationService activityRegistrationService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityRegistrationVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRegistrationService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRegistrationSearch")
+    public HttpResponseResult<PageInfo<ActivityRegistrationVo>> page(@RequestBody ActivityRegistrationSearch query) {
+		IPage<ActivityRegistrationVo> pages = activityRegistrationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityRegistration")
+	public HttpResponseResult save(@Valid @RequestBody ActivityRegistration activityRegistration) {
+    	return status(activityRegistrationService.save(activityRegistration));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityRegistration")
+	public HttpResponseResult update(@Valid @RequestBody ActivityRegistration activityRegistration) {
+        return status(activityRegistrationService.updateById(activityRegistration));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityRegistration")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityRegistration activityRegistration) {
+        return status(activityRegistrationService.saveOrUpdate(activityRegistration));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityRegistrationService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
+
+@RestController
+@RequestMapping("/activityReward")
+@Api(value = "活动奖品表", tags = "活动奖品表")
+public class ActivityRewardController extends BaseController {
+
+    @Autowired
+    private ActivityRewardService activityRewardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRewardService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRewardSearch")
+    public HttpResponseResult<PageInfo<ActivityRewardVo>> page(@RequestBody ActivityRewardSearch query) {
+		IPage<ActivityRewardVo> pages = activityRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityReward")
+	public HttpResponseResult save(@Valid @RequestBody ActivityReward activityReward) {
+    	return status(activityRewardService.save(activityReward));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityReward")
+	public HttpResponseResult update(@Valid @RequestBody ActivityReward activityReward) {
+        return status(activityRewardService.updateById(activityReward));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityReward")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityReward activityReward) {
+        return status(activityRewardService.saveOrUpdate(activityReward));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityRewardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+
+@RestController
+@RequestMapping("/activityUserReward")
+@Api(value = "活动用户获奖表", tags = "活动用户获奖表")
+public class ActivityUserRewardController extends BaseController {
+
+    @Autowired
+    private ActivityUserRewardService activityUserRewardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityUserRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityUserRewardService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityUserRewardSearch")
+    public HttpResponseResult<PageInfo<ActivityUserRewardVo>> page(@RequestBody ActivityUserRewardSearch query) {
+		IPage<ActivityUserRewardVo> pages = activityUserRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityUserReward")
+	public HttpResponseResult save(@Valid @RequestBody ActivityUserReward activityUserReward) {
+    	return status(activityUserRewardService.save(activityUserReward));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityUserReward")
+	public HttpResponseResult update(@Valid @RequestBody ActivityUserReward activityUserReward) {
+        return status(activityUserRewardService.updateById(activityUserReward));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityUserReward")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityUserReward activityUserReward) {
+        return status(activityUserRewardService.saveOrUpdate(activityUserReward));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityUserRewardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

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

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

@@ -180,11 +180,18 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/state')")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, String reason) {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        return status(musicSheetService.state(id));
+        MusicSheet musicSheet = musicSheetService.getById(id);
+        if (musicSheet == null) {
+            return failed("未找到曲目");
+        }
+        if (musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
+            return failed("请填写下架原因");
+        }
+        return status(musicSheetService.state(id,reason));
     }
 
     /**
@@ -267,4 +274,19 @@ public class MusicSheetController extends BaseController {
         }
     }
 
+
+    /**
+     * 置顶
+     */
+    @PostMapping("/top/{id}")
+    @ApiOperation(value = "置顶曲目", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('music/sheet/top')")
+    public HttpResponseResult<Boolean> top(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
+        if (StringUtil.isEmpty(id)) {
+            return failed("参数不能为空");
+        }
+        return status(musicSheetService.top(id));
+    }
+
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationDao.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.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+
+
+public interface ActivityEvaluationDao extends BaseMapper<ActivityEvaluation>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+	 */
+	ActivityEvaluationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+	 */
+	List<ActivityEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationSearch activityEvaluation);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationRecordDao.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.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+
+
+public interface ActivityEvaluationRecordDao extends BaseMapper<ActivityEvaluationRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	ActivityEvaluationRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	List<ActivityEvaluationRecordVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationRecordSearch activityEvaluationRecord);
+	
+}

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

@@ -14,7 +14,7 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan>{
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
 	 */
 	ActivityPlanVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan>{
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
 	 */
 	List<ActivityPlanVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanSearch activityPlan);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanEvaluationDao.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.ActivityPlanEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanEvaluationSearch;
+
+
+public interface ActivityPlanEvaluationDao extends BaseMapper<ActivityPlanEvaluation>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
+	 */
+	ActivityPlanEvaluationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
+	 */
+	List<ActivityPlanEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanEvaluationSearch activityPlanEvaluation);
+	
+}

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

@@ -1,30 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -14,7 +14,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
 	 */
 	ActivityRegistrationVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
 	 */
 	List<ActivityRegistrationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRegistrationSearch activityRegistration);

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

@@ -14,7 +14,7 @@ public interface ActivityRewardDao extends BaseMapper<ActivityReward>{
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
 	 */
 	ActivityRewardVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityRewardDao extends BaseMapper<ActivityReward>{
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
 	 */
 	List<ActivityRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRewardSearch activityReward);

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

@@ -1,30 +0,0 @@
-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/ActivityUserRewardDao.java

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanDto对象", description = "活动计划表数据传输对象")
 public class ActivityPlanDto extends ActivityPlan{

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

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

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

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationDto对象", description = "活动报名表数据传输对象")
 public class ActivityRegistrationDto extends ActivityRegistration{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardDto对象", description = "活动奖品表数据传输对象")
 public class ActivityRewardDto extends ActivityReward{

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

@@ -1,13 +0,0 @@
-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/ActivityUserRewardDto.java

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

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

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

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

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

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

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityProjectSearch对象", description = "活动项目表查询对象")
-public class ActivityProjectSearch extends QueryInfo{
+@ApiModel(value = "ActivityEvaluationSearch对象", description = "活动项目表查询对象")
+public class ActivityEvaluationSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityProjectRecordSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityPlanEvaluationSearch.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityProjectRecordSearch对象", description = "活动项目参与记录表查询对象")
-public class ActivityProjectRecordSearch extends QueryInfo{
+@ApiModel(value = "ActivityPlanEvaluationSearch对象", description = "活动计划表查询对象")
+public class ActivityPlanEvaluationSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanSearch对象", description = "活动计划表查询对象")
 public class ActivityPlanSearch extends QueryInfo{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationSearch对象", description = "活动报名表查询对象")
 public class ActivityRegistrationSearch extends QueryInfo{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardSearch对象", description = "活动奖品表查询对象")
 public class ActivityRewardSearch extends QueryInfo{

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

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityUserAwardSearch对象", description = "活动用户获奖表查询对象")
-public class ActivityUserAwardSearch extends QueryInfo{
+@ApiModel(value = "ActivityUserRewardSearch对象", description = "活动用户获奖表查询对象")
+public class ActivityUserRewardSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -54,6 +54,16 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
+    @ApiModelProperty(value = "查看我自己的曲目",required = true)
+    private Boolean myself;
+
+    public Boolean getMyself() {
+        return myself;
+    }
+
+    public void setMyself(Boolean myself) {
+        this.myself = myself;
+    }
 
     public ChargeTypeEnum getChargeType() {
         return chargeType;

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

@@ -36,8 +36,6 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     private String platform;
 
 
-    @ApiModelProperty(value = "查看我自己的曲目",required = true)
-    private Boolean myself = true;
 
     public ClientEnum getUserType() {
         return userType;
@@ -47,13 +45,7 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
         this.userType = userType;
     }
 
-    public Boolean getMyself() {
-        return myself;
-    }
 
-    public void setMyself(Boolean myself) {
-        this.myself = myself;
-    }
 
     public YesOrNoEnum getAuditVersion() {
         return auditVersion;

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动项目表
  */
-@TableName("activity_project")
-@ApiModel(value = "ActivityProject对象", description = "活动项目表")
-public class ActivityProject implements Serializable {
+@TableName("activity_evaluation")
+@ApiModel(value = "ActivityEvaluation对象", description = "活动项目表")
+public class ActivityEvaluation implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动项目参与记录表
  */
-@TableName("activity_project_record")
-@ApiModel(value = "ActivityProjectRecord对象", description = "活动项目参与记录表")
-public class ActivityProjectRecord implements Serializable {
+@TableName("activity_evaluation_record")
+@ApiModel(value = "ActivityEvaluationRecord对象", description = "活动项目参与记录表")
+public class ActivityEvaluationRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

@@ -57,9 +57,6 @@ public class ActivityPlan implements Serializable {
     @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;
@@ -171,14 +168,6 @@ public class ActivityPlan implements Serializable {
         this.registrationPrice = registrationPrice;
     }
     
-	public String getEvaluationDifficulty() {
-        return evaluationDifficulty;
-    }
-
-    public void setEvaluationDifficulty(String evaluationDifficulty) {
-        this.evaluationDifficulty = evaluationDifficulty;
-    }
-    
 	public Integer getDraftFlag() {
         return draftFlag;
     }

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

@@ -0,0 +1,93 @@
+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_plan_evaluation")
+@ApiModel(value = "ActivityPlanEvaluation对象", description = "活动计划表")
+public class ActivityPlanEvaluation implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键(活动id) ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("评测难度 BEGINNER 入门级 ADVANCED 进阶级 PERFORMER 大师级 ")
+	@TableField(value = "evaluation_difficulty_")
+    private String evaluationDifficulty;
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public String getEvaluationDifficulty() {
+        return evaluationDifficulty;
+    }
+
+    public void setEvaluationDifficulty(String evaluationDifficulty) {
+        this.evaluationDifficulty = evaluationDifficulty;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+	public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+    
+}

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动用户获奖表
  */
-@TableName("activity_user_award")
-@ApiModel(value = "ActivityUserAward对象", description = "活动用户获奖表")
-public class ActivityUserAward implements Serializable {
+@TableName("activity_user_reward")
+@ApiModel(value = "ActivityUserReward对象", description = "活动用户获奖表")
+public class ActivityUserReward implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseGroupEnum.java

@@ -9,8 +9,11 @@ public enum CourseGroupEnum implements BaseEnum<String,CourseGroupEnum> {
     DISSOLVE( "未成课"),//解散课程
     CANCEL("已取消"),//课程已取消
     APPLY("报名中"),//开售中可以报名
-    NOT_SALE( "未开售");//还未到开售日期
+    NOT_SALE( "未开售"),//还未到开售日期
+    OUT_SALE( "下架"),//下架
 
+
+    ;
     @EnumValue
     private String code;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -90,7 +90,13 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_BUY_LIVE("直播课购买成功"),
     SMS_LIVE_COMPLETION_SUCCESS("直播课成课"),
     SMS_LIVE_COMPLETION_FAIL("直播课成课失败"),
-    SMS_TOMORROW_COURSE_REMINDER("明日课程提醒（每晚9点）(短信)");
+    SMS_TOMORROW_COURSE_REMINDER("明日课程提醒（每晚9点）(短信)"),
+
+    MUSIC_SHEET_OUT_SALE_REASON("老师曲目下架通知"),
+    LIVE_COURSE_OUT_SALE_REASON("老师直播课下架通知"),
+
+
+    ;
 
     MessageTypeEnum(String msg) {
         this.code = this.name();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityEvaluationRecordService.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.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+
+/**
+ * 活动项目参与记录表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityEvaluationRecordService extends IService<ActivityEvaluationRecord>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityEvaluationRecordVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityEvaluationRecordVo> selectPage(IPage<ActivityEvaluationRecordVo> page, ActivityEvaluationRecordSearch query);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityEvaluationService.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.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+
+/**
+ * 活动项目表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityEvaluationService extends IService<ActivityEvaluation>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityEvaluationVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityEvaluationVo> selectPage(IPage<ActivityEvaluationVo> page, ActivityEvaluationSearch query);
+}

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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 /**
  * 活动计划表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityPlanService extends IService<ActivityPlan>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityPlanVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityPlanVo> selectPage(IPage<ActivityPlanVo> page, ActivityPlanSearch query);
 }

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

@@ -1,29 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
 /**
  * 活动报名表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityRegistrationService extends IService<ActivityRegistration>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityRegistrationVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityRegistrationVo> selectPage(IPage<ActivityRegistrationVo> page, ActivityRegistrationSearch query);
 }

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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
 /**
  * 活动奖品表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityRewardService extends IService<ActivityReward>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityRewardVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query);
 }

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

@@ -1,29 +0,0 @@
-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/ActivityUserRewardService.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.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+
+/**
+ * 活动用户获奖表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityUserRewardService extends IService<ActivityUserReward>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityUserRewardVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query);
+}

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

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.CourseGroupDao;
 import com.yonge.cooleshow.biz.dal.dto.CheckCourseTimeDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
+import com.yonge.cooleshow.biz.dal.dto.LiveSaleOutDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderRefundReq;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
@@ -330,5 +331,12 @@ public interface CourseGroupService extends IService<CourseGroup> {
      * @return
      */
     ShareProfitVo shareLiveCourseProfit(SysUser sysUser, Long liveGroupId);
+
+    /**
+     * 课程上架/下架
+     *
+     * @return
+     */
+    Boolean liveSaleOut(LiveSaleOutDto dto);
 }
 

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

@@ -39,9 +39,10 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * 曲目状态修改 启用、停用
      *
      * @param id 曲目id
+     * @param reason
      * @return boolean
      */
-    boolean state(Long id);
+    boolean state(Long id, String reason);
 
     /**
      * 获取专辑详情曲目信息
@@ -274,4 +275,12 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param musicSheetId 曲目id
      */
     ShareProfitVo shareMusicSheetProfit(SysUser sysUser, Long musicSheetId);
+
+    /**
+     * 置顶曲目
+     *
+     * @param musicSheetId 曲目id
+     * @return
+     */
+    Boolean top(Long musicSheetId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityEvaluationRecordServiceImpl.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.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationRecordDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
+
+
+@Service
+public class ActivityEvaluationRecordServiceImpl extends ServiceImpl<ActivityEvaluationRecordDao, ActivityEvaluationRecord> implements ActivityEvaluationRecordService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityEvaluationRecordServiceImpl.class);
+
+	@Override
+    public ActivityEvaluationRecordVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityEvaluationRecordVo> selectPage(IPage<ActivityEvaluationRecordVo> page, ActivityEvaluationRecordSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityEvaluationServiceImpl.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.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+
+
+@Service
+public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluationDao, ActivityEvaluation> implements ActivityEvaluationService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityEvaluationServiceImpl.class);
+
+	@Override
+    public ActivityEvaluationVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityEvaluationVo> selectPage(IPage<ActivityEvaluationVo> page, ActivityEvaluationSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -1,29 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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/ActivityUserAwardServiceImpl.java

@@ -1,29 +0,0 @@
-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/ActivityUserRewardServiceImpl.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.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+
+
+@Service
+public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewardDao, ActivityUserReward> implements ActivityUserRewardService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityUserRewardServiceImpl.class);
+
+	@Override
+    public ActivityUserRewardVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.dao.CourseGroupDao;
 import com.yonge.cooleshow.biz.dal.dto.CheckCourseTimeDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
 import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto.CoursePlanDto;
+import com.yonge.cooleshow.biz.dal.dto.LiveSaleOutDto;
 import com.yonge.cooleshow.biz.dal.dto.UserAccountRecordDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderRefundReq;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
@@ -1074,13 +1075,13 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         List<CourseGroup> courseGroupList = this.list(Wrappers.<CourseGroup>lambdaQuery()
                 .eq(CourseGroup::getType, CourseScheduleEnum.LIVE.getCode())
                 .eq(CourseGroup::getSalesEndDate, LocalDate.now().plusDays(-1))
-                .eq(CourseGroup::getStatus, CourseGroupEnum.APPLY.getCode()));
+                .in(CourseGroup::getStatus, CourseGroupEnum.APPLY.getCode(),CourseGroupEnum.OUT_SALE.getCode()));
         if (CollectionUtils.isEmpty(courseGroupList)) {
             return;
         }
         courseGroupList.forEach(courseGroup -> {
             try {
-                if (courseGroup.getPreStudentNum() >= courseGroup.getMixStudentNum()) {
+                if (courseGroup.getPreStudentNum() >= courseGroup.getMixStudentNum() &&courseGroup.getStatus().equals(CourseGroupEnum.APPLY.getCode())) {
                     //人数达标则修改课程组为进行中状态
                     courseGroup.setStatus(CourseGroupEnum.ING.getCode());
                     //创建群聊 并添加人员到群中
@@ -1138,6 +1139,10 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
      * @param courseGroup 课程组
      */
     private void sendMessage(CourseGroup courseGroup) {
+        // 直播课下架后，不推送直播课成课失败消息
+        if (courseGroup.getStatus().equals(CourseGroupEnum.OUT_SALE.getCode())) {
+            return;
+        }
         // 发短信
         try {
             SysUser user = sysUserFeignService.queryUserById(courseGroup.getTeacherId());
@@ -1269,5 +1274,54 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         result.setAvatar(sysUser.getAvatar());
         return result;
     }
+
+    @Override
+    @Transactional
+    public Boolean liveSaleOut(LiveSaleOutDto dto) {
+
+
+        CourseGroup liveCourseGroupVo = this.getById(dto.getCourseGourpId());
+        if (liveCourseGroupVo == null || !CourseScheduleEnum.LIVE.getCode().equals(liveCourseGroupVo.getType())) {
+            throw new BizException("没找到课程组信息");
+        }
+
+        // 条件检查
+        if(dto.getStatus() == 0 && StringUtils.isEmpty(dto.getReason())) {
+            throw  new BizException("请填写下架原因");
+        } else if (dto.getStatus() == 0  && !CourseGroupEnum.APPLY.getCode().equals(liveCourseGroupVo.getStatus())) {
+            throw new BizException("只能下架销售中的课程组");
+        } else if (dto.getStatus() == 1  && !CourseGroupEnum.OUT_SALE.getCode().equals(liveCourseGroupVo.getStatus())) {
+            throw new BizException("只能上架被下架的课程组");
+        } else if ( new Date().compareTo(liveCourseGroupVo.getSalesEndDate()) > 0) {
+            throw new BizException("课程组售卖时间已结束，不能操作");
+        }
+
+        if (dto.getStatus() == 0) {
+            liveCourseGroupVo.setStatus(CourseGroupEnum.OUT_SALE.getCode());
+
+            // 发送下架消息
+            sendOutSaleMessage(dto, liveCourseGroupVo);
+
+        } else {
+            liveCourseGroupVo.setStatus(CourseGroupEnum.APPLY.getCode());
+        }
+
+
+        return this.updateById(liveCourseGroupVo);
+    }
+
+    private void sendOutSaleMessage(LiveSaleOutDto dto, CourseGroup liveCourseGroupVo) {
+        // 发送课程下架通知
+        try {
+            SysUser user = sysUserFeignService.queryUserById(liveCourseGroupVo.getTeacherId());
+            Map<Long, String> receivers = new HashMap<>();
+            receivers.put(user.getId(), user.getPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.LIVE_COURSE_OUT_SALE_REASON,
+                                               receivers, null, 0, null, ClientEnum.TEACHER.getCode(),
+                                               liveCourseGroupVo.getName(), dto.getReason());
+        } catch (Exception e) {
+            log.warn("直播课下架推送发送失败，{}", e.getMessage());
+        }
+    }
 }
 

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

@@ -140,7 +140,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean state(Long id) {
+    public boolean state(Long id, String reason) {
         MusicSheet musicSheet = this.getById(id);
         if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
@@ -149,6 +149,13 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             musicSheet.setState(YesOrNoEnum.YES);
         } else {
             musicSheet.setState(YesOrNoEnum.NO);
+            musicSheet.setTopFlag(YesOrNoEnum.NO);
+
+            // 下架发送推送
+            if(musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER)) {
+
+            }
+
         }
         return this.updateById(musicSheet);
 
@@ -894,6 +901,25 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return result;
     }
 
+    @Override
+    public Boolean top(Long musicSheetId) {
+        MusicSheet musicSheet = getById(musicSheetId);
+
+        if (YesOrNoEnum.YES.equals(musicSheet.getTopFlag())) {
+            musicSheet.setTopFlag(YesOrNoEnum.NO);
+            return this.saveOrUpdate(musicSheet);
+        }
+        Integer count = this.lambdaQuery()
+                            .eq(MusicSheet::getDelFlag, YesOrNoEnum.NO)
+                            .eq(MusicSheet::getTopFlag, YesOrNoEnum.YES)
+                            .count();
+        if (count >=10) {
+            throw new BizException("首页推荐数量达到上限，请先取消其他曲谱推荐");
+        }
+        musicSheet.setTopFlag(YesOrNoEnum.YES);
+        return this.saveOrUpdate(musicSheet);
+    }
+
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                 .map(sysUserFeignService::queryUserById)

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanVo对象", description = "活动计划表查询视图对象")
 public class ActivityPlanVo extends ActivityPlan{

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

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationVo对象", description = "活动报名表查询视图对象")
 public class ActivityRegistrationVo extends ActivityRegistration{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardVo对象", description = "活动奖品表查询视图对象")
 public class ActivityRewardVo extends ActivityReward{

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

@@ -1,13 +0,0 @@
-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/ActivityUserRewardVo.java

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

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

@@ -60,6 +60,17 @@ public class LiveCourseGroupVo {
     @ApiModelProperty("订单号")
     private String orderNo;
 
+    @ApiModelProperty(value = "类型 practice陪练课 live直播课")
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Long getCourseNum() {
         return courseNum;
     }

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

@@ -1,7 +1,7 @@
 <?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">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation">
             <result column="id_" property="id" />
 	        <result column="activity_id_" property="activityId" />
 	        <result column="biz_type_" property="bizType" />
@@ -20,16 +20,16 @@
         , t.create_by_ as createBy
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_project t
+        FROM activity_evaluation t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_project t
+		FROM activity_evaluation t
 	</select>
 </mapper>

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

@@ -1,7 +1,7 @@
 <?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">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationRecordDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord">
             <result column="id_" property="id" />
 	        <result column="activity_id_" property="activityId" />
 	        <result column="project_id_" property="projectId" />
@@ -20,16 +20,16 @@
         , t.create_time_ as createTime
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_project_record t
+        FROM activity_evaluation_record t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_project_record t
+		FROM activity_evaluation_record t
 	</select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanEvaluationMapper.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.ActivityPlanEvaluationDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation">
+            <result column="id_" property="id" />
+	        <result column="evaluation_difficulty_" property="evaluationDifficulty" />
+	        <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.evaluation_difficulty_ as evaluationDifficulty
+        , 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.ActivityPlanEvaluationVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_plan_evaluation t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_plan_evaluation t
+	</select>
+</mapper>

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

@@ -13,7 +13,6 @@
 	        <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" />
@@ -35,7 +34,6 @@
         , 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

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

@@ -1,7 +1,7 @@
 <?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">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityUserReward">
             <result column="id_" property="id" />
 	        <result column="activity_id_" property="activityId" />
 	        <result column="project_id_" property="projectId" />
@@ -24,16 +24,16 @@
         , t.update_time_ as updateTime
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_user_award t
+        FROM activity_user_reward t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_user_award t
+		FROM activity_user_reward t
 	</select>
 </mapper>

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

@@ -289,6 +289,7 @@
             cg.course_num_ as courseNum,
             cg.created_time_ as createTime,
             cg.course_introduce_ as courseIntroduce,
+        cg.type_ as type,
             s.name_ as subjectName
         from course_group cg
          left join course_schedule_student_payment cssp on cg.id_ = cssp.course_group_id_

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

@@ -79,7 +79,11 @@
             su.del_flag_ = 0
             <include refid="QueryInfo"/>
         </where>
-        order by  t.id_ desc
+        order by
+        <if test="param.myself == null or param.myself == false ">
+            t.top_flag_ desc,t.sort_number_ desc,
+        </if>
+         t.id_ desc
     </select>
 
     <sql id="QueryInfo">
@@ -157,7 +161,7 @@
             <if test="param.id != null">
                 <if test="param.type == 2">
                     and amr.album_id_ = #{param.id}
-                    order by amr.create_time_ desc
+                    order by amr.sort_number_ desc, t.id_ desc
                 </if>
                 <if test="param.type == 1">
                     and t.id_ not in(select amr2.music_sheet_id_  from album_music_relate amr2

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

@@ -131,6 +131,7 @@ public class MusicSheetController extends BaseController {
                 query.setState(YesOrNoEnum.YES);
             }
             query.setSourceType(SourceTypeEnum.TEACHER);
+            query.setMyself(true);
         } else {
             // 检查app版本
             query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
@@ -139,6 +140,7 @@ public class MusicSheetController extends BaseController {
             query.setState(YesOrNoEnum.YES);
             query.setAuditStatus(AuthStatusEnum.PASS);
             query.setStudentId(sysUser.getId());
+            query.setMyself(false);
         }
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseGroupController.java

@@ -57,7 +57,7 @@ public class TeacherCourseGroupController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "teacherId", dataType = "Long", value = "老师id"),
             @ApiImplicitParam(name = "search", dataType = "String", value = "关键字"),
-            @ApiImplicitParam(name = "groupStatus", dataType = "String", value = "课程组状态  ING(进行中)  NOT_SALE(未开售,未上架) APPLY(报名中,销售中) COMPLETE(已完成)"),
+            @ApiImplicitParam(name = "groupStatus", dataType = "String", value = "课程组状态  ING(进行中)  NOT_SALE(未开售,未上架) APPLY(报名中,销售中) COMPLETE(已完成) OUT_SALE(已下架)"),
             @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
             @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
             @ApiImplicitParam(name = "myself", dataType = "Boolean", value = "查看我自己的直播课"),