Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -4,19 +4,18 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 
@@ -31,31 +30,19 @@ public class CourseHomeworkController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入courseHomework")
-    public HttpResponseResult<CourseHomework> detail(CourseHomework courseHomework) {
-		CourseHomework detail = courseHomeworkService.getOne(Condition.getQueryWrapper(courseHomework));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入courseHomework")
-    public HttpResponseResult<List<CourseHomework>> list(CourseHomework courseHomework) {
-		List<CourseHomework> list = courseHomeworkService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<CourseHomeworkVo> detail(@PathVariable("id") Long id) {
+    	return succeed(courseHomeworkService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入courseHomework")
-    public HttpResponseResult<PageInfo<CourseHomework>> page(CourseHomework courseHomework, Query query) {
-		IPage<CourseHomework> pages = courseHomeworkService.selectPage(Condition.getPage(query), courseHomework);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入courseHomeworkSearch")
+    public HttpResponseResult<PageInfo<CourseHomeworkVo>> page(@RequestBody CourseHomeworkSearch query) {
+		IPage<CourseHomeworkVo> pages = courseHomeworkService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
     
@@ -82,7 +69,7 @@ public class CourseHomeworkController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入courseHomework")
-	public HttpResponseResult submit(@RequestBody CourseHomework courseHomework) {
+	public HttpResponseResult submit(@Valid @RequestBody CourseHomework courseHomework) {
         return status(courseHomeworkService.saveOrUpdate(courseHomework));
     }
 

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

@@ -4,19 +4,18 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.CourseScheduleRepliedVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseScheduleRepliedSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleRepliedService;
 
@@ -31,31 +30,19 @@ public class CourseScheduleRepliedController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入courseScheduleReplied")
-    public HttpResponseResult<CourseScheduleReplied> detail(CourseScheduleReplied courseScheduleReplied) {
-		CourseScheduleReplied detail = courseScheduleRepliedService.getOne(Condition.getQueryWrapper(courseScheduleReplied));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入courseScheduleReplied")
-    public HttpResponseResult<List<CourseScheduleReplied>> list(CourseScheduleReplied courseScheduleReplied) {
-		List<CourseScheduleReplied> list = courseScheduleRepliedService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<CourseScheduleRepliedVo> detail(@PathVariable("id") Long id) {
+    	return succeed(courseScheduleRepliedService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入courseScheduleReplied")
-    public HttpResponseResult<PageInfo<CourseScheduleReplied>> page(CourseScheduleReplied courseScheduleReplied, Query query) {
-		IPage<CourseScheduleReplied> pages = courseScheduleRepliedService.selectPage(Condition.getPage(query), courseScheduleReplied);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入courseScheduleRepliedSearch")
+    public HttpResponseResult<PageInfo<CourseScheduleRepliedVo>> page(@RequestBody CourseScheduleRepliedSearch query) {
+		IPage<CourseScheduleRepliedVo> pages = courseScheduleRepliedService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
     
@@ -82,7 +69,7 @@ public class CourseScheduleRepliedController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入courseScheduleReplied")
-	public HttpResponseResult submit(@RequestBody CourseScheduleReplied courseScheduleReplied) {
+	public HttpResponseResult submit(@Valid @RequestBody CourseScheduleReplied courseScheduleReplied) {
         return status(courseScheduleRepliedService.saveOrUpdate(courseScheduleReplied));
     }
 

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

@@ -47,10 +47,10 @@ public class EmployeeController extends BaseController {
         return succeed(detail);
     }
 
-    @GetMapping("/page")
+    @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入student")
-    public HttpResponseResult<PageInfo<Employee>> page(EmployeeSearch employeeSearch, Query query) {
-        return succeed(employeeService.selectPage(query, employeeSearch));
+    public HttpResponseResult<PageInfo<Employee>> page(@RequestBody EmployeeSearch query) {
+        return succeed(employeeService.selectPage(query, query));
     }
 
     @ApiOperation(value = "新增员工")

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

@@ -0,0 +1,36 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.service.HomeService;
+import com.yonge.cooleshow.biz.dal.vo.HomeTotalVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/home")
+@Api(value = "首页", tags = "首页")
+public class HomeController extends BaseController {
+    @Autowired
+    private HomeService homeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "查询用户待办事项数")
+    @GetMapping("/getUserToDoNum ")
+    @PreAuthorize("@pcs.hasPermissions('home/getUserToDoNum')")
+    public HttpResponseResult<HomeTotalVo> getUserToDoNum() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(homeService.getUserToDoNum(user.getId()));
+    }
+
+}

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

@@ -1,24 +1,32 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import javax.validation.Valid;
+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.MusicSheetDto;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import jodd.util.CollectionUtil;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -46,32 +54,32 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        if (musicSheetDto.getChargeType()==2 && musicSheetDto.getMusicPrice()==null){
+        if (ChargeTypeEnum.CHARGE.getCode().equals(musicSheetDto.getChargeType().getCode())
+                && musicSheetDto.getMusicPrice()==null){
             return failed("此曲谱为收费曲谱，需要提供价格");
         }
 
-        List<MusicSheetAccompaniment> list = null;
+        List<MusicSheetAccompaniment> list;
         if (!musicSheetDto.getAudioType().equalsIgnoreCase("midi")){
             list = musicSheetDto.getBackground();
-            if (list.isEmpty()){
+            if (CollectionUtils.isEmpty(list)){
                 return failed("mp3音频文件对应的主音或者伴奏文件没有提供");
             }
+            musicSheetService.saveMp3AndAccompaniment(musicSheetDto,sysUser);
         } else {
             MusicSheet musicSheet = new MusicSheet();
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
-            musicSheet.setAuditStatus(0);
+            musicSheet.setAuditStatus(AuditEnum.AUDITING);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setUserId(sysUser.getId());
             musicSheet.setCreateTime(new Date());
+            musicSheet.setState(StateEnum.STOP);
             musicSheetService.save(musicSheet);
         }
 
-        boolean result = musicSheetService.saveMp3AndAccompaniment(musicSheetDto,sysUser);
-        if (result) {
-            return succeed("新增曲谱成功");
-        } else {
-            return failed("新增曲谱失败");
-        }
+
+        return succeed("新增曲谱成功");
+
     }
 
     @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
@@ -113,43 +121,26 @@ public class MusicSheetController extends BaseController {
 
     @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
-    public HttpResponseResult<Object> list(@RequestBody MusicSheetDto musicSheetDto) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo;
-        int pageSize;
+        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(musicSheetVoIPage));
+    }
 
-        try {
-            if (musicSheetDto.getPageNo() ==null || musicSheetDto.getPageNo() ==0) {
-                pageNo = 1;
-            } else {
-                pageNo = musicSheetDto.getPageNo();
-            }
-            if (musicSheetDto.getPageSize() ==null || musicSheetDto.getPageSize() ==0) {
-                pageSize = 10;
-            } else {
-                pageSize = musicSheetDto.getPageSize();
-            }
-            String search;
-            if(musicSheetDto.getSearch()==null){
-                search = "";
-            } else {
-                search = musicSheetDto.getSearch();
-            }
-            LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , search);
-            lambdaQueryWrapper.or().like(MusicSheet::getComposer , search);
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , search);
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , search);
-
-            Page<MusicSheet> page = new Page<>(pageNo,pageSize);
-            return succeed(musicSheetService.page(page, lambdaQueryWrapper));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return HttpResponseResult.failed(e.getMessage());
+
+    /**
+     * 启用/停用
+     */
+    @PostMapping("/state")
+    @ApiOperation(value = "启用/停用", notes = "传入id")
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true) @RequestParam Long id) {
+        if (StringUtil.isEmpty(id)) {
+            return failed("参数不能为空");
         }
+        return status(musicSheetService.state(id));
     }
 }

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

@@ -1,24 +1,22 @@
 package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
+import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
-import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
-import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.service.MusicTagService;
-
 @RestController
 @RequestMapping("/MusicTag")
 @Api(value = "音乐标签表", tags = "音乐标签表")
@@ -32,56 +30,61 @@ public class MusicTagController extends BaseController {
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入musicTag")
-    public HttpResponseResult<MusicTagVo> detail(@PathVariable("id") Long id) {
+    public HttpResponseResult<MusicTagVo> detail(@ApiParam(value = "标签编号", required = true) @PathVariable("id") Long id) {
     	return succeed(musicTagService.detail(id));
 	}
-    
+
     /**
-     * 查询分页
+     * 查询分页tree
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入musicTag")
     public HttpResponseResult<PageInfo<MusicTagVo>> page(MusicTagSearch query) {
 		IPage<MusicTagVo> pages = musicTagService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		return succeed(Condition.pageInfo(pages));
 	}
-    
+
     /**
 	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入musicTag")
-	public HttpResponseResult save(@Valid @RequestBody MusicTag musicTag) {
-    	return status(musicTagService.save(musicTag));
+	public HttpResponseResult<Boolean> save(@Validated(MusicTagSaveDto.Create.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
+		musicTagService.createMusicTag(musicTagSaveDto);
+		return succeed();
 	}
-    
+
     /**
 	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperation(value = "修改", notes = "传入musicTag")
-	public HttpResponseResult update(@Valid @RequestBody MusicTag musicTag) {
-        return status(musicTagService.updateById(musicTag));
+	public HttpResponseResult<Boolean> update(@Validated(MusicTagSaveDto.Update.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
+		musicTagService.updateMusicTag(musicTagSaveDto);
+		return succeed();
 	}
-    
-    /**
-	 * 新增或修改
-	 */
-    @PostMapping("/submit")
-    @ApiOperation(value = "新增或修改", notes = "传入musicTag")
-	public HttpResponseResult submit(@RequestBody MusicTag musicTag) {
-        return status(musicTagService.saveOrUpdate(musicTag));
-    }
 
  	/**
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
+	@ApiOperation(value = "逻辑删除", notes = "传入id")
+	public HttpResponseResult<Boolean> remove(@ApiParam(value = "标签编号", required = true) @RequestParam Long id) {
+        if (StringUtil.isEmpty(id)) {
+			return failed("参数不能为空");
+		}
+		return status(musicTagService.del(id));
+	}
+
+	/**
+	 * 启用/停用
+	 */
+	@PostMapping("/state")
+	@ApiOperation(value = "启用/停用", notes = "传入id")
+	public HttpResponseResult<Boolean> state(@ApiParam(value = "标签编号", required = true) @RequestParam Long id) {
+		if (StringUtil.isEmpty(id)) {
 			return failed("参数不能为空");
 		}
-		return status(musicTagService.removeByIds(StringUtil.toLongList(ids)));
+		return status(musicTagService.state(id));
 	}
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/OrderController.java

@@ -1,21 +1,20 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.OrderVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.Order;
 import com.yonge.cooleshow.biz.dal.service.OrderService;
 
@@ -30,32 +29,20 @@ public class OrderController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入order")
-    public HttpResponseResult<Order> detail(Order order) {
-		Order detail = orderService.getOne(Condition.getQueryWrapper(order));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入order")
-    public HttpResponseResult<List<Order>> list(Order order) {
-		List<Order> list = orderService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<OrderVo> detail(@PathVariable("id") Long id) {
+    	return succeed(orderService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入order")
-    public HttpResponseResult<IPage<Order>> page(Order order, Query query) {
-		IPage<Order> pages = orderService.selectPage(Condition.getPage(query), order);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderSearch")
+    public HttpResponseResult<PageInfo<OrderVo>> page(@RequestBody OrderSearch query) {
+		IPage<OrderVo> pages = orderService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class OrderController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入order")
-	public HttpResponseResult submit(@RequestBody Order order) {
+	public HttpResponseResult submit(@Valid @RequestBody Order order) {
         return status(orderService.saveOrUpdate(order));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderDetailController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/OrderDetailController.java

@@ -1,21 +1,20 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.OrderDetailVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderDetailSearch;
 import com.yonge.cooleshow.biz.dal.entity.OrderDetail;
 import com.yonge.cooleshow.biz.dal.service.OrderDetailService;
 
@@ -30,32 +29,20 @@ public class OrderDetailController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入orderDetail")
-    public HttpResponseResult<OrderDetail> detail(OrderDetail orderDetail) {
-		OrderDetail detail = orderDetailService.getOne(Condition.getQueryWrapper(orderDetail));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入orderDetail")
-    public HttpResponseResult<List<OrderDetail>> list(OrderDetail orderDetail) {
-		List<OrderDetail> list = orderDetailService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<OrderDetailVo> detail(@PathVariable("id") Long id) {
+    	return succeed(orderDetailService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入orderDetail")
-    public HttpResponseResult<IPage<OrderDetail>> page(OrderDetail orderDetail, Query query) {
-		IPage<OrderDetail> pages = orderDetailService.selectPage(Condition.getPage(query), orderDetail);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderDetailSearch")
+    public HttpResponseResult<PageInfo<OrderDetailVo>> page(@RequestBody OrderDetailSearch query) {
+		IPage<OrderDetailVo> pages = orderDetailService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class OrderDetailController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入orderDetail")
-	public HttpResponseResult submit(@RequestBody OrderDetail orderDetail) {
+	public HttpResponseResult submit(@Valid @RequestBody OrderDetail orderDetail) {
         return status(orderDetailService.saveOrUpdate(orderDetail));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderRefundsController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/OrderRefundsController.java

@@ -1,21 +1,20 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.OrderRefundsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderRefundsSearch;
 import com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
 import com.yonge.cooleshow.biz.dal.service.OrderRefundsService;
 
@@ -30,32 +29,20 @@ public class OrderRefundsController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入orderRefunds")
-    public HttpResponseResult<OrderRefunds> detail(OrderRefunds orderRefunds) {
-		OrderRefunds detail = orderRefundsService.getOne(Condition.getQueryWrapper(orderRefunds));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入orderRefunds")
-    public HttpResponseResult<List<OrderRefunds>> list(OrderRefunds orderRefunds) {
-		List<OrderRefunds> list = orderRefundsService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<OrderRefundsVo> detail(@PathVariable("id") Long id) {
+    	return succeed(orderRefundsService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入orderRefunds")
-    public HttpResponseResult<IPage<OrderRefunds>> page(OrderRefunds orderRefunds, Query query) {
-		IPage<OrderRefunds> pages = orderRefundsService.selectPage(Condition.getPage(query), orderRefunds);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderRefundsSearch")
+    public HttpResponseResult<PageInfo<OrderRefundsVo>> page(@RequestBody OrderRefundsSearch query) {
+		IPage<OrderRefundsVo> pages = orderRefundsService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class OrderRefundsController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入orderRefunds")
-	public HttpResponseResult submit(@RequestBody OrderRefunds orderRefunds) {
+	public HttpResponseResult submit(@Valid @RequestBody OrderRefunds orderRefunds) {
         return status(orderRefundsService.saveOrUpdate(orderRefunds));
     }
 

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

@@ -1,22 +1,20 @@
-package com.yonge.cooleshow.student.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.StudentAttendanceVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
 import com.yonge.cooleshow.biz.dal.service.StudentAttendanceService;
 
@@ -31,31 +29,19 @@ public class StudentAttendanceController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入studentAttendance")
-    public HttpResponseResult<StudentAttendance> detail(StudentAttendance studentAttendance) {
-		StudentAttendance detail = studentAttendanceService.getOne(Condition.getQueryWrapper(studentAttendance));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入studentAttendance")
-    public HttpResponseResult<List<StudentAttendance>> list(StudentAttendance studentAttendance) {
-		List<StudentAttendance> list = studentAttendanceService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<StudentAttendanceVo> detail(@PathVariable("id") Long id) {
+    	return succeed(studentAttendanceService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入studentAttendance")
-    public HttpResponseResult<PageInfo<StudentAttendance>> page(StudentAttendance studentAttendance, Query query) {
-		IPage<StudentAttendance> pages = studentAttendanceService.selectPage(Condition.getPage(query), studentAttendance);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入studentAttendanceSearch")
+    public HttpResponseResult<PageInfo<StudentAttendanceVo>> page(@RequestBody StudentAttendanceSearch query) {
+		IPage<StudentAttendanceVo> pages = studentAttendanceService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
     
@@ -82,7 +68,7 @@ public class StudentAttendanceController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入studentAttendance")
-	public HttpResponseResult submit(@RequestBody StudentAttendance studentAttendance) {
+	public HttpResponseResult submit(@Valid @RequestBody StudentAttendance studentAttendance) {
         return status(studentAttendanceService.saveOrUpdate(studentAttendance));
     }
 

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

@@ -34,9 +34,9 @@ public class StudentController extends BaseController {
     /**
      * 查询分页
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入student")
-    public HttpResponseResult<PageInfo<StudentVo>> page(StudentSearch query) {
+    public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
 		IPage<StudentVo> pages = studentService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}

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

@@ -1,22 +1,20 @@
-package com.yonge.cooleshow.student.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.StudentCourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentCourseHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentCourseHomework;
 import com.yonge.cooleshow.biz.dal.service.StudentCourseHomeworkService;
 
@@ -31,31 +29,19 @@ public class StudentCourseHomeworkController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入studentCourseHomework")
-    public HttpResponseResult<StudentCourseHomework> detail(StudentCourseHomework studentCourseHomework) {
-		StudentCourseHomework detail = studentCourseHomeworkService.getOne(Condition.getQueryWrapper(studentCourseHomework));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入studentCourseHomework")
-    public HttpResponseResult<List<StudentCourseHomework>> list(StudentCourseHomework studentCourseHomework) {
-		List<StudentCourseHomework> list = studentCourseHomeworkService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<StudentCourseHomeworkVo> detail(@PathVariable("id") Long id) {
+    	return succeed(studentCourseHomeworkService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入studentCourseHomework")
-    public HttpResponseResult<PageInfo<StudentCourseHomework>> page(StudentCourseHomework studentCourseHomework, Query query) {
-		IPage<StudentCourseHomework> pages = studentCourseHomeworkService.selectPage(Condition.getPage(query), studentCourseHomework);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入studentCourseHomeworkSearch")
+    public HttpResponseResult<PageInfo<StudentCourseHomeworkVo>> page(@RequestBody StudentCourseHomeworkSearch query) {
+		IPage<StudentCourseHomeworkVo> pages = studentCourseHomeworkService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
     
@@ -82,7 +68,7 @@ public class StudentCourseHomeworkController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入studentCourseHomework")
-	public HttpResponseResult submit(@RequestBody StudentCourseHomework studentCourseHomework) {
+	public HttpResponseResult submit(@Valid @RequestBody StudentCourseHomework studentCourseHomework) {
         return status(studentCourseHomeworkService.saveOrUpdate(studentCourseHomework));
     }
 

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

@@ -13,9 +13,7 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,9 +31,12 @@ public class TeacherAuthEntryRecordController extends BaseController {
     /**
      * 查询单条详情
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<TeacherAuthEntryRecordVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
+    })
+    public HttpResponseResult<TeacherAuthEntryRecordVo> detail(@PathVariable("id") Long id) {
         TeacherAuthEntryRecordVo detail = teacherAuthEntryRecordService.detail(id);
         return succeed(detail);
     }
@@ -43,10 +44,10 @@ public class TeacherAuthEntryRecordController extends BaseController {
     /**
      * 查询分页
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(AuthEntryRecordSearch search, Query query) {
-        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), search);
+    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch search) {
+        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(search), search);
         return succeed(Condition.pageInfo(pages));
     }
 

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

@@ -15,9 +15,7 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,8 +36,11 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	 * 查询单条详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
-	public HttpResponseResult<MusicianAuthEntryRecordVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+	@ApiOperation(value = "详情", notes = "传入id")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
+	})
+	public HttpResponseResult<MusicianAuthEntryRecordVo> detail(@PathVariable("id") Long id) {
 		MusicianAuthEntryRecordVo detail = teacherAuthMusicianRecordService.detail(id);
 		return succeed(detail);
 	}
@@ -47,10 +48,10 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	/**
 	 * 查询分页
 	 */
-	@GetMapping("/page")
+	@PostMapping("/page")
 	@ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
-	public HttpResponseResult<PageInfo<MusicianAuthEntryRecordVo>> page(AuthEntryRecordSearch search, Query query) {
-		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(Condition.getPage(query), search);
+	public HttpResponseResult<PageInfo<MusicianAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch query) {
+		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(Condition.getPage(query), query);
 		return succeed(Condition.pageInfo(pages));
 	}
 

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

@@ -34,12 +34,12 @@ public class TeacherController extends BaseController {
     /**
      * 查询单条
      */
-    @GetMapping("/detail/{userId}")
-    @ApiOperation(value = "详情", notes = "传入teacher")
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
+            @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<TeacherVo> detail(Long userId) {
+    public HttpResponseResult<TeacherVo> detail(@PathVariable("id") Long userId) {
         TeacherVo detail = teacherService.detail(userId);
         return succeed(detail);
     }
@@ -47,9 +47,9 @@ public class TeacherController extends BaseController {
     /**
      * 查询分页
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacher")
-    public HttpResponseResult<IPage<TeacherVo>> page(TeacherSearch query) {
+    public HttpResponseResult<IPage<TeacherVo>> page(@RequestBody TeacherSearch query) {
         IPage<TeacherVo> pages = teacherService.selectPage(Condition.getPage(query), query);
         return succeed(pages);
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherWithdrawalController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherWithdrawalController.java

@@ -1,21 +1,20 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.TeacherWithdrawalVo;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal;
 import com.yonge.cooleshow.biz.dal.service.TeacherWithdrawalService;
 
@@ -30,32 +29,20 @@ public class TeacherWithdrawalController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入teacherWithdrawal")
-    public HttpResponseResult<TeacherWithdrawal> detail(TeacherWithdrawal teacherWithdrawal) {
-		TeacherWithdrawal detail = teacherWithdrawalService.getOne(Condition.getQueryWrapper(teacherWithdrawal));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入teacherWithdrawal")
-    public HttpResponseResult<List<TeacherWithdrawal>> list(TeacherWithdrawal teacherWithdrawal) {
-		List<TeacherWithdrawal> list = teacherWithdrawalService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<TeacherWithdrawalVo> detail(@PathVariable("id") Long id) {
+    	return succeed(teacherWithdrawalService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入teacherWithdrawal")
-    public HttpResponseResult<IPage<TeacherWithdrawal>> page(TeacherWithdrawal teacherWithdrawal, Query query) {
-		IPage<TeacherWithdrawal> pages = teacherWithdrawalService.selectPage(Condition.getPage(query), teacherWithdrawal);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacherWithdrawalSearch")
+    public HttpResponseResult<PageInfo<TeacherWithdrawalVo>> page(@RequestBody TeacherWithdrawalSearch query) {
+		IPage<TeacherWithdrawalVo> pages = teacherWithdrawalService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class TeacherWithdrawalController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入teacherWithdrawal")
-	public HttpResponseResult submit(@RequestBody TeacherWithdrawal teacherWithdrawal) {
+	public HttpResponseResult submit(@Valid @RequestBody TeacherWithdrawal teacherWithdrawal) {
         return status(teacherWithdrawalService.saveOrUpdate(teacherWithdrawal));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountController.java

@@ -1,27 +1,26 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.UserAccountVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserAccountSearch;
 import com.yonge.cooleshow.biz.dal.entity.UserAccount;
 import com.yonge.cooleshow.biz.dal.service.UserAccountService;
 
 @RestController
 @RequestMapping("/userAccount")
-@Api(value = "老师账户表", tags = "老师账户表")
+@Api(value = "用户账户表", tags = "用户账户表")
 public class UserAccountController extends BaseController {
 
     @Autowired
@@ -30,32 +29,20 @@ public class UserAccountController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入userAccount")
-    public HttpResponseResult<UserAccount> detail(UserAccount userAccount) {
-		UserAccount detail = userAccountService.getOne(Condition.getQueryWrapper(userAccount));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入userAccount")
-    public HttpResponseResult<List<UserAccount>> list(UserAccount userAccount) {
-		List<UserAccount> list = userAccountService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<UserAccountVo> detail(@PathVariable("id") Long id) {
+    	return succeed(userAccountService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入userAccount")
-    public HttpResponseResult<IPage<UserAccount>> page(UserAccount userAccount, Query query) {
-		IPage<UserAccount> pages = userAccountService.selectPage(Condition.getPage(query), userAccount);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userAccountSearch")
+    public HttpResponseResult<PageInfo<UserAccountVo>> page(@RequestBody UserAccountSearch query) {
+		IPage<UserAccountVo> pages = userAccountService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class UserAccountController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入userAccount")
-	public HttpResponseResult submit(@RequestBody UserAccount userAccount) {
+	public HttpResponseResult submit(@Valid @RequestBody UserAccount userAccount) {
         return status(userAccountService.saveOrUpdate(userAccount));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountRecordController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -1,27 +1,26 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.UserAccountRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 
 @RestController
 @RequestMapping("/userAccountRecord")
-@Api(value = "老师账户流水表", tags = "老师账户流水表")
+@Api(value = "用户账户流水表", tags = "用户账户流水表")
 public class UserAccountRecordController extends BaseController {
 
     @Autowired
@@ -30,32 +29,20 @@ public class UserAccountRecordController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入userAccountRecord")
-    public HttpResponseResult<UserAccountRecord> detail(UserAccountRecord userAccountRecord) {
-		UserAccountRecord detail = userAccountRecordService.getOne(Condition.getQueryWrapper(userAccountRecord));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入userAccountRecord")
-    public HttpResponseResult<List<UserAccountRecord>> list(UserAccountRecord userAccountRecord) {
-		List<UserAccountRecord> list = userAccountRecordService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<UserAccountRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(userAccountRecordService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入userAccountRecord")
-    public HttpResponseResult<IPage<UserAccountRecord>> page(UserAccountRecord userAccountRecord, Query query) {
-		IPage<UserAccountRecord> pages = userAccountRecordService.selectPage(Condition.getPage(query), userAccountRecord);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userAccountRecordSearch")
+    public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
+		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class UserAccountRecordController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入userAccountRecord")
-	public HttpResponseResult submit(@RequestBody UserAccountRecord userAccountRecord) {
+	public HttpResponseResult submit(@Valid @RequestBody UserAccountRecord userAccountRecord) {
         return status(userAccountRecordService.saveOrUpdate(userAccountRecord));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserBankCardController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserBankCardController.java

@@ -1,27 +1,26 @@
-package com.yonge.cooleshow.teacher.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.UserBankCardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserBankCardSearch;
 import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
 import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
 
 @RestController
 @RequestMapping("/userBankCard")
-@Api(value = "老师绑卡记录表", tags = "老师绑卡记录表")
+@Api(value = "用户绑卡记录表", tags = "用户绑卡记录表")
 public class UserBankCardController extends BaseController {
 
     @Autowired
@@ -30,32 +29,20 @@ public class UserBankCardController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入userBankCard")
-    public HttpResponseResult<UserBankCard> detail(UserBankCard userBankCard) {
-		UserBankCard detail = userBankCardService.getOne(Condition.getQueryWrapper(userBankCard));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入userBankCard")
-    public HttpResponseResult<List<UserBankCard>> list(UserBankCard userBankCard) {
-		List<UserBankCard> list = userBankCardService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<UserBankCardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(userBankCardService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入userBankCard")
-    public HttpResponseResult<IPage<UserBankCard>> page(UserBankCard userBankCard, Query query) {
-		IPage<UserBankCard> pages = userBankCardService.selectPage(Condition.getPage(query), userBankCard);
-		return succeed(pages);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入userBankCardSearch")
+    public HttpResponseResult<PageInfo<UserBankCardVo>> page(@RequestBody UserBankCardSearch query) {
+		IPage<UserBankCardVo> pages = userBankCardService.selectPage(Condition.getPage(query), query);
+        return succeed(Condition.pageInfo(pages));
 	}
     
     /**
@@ -81,7 +68,7 @@ public class UserBankCardController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入userBankCard")
-	public HttpResponseResult submit(@RequestBody UserBankCard userBankCard) {
+	public HttpResponseResult submit(@Valid @RequestBody UserBankCard userBankCard) {
         return status(userBankCardService.saveOrUpdate(userBankCard));
     }
 

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

@@ -1,12 +1,23 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
 import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDto;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
+import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +28,10 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * 视频课基本信息表 web 控制层
  * @author yzp
@@ -33,7 +48,10 @@ public class VideoLessonGroupController extends BaseController {
 	@Autowired
 	private VideoLessonGroupService videoLessonGroupService;
 
-	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    /**
+     * 新增视频课组
+     */
+	@ApiOperation(value = "新增视频课组", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -41,8 +59,7 @@ public class VideoLessonGroupController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        //videoLessonGroup.setCreateBy(sysUser.getId());
-        //videoLessonGroup.setCreateTime(new Date());
+        videoLessonGroup.setTeacherId(sysUser.getId());
         videoLessonGroupService.save(videoLessonGroup);
         return succeed();
     }
@@ -76,10 +93,16 @@ public class VideoLessonGroupController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/list", consumes="application/json", produces="application/json")
-    public HttpResponseResult<Object> list(@RequestBody VideoLessonGroupDto videoLessonGroupDto) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+    /**
+     * 教师端视频课-首页分页
+     * 可根据审核状态筛选
+     */
+    @ApiOperation(value = "教师端视频课-首页分页")
+    @GetMapping(value="/page")
+    public HttpResponseResult<PageInfo<VideoLessonGroupVo>> page(VideoLessonGroupSearch search, Query query) {
+        IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(Condition.getPage(query),search);
+        return succeed(Condition.pageInfo(pages));
+/*        SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
@@ -95,14 +118,33 @@ public class VideoLessonGroupController extends BaseController {
                 pageSize = 10;
             }
 
+            String search;
+            if(videoLessonGroupDto.getSearch()==null){
+                search = "";
+            } else {
+                search = videoLessonGroupDto.getSearch();
+            }
             LambdaQueryWrapper<VideoLessonGroup> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            //lambdaQueryWrapper.like(VideoLessonGroup::getName , "k");
-
+            lambdaQueryWrapper.or().like(VideoLessonGroup::getLessonName , search);
+            lambdaQueryWrapper.or().like(VideoLessonGroup::getLessonSubject , search);
+            lambdaQueryWrapper.or().like(VideoLessonGroup::getLessonTag , search);
             Page<VideoLessonGroup> page = new Page<>(pageNo,pageSize);
+            videoLessonGroupService.selectPage(page,)
             return succeed(videoLessonGroupService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResponseResult.failed(e.getMessage());
-        }
+        }*/
+    }
+
+    /**
+     * 教师端视频课-查询详情
+     * 根据组id查组内课程及购买人员信息
+     */
+    @ApiOperation(value = "教师端视频课-查询详情")
+    @GetMapping("/detail")
+    public HttpResponseResult<VideoLessonGroupDetailVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+        VideoLessonGroupDetailVo detail = videoLessonGroupService.detail(id);
+        return succeed(detail);
     }
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VipCardRecordController.java → cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VipCardRecordController.java

@@ -1,22 +1,20 @@
-package com.yonge.cooleshow.student.controller;
+package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.VipCardRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
 import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
 
@@ -31,31 +29,19 @@ public class VipCardRecordController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入vipCardRecord")
-    public HttpResponseResult<VipCardRecord> detail(VipCardRecord vipCardRecord) {
-		VipCardRecord detail = vipCardRecordService.getOne(Condition.getQueryWrapper(vipCardRecord));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入vipCardRecord")
-    public HttpResponseResult<List<VipCardRecord>> list(VipCardRecord vipCardRecord) {
-		List<VipCardRecord> list = vipCardRecordService.list();
-		return succeed(list);
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<VipCardRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(vipCardRecordService.detail(id));
 	}
     
     /**
      * 查询分页
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入vipCardRecord")
-    public HttpResponseResult<PageInfo<VipCardRecord>> page(VipCardRecord vipCardRecord, Query query) {
-		IPage<VipCardRecord> pages = vipCardRecordService.selectPage(Condition.getPage(query), vipCardRecord);
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入vipCardRecordSearch")
+    public HttpResponseResult<PageInfo<VipCardRecordVo>> page(@RequestBody VipCardRecordSearch query) {
+		IPage<VipCardRecordVo> pages = vipCardRecordService.selectPage(Condition.getPage(query), query);
         return succeed(Condition.pageInfo(pages));
 	}
     
@@ -82,7 +68,7 @@ public class VipCardRecordController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入vipCardRecord")
-	public HttpResponseResult submit(@RequestBody VipCardRecord vipCardRecord) {
+	public HttpResponseResult submit(@Valid @RequestBody VipCardRecord vipCardRecord) {
         return status(vipCardRecordService.saveOrUpdate(vipCardRecord));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/constant/SysConfigConstant.java

@@ -32,16 +32,26 @@ public interface SysConfigConstant {
     String WITHDRAWAL_SERVICE_FEE = "withdrawal_service_fee";
 
     /**
-     * 提前创建直播房间的时间
+     * 提前XX分钟创建/进入直播房间的时间
      */
     String PRE_CREATE_LIVE_ROOM_MINUTE = "pre_create_live_room_minute";
 
     /**
-     * 直播结束后，直播房间的有效时间
+     * 提前XX分钟创建/进入陪练课房间时间
+     */
+    String PRE_CREATE_PRACTICE_ROOM_MINUTE = "pre_create_practice_room_minute";
+
+    /**
+     * 直播结束后，XX分钟关闭房间
      */
     String DESTROY_EXPIRED_LIVE_ROOM_MINUTE = "destroy_expired_live_room_minute";
 
     /**
+     * 陪练课结束后，XX分钟关闭房间
+     */
+    String DESTROY_EXPIRED_PRACTICE_ROOM_MINUTE = "destroy_expired_practice_room_minute";
+
+    /**
      * 陪练课提现手续费
      */
     String PRACTICE_SERVICE_FEE = "practice_service_fee";
@@ -51,4 +61,26 @@ public interface SysConfigConstant {
      */
     String PRACTICE_TIMES_SETTING = "practice_times_setting";
 
+    /**
+     * 课程结束后，XX天后结算课酬
+     */
+    String COURSE_SETTLEMENT_TIME_DAY = "course_settlement_time_day";
+
+    /**
+     * 管理端默认头像
+     */
+    String DEFAULT_HEARD_ADMIN = "default_heard_admin";
+    /**
+     * 老师默认头像
+     */
+    String DEFAULT_HEARD_TEACHER = "default_heard_teacher";
+    /**
+     * 学生默认头像-男
+     */
+    String DEFAULT_HEARD_STUDENT_BOY = "default_heard_student_boy";
+    /**
+     * 学生默认头像-女
+     */
+    String DEFAULT_HEARD_STUDENT_GIRL = "default_heard_student_girl";
+
 }

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

@@ -4,13 +4,27 @@ 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.CourseHomework;
+import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
+
 
 public interface CourseHomeworkDao extends BaseMapper<CourseHomework>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
+	 */
+	CourseHomeworkVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo
 	 */
-	List<CourseHomework> selectPage(IPage page, CourseHomework courseHomework);
+	List<CourseHomeworkVo> selectPage(@Param("page") IPage page, @Param("param") CourseHomeworkSearch courseHomework);
 	
 }

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

@@ -1,12 +1,15 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.vo.StudentTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 老师课程表(CourseSchedule)表数据库访问层
@@ -17,6 +20,7 @@ import java.util.List;
 public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
 
     int insertBatch(@Param("entities") List<CourseSchedule> entities);
+
     /***
      * 查询所有老师课时统计
      * @author liweifan
@@ -24,6 +28,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
      * @return: com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo
      */
     List<TeacherTotalVo> queryTeacherHomeTotal();
+
     /***
      * 查询所有学生课时统计
      * @author liweifan
@@ -32,5 +37,15 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
      */
     List<StudentTotalVo> queryStudentHomeTotal();
 
+    /**
+     * 根据学生id查询大于当前时间并未开始的课程
+     *
+     * @param studentId 学生id
+     * @param classDate 年月日
+     */
+    List<CourseSchedule> queryStudentCourse(@Param("studentId") Long studentId, @Param("classDate") String classDate);
+
+    <T> IPage<T> queryTeacherCourse(Page<T> page, @Param("param") Map<String, Object> param);
+
 }
 

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

@@ -4,13 +4,27 @@ 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.CourseScheduleReplied;
+import com.yonge.cooleshow.biz.dal.vo.CourseScheduleRepliedVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseScheduleRepliedSearch;
+
 
 public interface CourseScheduleRepliedDao extends BaseMapper<CourseScheduleReplied>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.CourseScheduleRepliedVo
+	 */
+	CourseScheduleRepliedVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.CourseScheduleRepliedVo
 	 */
-	List<CourseScheduleReplied> selectPage(IPage page, CourseScheduleReplied courseScheduleReplied);
+	List<CourseScheduleRepliedVo> selectPage(@Param("page") IPage page, @Param("param") CourseScheduleRepliedSearch courseScheduleReplied);
 	
 }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.LiveRoom;
+import com.yonge.cooleshow.biz.dal.vo.RoomVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -1,7 +1,15 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * MusicSheetDao数据库访问类
@@ -10,5 +18,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version v1.0
  **/
 public interface MusicSheetDao extends BaseMapper<MusicSheet> {
-
+    /**
+     * 分页查询
+     *
+     * @return com.yonge.cooleshow.biz.dal.vo.MusicSheetVo
+     */
+    List<MusicSheetVo> selectPage(@Param("page") IPage page, @Param("param") MusicSheetSearch query);
 }

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

@@ -4,27 +4,49 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 
 
-public interface MusicTagDao extends BaseMapper<MusicTag>{
+public interface MusicTagDao extends BaseMapper<MusicTag> {
 	/**
 	 * 查询详情
-     * @author liweifan
-     * @date 2022-03-29 17:47:57
-     * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
+	 *
+	 * @author liweifan
+	 * @date 2022-03-29 17:47:57
+	 * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
 	 */
 	MusicTagVo detail(@Param("id") Long id);
 
 	/**
 	 * 分页查询
-     * @author liweifan
-     * @date 2022-03-29 17:47:57
-     * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
+	 *
+	 * @author liweifan
+	 * @date 2022-03-29 17:47:57
+	 * @return: com.yonge.cooleshow.biz.dal.vo.MusicTagVo
 	 */
 	List<MusicTagVo> selectPage(@Param("page") IPage page, @Param("param") MusicTagSearch musicTag);
-	
+
+	/**
+	 * 根据父级id查询子级列表
+	 *
+	 * @param id        父级id
+	 * @param state     状态
+	 * @param idAndName 标签编号/名称
+	 * @return List
+	 */
+	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") StateEnum state, @Param("idAndName") String idAndName);
+
+
+	/**
+	 * 根据父级id集合查询子集标签
+	 *
+	 * @param longList 父级id集合
+	 * @param state    状态
+	 * @return 子集集合
+	 */
+	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") StateEnum state);
 }

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

@@ -4,13 +4,27 @@ 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.Order;
+import com.yonge.cooleshow.biz.dal.vo.OrderVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
+
 
 public interface OrderDao extends BaseMapper<Order>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderVo
+	 */
+	OrderVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderVo
 	 */
-	List<Order> selectPage(IPage page, Order order);
+	List<OrderVo> selectPage(@Param("page") IPage page, @Param("param") OrderSearch order);
 	
 }

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

@@ -4,13 +4,27 @@ 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.OrderDetail;
+import com.yonge.cooleshow.biz.dal.vo.OrderDetailVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderDetailSearch;
+
 
 public interface OrderDetailDao extends BaseMapper<OrderDetail>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderDetailVo
+	 */
+	OrderDetailVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderDetailVo
 	 */
-	List<OrderDetail> selectPage(IPage page, OrderDetail orderDetail);
+	List<OrderDetailVo> selectPage(@Param("page") IPage page, @Param("param") OrderDetailSearch orderDetail);
 	
 }

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

@@ -4,13 +4,27 @@ 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.OrderRefunds;
+import com.yonge.cooleshow.biz.dal.vo.OrderRefundsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderRefundsSearch;
+
 
 public interface OrderRefundsDao extends BaseMapper<OrderRefunds>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderRefundsVo
+	 */
+	OrderRefundsVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.OrderRefundsVo
 	 */
-	List<OrderRefunds> selectPage(IPage page, OrderRefunds orderRefunds);
+	List<OrderRefundsVo> selectPage(@Param("page") IPage page, @Param("param") OrderRefundsSearch orderRefunds);
 	
 }

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

@@ -4,13 +4,27 @@ 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.StudentAttendance;
+import com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
+
 
 public interface StudentAttendanceDao extends BaseMapper<StudentAttendance>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo
+	 */
+	StudentAttendanceVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentAttendanceVo
 	 */
-	List<StudentAttendance> selectPage(IPage page, StudentAttendance studentAttendance);
+	List<StudentAttendanceVo> selectPage(@Param("page") IPage page, @Param("param") StudentAttendanceSearch studentAttendance);
 	
 }

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

@@ -4,13 +4,27 @@ 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.StudentCourseHomework;
+import com.yonge.cooleshow.biz.dal.vo.StudentCourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentCourseHomeworkSearch;
+
 
 public interface StudentCourseHomeworkDao extends BaseMapper<StudentCourseHomework>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentCourseHomeworkVo
+	 */
+	StudentCourseHomeworkVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentCourseHomeworkVo
 	 */
-	List<StudentCourseHomework> selectPage(IPage page, StudentCourseHomework studentCourseHomework);
+	List<StudentCourseHomeworkVo> selectPage(@Param("page") IPage page, @Param("param") StudentCourseHomeworkSearch studentCourseHomework);
 	
 }

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

@@ -42,4 +42,11 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
 	 */
 	TeacherAuthEntryRecordVo getLastRecordByUserId(@Param("userId") Long userId);
+	/***
+	 * 查询待处理的记录数
+	 * @author liweifan
+	 * @updateTime 2022/3/30 18:35
+	 * @return: java.lang.Integer
+	 */
+	Integer getUserToDoNum();
 }

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

@@ -29,4 +29,11 @@ public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusi
 	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
 
     TeacherAuthMusicianRecord getLastRecordByUserId(@Param("userId") Long userId);
+	/***
+	 * 查询待处理的记录数
+	 * @author liweifan
+	 * @updateTime 2022/3/30 18:45
+	 * @return: java.lang.Integer
+	 */
+    Integer getUserToDoNum();
 }

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

@@ -4,13 +4,27 @@ 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.TeacherWithdrawal;
+import com.yonge.cooleshow.biz.dal.vo.TeacherWithdrawalVo;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
+
 
 public interface TeacherWithdrawalDao extends BaseMapper<TeacherWithdrawal>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.TeacherWithdrawalVo
+	 */
+	TeacherWithdrawalVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.TeacherWithdrawalVo
 	 */
-	List<TeacherWithdrawal> selectPage(IPage page, TeacherWithdrawal teacherWithdrawal);
+	List<TeacherWithdrawalVo> selectPage(@Param("page") IPage page, @Param("param") TeacherWithdrawalSearch teacherWithdrawal);
 	
 }

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

@@ -4,13 +4,27 @@ 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.UserAccount;
+import com.yonge.cooleshow.biz.dal.vo.UserAccountVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserAccountSearch;
+
 
 public interface UserAccountDao extends BaseMapper<UserAccount>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountVo
+	 */
+	UserAccountVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountVo
 	 */
-	List<UserAccount> selectPage(IPage page, UserAccount userAccount);
+	List<UserAccountVo> selectPage(@Param("page") IPage page, @Param("param") UserAccountSearch userAccount);
 	
 }

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

@@ -4,13 +4,27 @@ 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.UserAccountRecord;
+import com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
+
 
 public interface UserAccountRecordDao extends BaseMapper<UserAccountRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo
+	 */
+	UserAccountRecordVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo
 	 */
-	List<UserAccountRecord> selectPage(IPage page, UserAccountRecord userAccountRecord);
+	List<UserAccountRecordVo> selectPage(@Param("page") IPage page, @Param("param") UserAccountRecordSearch userAccountRecord);
 	
 }

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

@@ -4,13 +4,27 @@ 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.UserBankCard;
+import com.yonge.cooleshow.biz.dal.vo.UserBankCardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.UserBankCardSearch;
+
 
 public interface UserBankCardDao extends BaseMapper<UserBankCard>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserBankCardVo
+	 */
+	UserBankCardVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.UserBankCardVo
 	 */
-	List<UserBankCard> selectPage(IPage page, UserBankCard userBankCard);
+	List<UserBankCardVo> selectPage(@Param("page") IPage page, @Param("param") UserBankCardSearch userBankCard);
 	
 }

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

@@ -1,7 +1,15 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * VideoLessonGroupDao数据库访问类
@@ -10,5 +18,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version v1.0
  **/
 public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
+    //查询视频课组-分页
+    List<VideoLessonGroupVo> selectPage(IPage page,@Param("param")  VideoLessonGroupSearch search);
+
+    //根据组id查视频课详情
+    List<VideoLessonGroupDetail> selectDetail(Long id);
 
+    //根据组id查询购买学员信息
+    List<VideoLessonPurchaseStudent> selectStudent(Long id);
 }

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

@@ -1,16 +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 com.yonge.cooleshow.biz.dal.entity.VipCard;
-
-public interface VipCardDao extends BaseMapper<VipCard>{
-
-	/**
-	 * 自定义分页
-	 */
-	List<VipCard> selectPage(IPage page, VipCard vipCard);
-	
-}

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

@@ -4,13 +4,27 @@ 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.VipCardRecord;
+import com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.VipCardRecordSearch;
+
 
 public interface VipCardRecordDao extends BaseMapper<VipCardRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo
+	 */
+	VipCardRecordVo detail(@Param("id") Long id);
 
 	/**
-	 * 自定义分页
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-03-30 13:53:51
+     * @return: com.yonge.cooleshow.biz.dal.vo.VipCardRecordVo
 	 */
-	List<VipCardRecord> selectPage(IPage page, VipCardRecord vipCardRecord);
+	List<VipCardRecordVo> selectPage(@Param("page") IPage page, @Param("param") VipCardRecordSearch vipCardRecord);
 	
 }

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

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.groups.Default;
+
+/**
+ * Description
+ *
+ * @author liujc
+ * @date 2022-03-30
+ */
+public class MusicTagSaveDto {
+
+    public interface Create extends Default{}
+    public interface Update extends Default{}
+
+
+    @ApiModelProperty("标签id ")
+    private Long id;
+
+    @ApiModelProperty("父级标签id ")
+    private Long parentTagId;
+
+    @ApiModelProperty(value = "标签名称 ",required = true)
+    @NotBlank(message = "标签名称不能为空")
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getParentTagId() {
+        return parentTagId;
+    }
+
+    public void setParentTagId(Long parentTagId) {
+        this.parentTagId = parentTagId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -13,19 +13,19 @@ public class VideoLessonGroupDto extends VideoLessonGroup {
     private Integer pageSize;
     private String search;
 
-    public int getPageNo() {
+    public Integer getPageNo() {
         return pageNo;
     }
 
-    public void setPageNo(int pageNo) {
+    public void setPageNo(Integer pageNo) {
         this.pageNo = pageNo;
     }
 
-    public int getPageSize() {
+    public Integer getPageSize() {
         return pageSize;
     }
 
-    public void setPageSize(int pageSize) {
+    public void setPageSize(Integer pageSize) {
         this.pageSize = pageSize;
     }
 

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "AuthEntryRecordSearch", description = "审核列表查询")
-public class AuthEntryRecordSearch {
+public class AuthEntryRecordSearch extends Query {
     @ApiModelProperty(value = "老师编号/名称/电话")
     private String search;
     @ApiModelProperty(value = "审批人")

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "CourseHomeworkSearch对象", description = "课程作业表查询对象")
+public class CourseHomeworkSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "CourseScheduleRepliedSearch对象", description = "课程点评查询对象")
+public class CourseScheduleRepliedSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class EmployeeSearch {
+public class EmployeeSearch extends Query {
     @ApiModelProperty(value = "学院编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

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

@@ -0,0 +1,61 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author: liujunchi
+ * @date: 2022-03-30
+ */
+@ApiModel(value = "MusicSheetSearch对象", description = "曲目表查询对象")
+public class MusicSheetSearch  extends Query {
+
+    @ApiModelProperty("曲目编号/名称")
+    private String idAndName;
+
+    @ApiModelProperty("标签id（多个逗号隔开）")
+    private String musicTagIds;
+
+    @ApiModelProperty("声部id（多个逗号隔开）")
+    private String subjectIds;
+
+
+    @ApiModelProperty("曲目状态（0：停用，1：启用））")
+    private StateEnum state;
+
+    public String getIdAndName() {
+        return idAndName;
+    }
+
+    public void setIdAndName(String idAndName) {
+        this.idAndName = idAndName;
+    }
+
+    public String getMusicTagIds() {
+        return musicTagIds;
+    }
+
+    public void setMusicTagIds(String musicTagIds) {
+        this.musicTagIds = musicTagIds;
+    }
+
+    public String getSubjectIds() {
+        return subjectIds;
+    }
+
+    public void setSubjectIds(String subjectIds) {
+        this.subjectIds = subjectIds;
+    }
+
+    public StateEnum getState() {
+        return state;
+    }
+
+    public void setState(StateEnum state) {
+        this.state = state;
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -11,4 +13,25 @@ import io.swagger.annotations.ApiModel;
 public class MusicTagSearch extends Query{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("标签编号/名称")
+	private String idAndName;
+
+	@ApiModelProperty("标签状态（0：禁用，1：启用）")
+	private StateEnum state;
+
+	public String getIdAndName() {
+		return idAndName;
+	}
+
+	public void setIdAndName(String idAndName) {
+		this.idAndName = idAndName;
+	}
+
+	public StateEnum getState() {
+		return state;
+	}
+
+	public void setState(StateEnum state) {
+		this.state = state;
+	}
 }

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "OrderDetailSearch对象", description = "平台订单表查询对象")
+public class OrderDetailSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "OrderRefundsSearch对象", description = "用户退款表查询对象")
+public class OrderRefundsSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "OrderSearch对象", description = "平台订单表查询对象")
+public class OrderSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "StudentAttendanceSearch对象", description = "学生考勤表查询对象")
+public class StudentAttendanceSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "StudentCourseHomeworkSearch对象", description = "学生课程作业查询对象")
+public class StudentCourseHomeworkSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "TeacherWithdrawalSearch对象", description = "老师账户提现表查询对象")
+public class TeacherWithdrawalSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "UserAccountRecordSearch对象", description = "用户账户流水表查询对象")
+public class UserAccountRecordSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "UserAccountSearch对象", description = "用户账户表查询对象")
+public class UserAccountSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "UserBankCardSearch对象", description = "用户绑卡记录表查询对象")
+public class UserBankCardSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,18 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value = "VideoLessonGroupSearch", description = "视频课列表查询")
+public class VideoLessonGroupSearch {
+    @ApiModelProperty(value = "审核状态(0:待审核 1:通过 2:未通过)")
+    private Integer auditStatus;
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.cooleshow.biz.dal.support.Query;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-03-30 13:53:51
+ */
+@ApiModel(value = "VipCardRecordSearch对象", description = "购买会员卡记录表查询对象")
+public class VipCardRecordSearch extends Query{
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -16,162 +19,130 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel(value = "CourseHomework对象", description = "课程作业表")
 public class CourseHomework implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键; 
-    */
     @ApiModelProperty("主键; ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 课程组编号; 
-    */
     @ApiModelProperty("课程组编号; ")
 	@TableField(value = "course_group_id_")
     private Long courseGroupId;
-    /** 
-    * 课程组类型PRACTICE、LIVE; 
-    */
     @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
 	@TableField(value = "course_group_type_")
     private String courseGroupType;
-    /** 
-    * 课程编号; 
-    */
     @ApiModelProperty("课程编号; ")
 	@TableField(value = "course_schedule_id_")
     private Long courseScheduleId;
-    /** 
-    * 作业标题; 
-    */
     @ApiModelProperty("作业标题; ")
 	@TableField(value = "title_")
     private String title;
-    /** 
-    * 作业内容 
-    */
     @ApiModelProperty("作业内容 ")
 	@TableField(value = "content_")
     private String content;
-    /** 
-    * 作业附件地址（多个用逗号分隔） 
-    */
     @ApiModelProperty("作业附件地址（多个用逗号分隔） ")
 	@TableField(value = "attachments_")
     private String attachments;
-    /** 
-    * 预计提交人数 
-    */
     @ApiModelProperty("预计提交人数 ")
 	@TableField(value = "expect_num_")
     private Integer expectNum;
-    /** 
-    * 提交人数 
-    */
     @ApiModelProperty("提交人数 ")
 	@TableField(value = "completed_num_")
     private Integer completedNum;
-    /** 
-    * 创建时间; 
-    */
     @ApiModelProperty("创建时间; ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间; 
-    */
     @ApiModelProperty("修改时间; ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getCourseGroupId() {
+    
+	public Long getCourseGroupId() {
         return courseGroupId;
     }
 
     public void setCourseGroupId(Long courseGroupId) {
         this.courseGroupId = courseGroupId;
     }
-
-    public String getCourseGroupType() {
+    
+	public String getCourseGroupType() {
         return courseGroupType;
     }
 
     public void setCourseGroupType(String courseGroupType) {
         this.courseGroupType = courseGroupType;
     }
-
-    public Long getCourseScheduleId() {
+    
+	public Long getCourseScheduleId() {
         return courseScheduleId;
     }
 
     public void setCourseScheduleId(Long courseScheduleId) {
         this.courseScheduleId = courseScheduleId;
     }
-
-    public String getTitle() {
+    
+	public String getTitle() {
         return title;
     }
 
     public void setTitle(String title) {
         this.title = title;
     }
-
-    public String getContent() {
+    
+	public String getContent() {
         return content;
     }
 
     public void setContent(String content) {
         this.content = content;
     }
-
-    public String getAttachments() {
+    
+	public String getAttachments() {
         return attachments;
     }
 
     public void setAttachments(String attachments) {
         this.attachments = attachments;
     }
-
-    public Integer getExpectNum() {
+    
+	public Integer getExpectNum() {
         return expectNum;
     }
 
     public void setExpectNum(Integer expectNum) {
         this.expectNum = expectNum;
     }
-
-    public Integer getCompletedNum() {
+    
+	public Integer getCompletedNum() {
         return completedNum;
     }
 
     public void setCompletedNum(Integer completedNum) {
         this.completedNum = completedNum;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+    
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -27,9 +26,13 @@ public class CourseSchedule implements Serializable {
     private Long courseGroupId;
 
     @TableField("type_")
-    @ApiModelProperty(value = "类型 practice陪练课 live直播课")
+    @ApiModelProperty(value = "类型 practice陪练课 live直播课  CourseScheduleEnum")
     private String type;
 
+    @TableField("status_")
+    @ApiModelProperty(value = "课程状态 NOT未开始 ING进行中 COMPLETE已完成 CANCEL已取消  CourseScheduleEnum")
+    private String status;
+
     @TableField("class_num_")
     @ApiModelProperty(value = "课堂编号-第几堂课")
     private Integer classNum;
@@ -211,5 +214,12 @@ public class CourseSchedule implements Serializable {
         this.updatedTime = updatedTime;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
 

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -16,148 +19,119 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel(value = "CourseScheduleReplied对象", description = "课程点评")
 public class CourseScheduleReplied implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 学生id 
-    */
     @ApiModelProperty("学生id ")
 	@TableField(value = "student_id_")
     private Long studentId;
-    /** 
-    * 课程编号 
-    */
     @ApiModelProperty("课程编号 ")
 	@TableField(value = "course_schedule_id_")
     private Long courseScheduleId;
-    /** 
-    * 课程组类型PRACTICE、LIVE; 
-    */
     @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
 	@TableField(value = "course_group_type_")
     private String courseGroupType;
-    /** 
-    * 课程组编号; 
-    */
     @ApiModelProperty("课程组编号; ")
 	@TableField(value = "course_group_id_")
     private String courseGroupId;
-    /** 
-    * 学员评分 
-    */
     @ApiModelProperty("学员评分 ")
 	@TableField(value = "score_")
     private Integer score;
-    /** 
-    * 学员课后评价 
-    */
     @ApiModelProperty("学员课后评价 ")
 	@TableField(value = "student_replied_")
     private String studentReplied;
-    /** 
-    * 老师课后评价 
-    */
     @ApiModelProperty("老师课后评价 ")
 	@TableField(value = "teacher_replied_")
     private String teacherReplied;
-    /** 
-    * 创建时间 
-    */
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间 
-    */
     @ApiModelProperty("修改时间 ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getStudentId() {
+    
+	public Long getStudentId() {
         return studentId;
     }
 
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
-
-    public Long getCourseScheduleId() {
+    
+	public Long getCourseScheduleId() {
         return courseScheduleId;
     }
 
     public void setCourseScheduleId(Long courseScheduleId) {
         this.courseScheduleId = courseScheduleId;
     }
-
-    public String getCourseGroupType() {
+    
+	public String getCourseGroupType() {
         return courseGroupType;
     }
 
     public void setCourseGroupType(String courseGroupType) {
         this.courseGroupType = courseGroupType;
     }
-
-    public String getCourseGroupId() {
+    
+	public String getCourseGroupId() {
         return courseGroupId;
     }
 
     public void setCourseGroupId(String courseGroupId) {
         this.courseGroupId = courseGroupId;
     }
-
-    public Integer getScore() {
+    
+	public Integer getScore() {
         return score;
     }
 
     public void setScore(Integer score) {
         this.score = score;
     }
-
-    public String getStudentReplied() {
+    
+	public String getStudentReplied() {
         return studentReplied;
     }
 
     public void setStudentReplied(String studentReplied) {
         this.studentReplied = studentReplied;
     }
-
-    public String getTeacherReplied() {
+    
+	public String getTeacherReplied() {
         return teacherReplied;
     }
 
     public void setTeacherReplied(String teacherReplied) {
         this.teacherReplied = teacherReplied;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+    
 }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -63,20 +64,25 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("can_evaluate_")
     @ApiModelProperty(value = "是否可以评测(0:否;1:是)")
-    private Integer canEvaluate;  //是否可以评测(0:否;1:是)
+    private YesOrNoEnum canEvaluate;  //是否可以评测(0:否;1:是)
 
     @TableField("show_fingering_")
     @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
-    private Integer showFingering;  //是否展示指法(0:否;1:是)
+    private YesOrNoEnum showFingering;  //是否展示指法(0:否;1:是)
 
     @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
     @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
-    private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
+    private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
+
+
+	@TableField("state_")
+	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
+	private StateEnum state;
 
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private Integer auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -84,11 +90,11 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("top_flag_")
     @ApiModelProperty(value = "是否置顶(0:否;1:是)")
-    private Integer topFlag;  //是否置顶(0:否;1:是)
+    private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
 
     @TableField("hot_flag_")
     @ApiModelProperty(value = "是否热门曲谱(0:否;1:是)")
-    private Integer hotFlag;  //是否热门曲谱(0:否;1:是)
+    private YesOrNoEnum hotFlag;  //是否热门曲谱(0:否;1:是)
 
     @TableField("music_price_")
     @ApiModelProperty(value = "曲谱价格")
@@ -106,7 +112,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("has_beat_")
     @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
-    private Integer hasBeat;  //是否自带节拍器(0:否;1:是)
+    private YesOrNoEnum hasBeat;  //是否自带节拍器(0:否;1:是)
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
@@ -201,39 +207,39 @@ public class MusicSheet extends BaseEntity {
 	    return this.playSpeed;
 	}
 
-	public MusicSheet setCanEvaluate(Integer canEvaluate) {
+	public MusicSheet setCanEvaluate(YesOrNoEnum canEvaluate) {
 	    this.canEvaluate = canEvaluate;
 	    return this;
 	}
 
-	public Integer getCanEvaluate() {
+	public YesOrNoEnum getCanEvaluate() {
 	    return this.canEvaluate;
 	}
 
-	public MusicSheet setShowFingering(Integer showFingering) {
+	public MusicSheet setShowFingering(YesOrNoEnum showFingering) {
 	    this.showFingering = showFingering;
 	    return this;
 	}
 
-	public Integer getShowFingering() {
+	public YesOrNoEnum getShowFingering() {
 	    return this.showFingering;
 	}
 
-	public MusicSheet setChargeType(Integer chargeType) {
+	public MusicSheet setChargeType(ChargeTypeEnum chargeType) {
 	    this.chargeType = chargeType;
 	    return this;
 	}
 
-	public Integer getChargeType() {
+	public ChargeTypeEnum getChargeType() {
 	    return this.chargeType;
 	}
 
-	public MusicSheet setAuditStatus(Integer auditStatus) {
+	public MusicSheet setAuditStatus(AuditEnum auditStatus) {
 	    this.auditStatus = auditStatus;
 	    return this;
 	}
 
-	public Integer getAuditStatus() {
+	public AuditEnum getAuditStatus() {
 	    return this.auditStatus;
 	}
 
@@ -246,21 +252,21 @@ public class MusicSheet extends BaseEntity {
 	    return this.sortNumber;
 	}
 
-	public MusicSheet setTopFlag(Integer topFlag) {
+	public MusicSheet setTopFlag(YesOrNoEnum topFlag) {
 	    this.topFlag = topFlag;
 	    return this;
 	}
 
-	public Integer getTopFlag() {
+	public YesOrNoEnum getTopFlag() {
 	    return this.topFlag;
 	}
 
-	public MusicSheet setHotFlag(Integer hotFlag) {
+	public MusicSheet setHotFlag(YesOrNoEnum hotFlag) {
 	    this.hotFlag = hotFlag;
 	    return this;
 	}
 
-	public Integer getHotFlag() {
+	public YesOrNoEnum getHotFlag() {
 	    return this.hotFlag;
 	}
 
@@ -291,12 +297,12 @@ public class MusicSheet extends BaseEntity {
 	    return this.xmlFileUrl;
 	}
 
-	public MusicSheet setHasBeat(Integer hasBeat) {
+	public MusicSheet setHasBeat(YesOrNoEnum hasBeat) {
 	    this.hasBeat = hasBeat;
 	    return this;
 	}
 
-	public Integer getHasBeat() {
+	public YesOrNoEnum getHasBeat() {
 	    return this.hasBeat;
 	}
 
@@ -345,8 +351,15 @@ public class MusicSheet extends BaseEntity {
 	    return this.remark;
 	}
 
+	public StateEnum getState() {
+		return state;
+	}
+
+	public void setState(StateEnum state) {
+		this.state = state;
+	}
 
-    @Override
+	@Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,40 +23,59 @@ public class MusicTag implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("标签id ")
     @TableId(value = "id_", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     @ApiModelProperty("父级标签id ")
 	@TableField(value = "parent_tag_id_")
-    private Integer parentTagId;
-    @ApiModelProperty("标签名称 ")
+    private Long parentTagId;
+
+    @ApiModelProperty(value = "标签名称 ",required = true)
 	@TableField(value = "name_")
     private String name;
+
+    @TableField(value = "state_")
+    @ApiModelProperty(value = "标签状态（0：禁用，1：启用）")
+    private StateEnum state;
+
 	@TableField(value = "del_flag_")
-    private Byte delFlag;
+    @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
+    private YesOrNoEnum delFlag;
+
 	@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;
+
+
+    @TableField("create_by_")
+    @ApiModelProperty(value = "创建人(后台平台用户)")
+    private Long createBy;  //创建人(老师或者是后台平台用户)
+
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-	public Integer getId() {
+
+    @TableField("update_by_")
+    @ApiModelProperty(value = "更新人(后台平台用户)")
+    private Long updateBy;  //更新人(老师或者是后台平台用户)
+
+	public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    
-	public Integer getParentTagId() {
+
+	public Long getParentTagId() {
         return parentTagId;
     }
 
-    public void setParentTagId(Integer parentTagId) {
+    public void setParentTagId(Long parentTagId) {
         this.parentTagId = parentTagId;
     }
-    
+
 	public String getName() {
         return name;
     }
@@ -62,15 +83,15 @@ public class MusicTag implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    
-	public Byte getDelFlag() {
+
+	public YesOrNoEnum getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Byte delFlag) {
+    public void setDelFlag(YesOrNoEnum delFlag) {
         this.delFlag = delFlag;
     }
-    
+
 	public Date getCreateTime() {
         return createTime;
     }
@@ -78,7 +99,7 @@ public class MusicTag implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    
+
 	public Date getUpdateTime() {
         return updateTime;
     }
@@ -86,5 +107,28 @@ public class MusicTag implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    
+
+    public StateEnum getState() {
+        return state;
+    }
+
+    public void setState(StateEnum state) {
+        this.state = state;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    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/Order.java

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 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;
@@ -22,115 +22,61 @@ public class Order implements Serializable {
 	private static final long serialVersionUID = 1L;
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 订单号 
-    */
     @ApiModelProperty("订单号 ")
 	@TableField(value = "order_no_")
     private String orderNo;
-    /** 
-    * 买家id 
-    */
     @ApiModelProperty("买家id ")
 	@TableField(value = "user_id_")
-    private Long userId;
-    /** 
-    * 卖家id 
-    */
+    private Integer userId;
     @ApiModelProperty("卖家id ")
 	@TableField(value = "merch_id_")
     private Long merchId;
-    /** 
-    * 订单名称 
-    */
     @ApiModelProperty("订单名称 ")
 	@TableField(value = "order_name_")
     private String orderName;
-    /** 
-    * 订单描述信息 
-    */
     @ApiModelProperty("订单描述信息 ")
 	@TableField(value = "order_desc_")
     private String orderDesc;
-    /** 
-    * 订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 
-    */
     @ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 ")
 	@TableField(value = "status_")
     private String status;
-    /** 
-    * 原价 
-    */
     @ApiModelProperty("原价 ")
 	@TableField(value = "original_price_")
     private BigDecimal originalPrice;
-    /** 
-    * 预计价格 
-    */
     @ApiModelProperty("预计价格 ")
 	@TableField(value = "expect_price_")
     private BigDecimal expectPrice;
-    /** 
-    * 实际价格 
-    */
     @ApiModelProperty("实际价格 ")
 	@TableField(value = "actual_price_")
     private BigDecimal actualPrice;
-    /** 
-    * 优惠金额 
-    */
     @ApiModelProperty("优惠金额 ")
 	@TableField(value = "coupon_amount_")
     private BigDecimal couponAmount;
-    /** 
-    * 平台服务费 
-    */
     @ApiModelProperty("平台服务费 ")
 	@TableField(value = "plantform_fee_")
     private BigDecimal plantformFee;
-    /** 
-    * 平台服务费比例% 
-    */
     @ApiModelProperty("平台服务费比例% ")
 	@TableField(value = "plantform_fee_rate_")
     private BigDecimal plantformFeeRate;
-    /** 
-    * 退款金额 
-    */
     @ApiModelProperty("退款金额 ")
 	@TableField(value = "refund_amount_")
     private BigDecimal refundAmount;
-    /** 
-    * 用户备注 
-    */
     @ApiModelProperty("用户备注 ")
 	@TableField(value = "user_note_")
     private String userNote;
-    /** 
-    * 订单类型 1、开通会员  2、陪练课购买  3、直播课购买 4、视频课购买 5、单曲点播 
-    */
     @ApiModelProperty("订单类型 1、开通会员  2、陪练课购买  3、直播课购买 4、视频课购买 5、单曲点播 ")
 	@TableField(value = "order_type_")
     private String orderType;
-    /** 
-    * 下单时间 
-    */
     @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 = "pay_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date payTime;
-    /** 
-    * 退款时间 
-    */
     @ApiModelProperty("退款时间 ")
 	@TableField(value = "refund_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -140,268 +86,222 @@ public class Order implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
-    /** 
-    * 交易流水号 
-    */
     @ApiModelProperty("交易流水号 ")
 	@TableField(value = "trans_no_")
     private String transNo;
-    /** 
-    * 支付渠道:  alipay 支付宝  wx_lite 微信 
-    */
     @ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
 	@TableField(value = "pay_channel_")
     private String payChannel;
-    /** 
-    * 交易金额，必须大于0，保留两位小数点，如0.10、100.05等 
-    */
     @ApiModelProperty("交易金额，必须大于0，保留两位小数点，如0.10、100.05等 ")
 	@TableField(value = "pay_amt_")
     private BigDecimal payAmt;
-    /** 
-    * 到账时间 
-    */
     @ApiModelProperty("到账时间 ")
 	@TableField(value = "arrival_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date arrivalTime;
-    /** 
-    * 失败信息 
-    */
     @ApiModelProperty("失败信息 ")
 	@TableField(value = "pay_fail_msg_")
     private String payFailMsg;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public String getOrderNo() {
+    
+	public String getOrderNo() {
         return orderNo;
     }
 
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
-
-    public Long getUserId() {
+    
+	public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-
-    public Long getMerchId() {
+    
+	public Long getMerchId() {
         return merchId;
     }
 
     public void setMerchId(Long merchId) {
         this.merchId = merchId;
     }
-
-    public String getOrderName() {
+    
+	public String getOrderName() {
         return orderName;
     }
 
     public void setOrderName(String orderName) {
         this.orderName = orderName;
     }
-
-    public String getOrderDesc() {
+    
+	public String getOrderDesc() {
         return orderDesc;
     }
 
     public void setOrderDesc(String orderDesc) {
         this.orderDesc = orderDesc;
     }
-
-    public String getStatus() {
+    
+	public String getStatus() {
         return status;
     }
 
     public void setStatus(String status) {
         this.status = status;
     }
-
-    public BigDecimal getOriginalPrice() {
+    
+	public BigDecimal getOriginalPrice() {
         return originalPrice;
     }
 
     public void setOriginalPrice(BigDecimal originalPrice) {
         this.originalPrice = originalPrice;
     }
-
-    public BigDecimal getExpectPrice() {
+    
+	public BigDecimal getExpectPrice() {
         return expectPrice;
     }
 
     public void setExpectPrice(BigDecimal expectPrice) {
         this.expectPrice = expectPrice;
     }
-
-    public BigDecimal getActualPrice() {
+    
+	public BigDecimal getActualPrice() {
         return actualPrice;
     }
 
     public void setActualPrice(BigDecimal actualPrice) {
         this.actualPrice = actualPrice;
     }
-
-    public BigDecimal getCouponAmount() {
+    
+	public BigDecimal getCouponAmount() {
         return couponAmount;
     }
 
     public void setCouponAmount(BigDecimal couponAmount) {
         this.couponAmount = couponAmount;
     }
-
-    public BigDecimal getPlantformFee() {
+    
+	public BigDecimal getPlantformFee() {
         return plantformFee;
     }
 
     public void setPlantformFee(BigDecimal plantformFee) {
         this.plantformFee = plantformFee;
     }
-
-    public BigDecimal getPlantformFeeRate() {
+    
+	public BigDecimal getPlantformFeeRate() {
         return plantformFeeRate;
     }
 
     public void setPlantformFeeRate(BigDecimal plantformFeeRate) {
         this.plantformFeeRate = plantformFeeRate;
     }
-
-    public BigDecimal getRefundAmount() {
+    
+	public BigDecimal getRefundAmount() {
         return refundAmount;
     }
 
     public void setRefundAmount(BigDecimal refundAmount) {
         this.refundAmount = refundAmount;
     }
-
-    public String getUserNote() {
+    
+	public String getUserNote() {
         return userNote;
     }
 
     public void setUserNote(String userNote) {
         this.userNote = userNote;
     }
-
-    public String getOrderType() {
+    
+	public String getOrderType() {
         return orderType;
     }
 
     public void setOrderType(String orderType) {
         this.orderType = orderType;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getPayTime() {
+    
+	public Date getPayTime() {
         return payTime;
     }
 
     public void setPayTime(Date payTime) {
         this.payTime = payTime;
     }
-
-    public Date getRefundTime() {
+    
+	public Date getRefundTime() {
         return refundTime;
     }
 
     public void setRefundTime(Date refundTime) {
         this.refundTime = refundTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public String getTransNo() {
+    
+	public String getTransNo() {
         return transNo;
     }
 
     public void setTransNo(String transNo) {
         this.transNo = transNo;
     }
-
-    public String getPayChannel() {
+    
+	public String getPayChannel() {
         return payChannel;
     }
 
     public void setPayChannel(String payChannel) {
         this.payChannel = payChannel;
     }
-
-    public BigDecimal getPayAmt() {
+    
+	public BigDecimal getPayAmt() {
         return payAmt;
     }
 
     public void setPayAmt(BigDecimal payAmt) {
         this.payAmt = payAmt;
     }
-
-    public Date getArrivalTime() {
+    
+	public Date getArrivalTime() {
         return arrivalTime;
     }
 
     public void setArrivalTime(Date arrivalTime) {
         this.arrivalTime = arrivalTime;
     }
-
-    public String getPayFailMsg() {
+    
+	public String getPayFailMsg() {
         return payFailMsg;
     }
 
     public void setPayFailMsg(String payFailMsg) {
         this.payFailMsg = payFailMsg;
     }
-
-    @Override
-    public String toString() {
-        return "Order{" +
-				"id=" + id +
-						",orderNo='" + orderNo + "'" + 
-						",userId='" + userId + "'" + 
-						",merchId='" + merchId + "'" + 
-						",orderName='" + orderName + "'" + 
-						",orderDesc='" + orderDesc + "'" + 
-						",status='" + status + "'" + 
-						",originalPrice='" + originalPrice + "'" + 
-						",expectPrice='" + expectPrice + "'" + 
-						",actualPrice='" + actualPrice + "'" + 
-						",couponAmount='" + couponAmount + "'" + 
-						",plantformFee='" + plantformFee + "'" + 
-						",plantformFeeRate='" + plantformFeeRate + "'" + 
-						",refundAmount='" + refundAmount + "'" + 
-						",userNote='" + userNote + "'" + 
-						",orderType='" + orderType + "'" + 
-						",createTime='" + createTime + "'" + 
-						",payTime='" + payTime + "'" + 
-						",refundTime='" + refundTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-						",transNo='" + transNo + "'" + 
-						",payChannel='" + payChannel + "'" + 
-						",payAmt='" + payAmt + "'" + 
-						",arrivalTime='" + arrivalTime + "'" + 
-						",payFailMsg='" + payFailMsg + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 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;
@@ -21,27 +21,15 @@ public class OrderDetail implements Serializable {
 	private static final long serialVersionUID = 1L;
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 订单号 
-    */
     @ApiModelProperty("订单号 ")
 	@TableField(value = "order_no_")
     private String orderNo;
-    /** 
-    * 业务id 
-    */
     @ApiModelProperty("业务id ")
 	@TableField(value = "biz_id_")
     private Long bizId;
-    /** 
-    * 业务内容 
-    */
     @ApiModelProperty("业务内容 ")
 	@TableField(value = "biz_content_")
     private String bizContent;
-    /** 
-    * 下单时间 
-    */
     @ApiModelProperty("下单时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -52,64 +40,52 @@ public class OrderDetail implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public String getOrderNo() {
+    
+	public String getOrderNo() {
         return orderNo;
     }
 
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
-
-    public Long getBizId() {
+    
+	public Long getBizId() {
         return bizId;
     }
 
     public void setBizId(Long bizId) {
         this.bizId = bizId;
     }
-
-    public String getBizContent() {
+    
+	public String getBizContent() {
         return bizContent;
     }
 
     public void setBizContent(String bizContent) {
         this.bizContent = bizContent;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    @Override
-    public String toString() {
-        return "OrderDetail{" +
-				"id=" + id +
-						",orderNo='" + orderNo + "'" + 
-						",bizId='" + bizId + "'" + 
-						",bizContent='" + bizContent + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 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;
@@ -23,40 +23,22 @@ public class OrderRefunds implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 	@TableField(value = "user_id_")
-    private Long userId;
-    /** 
-    * 订单号 
-    */
+    private Integer userId;
     @ApiModelProperty("订单号 ")
 	@TableField(value = "order_no_")
     private String orderNo;
-    /** 
-    * 状态(1,审核中;2,通过;-1,拒绝;) 
-    */
     @ApiModelProperty("状态(1,审核中;2,通过;-1,拒绝;) ")
 	@TableField(value = "status_")
     private String status;
-    /** 
-    * 申请退费金额 
-    */
     @ApiModelProperty("申请退费金额 ")
 	@TableField(value = "apply_amount_")
     private BigDecimal applyAmount;
-    /** 
-    * 实际退费金额 
-    */
     @ApiModelProperty("实际退费金额 ")
 	@TableField(value = "actual_amount_")
     private BigDecimal actualAmount;
-    /** 
-    * 退款描述 
-    */
     @ApiModelProperty("退款描述 ")
 	@TableField(value = "reason_")
     private String reason;
-    /** 
-    * 操作人 
-    */
     @ApiModelProperty("操作人 ")
 	@TableField(value = "operate_user_id_")
     private Long operateUserId;
@@ -71,109 +53,92 @@ public class OrderRefunds implements Serializable {
 	@TableField(value = "remark_")
     private String remark;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getUserId() {
+    
+	public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-
-    public String getOrderNo() {
+    
+	public String getOrderNo() {
         return orderNo;
     }
 
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
-
-    public String getStatus() {
+    
+	public String getStatus() {
         return status;
     }
 
     public void setStatus(String status) {
         this.status = status;
     }
-
-    public BigDecimal getApplyAmount() {
+    
+	public BigDecimal getApplyAmount() {
         return applyAmount;
     }
 
     public void setApplyAmount(BigDecimal applyAmount) {
         this.applyAmount = applyAmount;
     }
-
-    public BigDecimal getActualAmount() {
+    
+	public BigDecimal getActualAmount() {
         return actualAmount;
     }
 
     public void setActualAmount(BigDecimal actualAmount) {
         this.actualAmount = actualAmount;
     }
-
-    public String getReason() {
+    
+	public String getReason() {
         return reason;
     }
 
     public void setReason(String reason) {
         this.reason = reason;
     }
-
-    public Long getOperateUserId() {
+    
+	public Long getOperateUserId() {
         return operateUserId;
     }
 
     public void setOperateUserId(Long operateUserId) {
         this.operateUserId = operateUserId;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public String getRemark() {
+    
+	public String getRemark() {
         return remark;
     }
 
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    @Override
-    public String toString() {
-        return "OrderRefunds{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",orderNo='" + orderNo + "'" + 
-						",status='" + status + "'" + 
-						",applyAmount='" + applyAmount + "'" + 
-						",actualAmount='" + actualAmount + "'" + 
-						",reason='" + reason + "'" + 
-						",operateUserId='" + operateUserId + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-						",remark='" + remark + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -47,6 +47,12 @@ public class RoomInfoCache implements Serializable {
     @ApiModelProperty(value = "房间类型 RoomTypeEnum")
     private String roomType;
 
+    @ApiModelProperty(value = "点赞数")
+    private Integer likeNum;
+
+    @ApiModelProperty(value = "当前观看人数")
+    private Integer lookNum;
+
     public Long getSpeakerId() {
         return speakerId;
     }
@@ -134,4 +140,20 @@ public class RoomInfoCache implements Serializable {
     public void setRoomType(String roomType) {
         this.roomType = roomType;
     }
+
+    public Integer getLikeNum() {
+        return likeNum;
+    }
+
+    public void setLikeNum(Integer likeNum) {
+        this.likeNum = likeNum;
+    }
+
+    public Integer getLookNum() {
+        return lookNum;
+    }
+
+    public void setLookNum(Integer lookNum) {
+        this.lookNum = lookNum;
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -16,154 +19,112 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel(value = "StudentAttendance对象", description = "学生考勤表")
 public class StudentAttendance implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键; 
-    */
     @ApiModelProperty("主键; ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 课程组类型PRACTICE、LIVE; 
-    */
     @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
 	@TableField(value = "course_group_type_")
     private String courseGroupType;
-    /** 
-    * 课程组编号 
-    */
     @ApiModelProperty("课程组编号 ")
 	@TableField(value = "course_group_id_")
     private Long courseGroupId;
-    /** 
-    * 课程编号 
-    */
     @ApiModelProperty("课程编号 ")
 	@TableField(value = "course_schedule_id_")
     private Long courseScheduleId;
-    /** 
-    * 学员编号; 
-    */
     @ApiModelProperty("学员编号; ")
 	@TableField(value = "student_id_")
     private Long studentId;
-    /** 
-    * 签到时间; 
-    */
     @ApiModelProperty("签到时间; ")
 	@TableField(value = "sign_in_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date signInTime;
-    /** 
-    * 签退时间; 
-    */
     @ApiModelProperty("签退时间; ")
 	@TableField(value = "sign_out_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date signOutTime;
-    /** 
-    * 创建时间; 
-    */
     @ApiModelProperty("创建时间; ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间; 
-    */
     @ApiModelProperty("修改时间; ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public String getCourseGroupType() {
+    
+	public String getCourseGroupType() {
         return courseGroupType;
     }
 
     public void setCourseGroupType(String courseGroupType) {
         this.courseGroupType = courseGroupType;
     }
-
-    public Long getCourseGroupId() {
+    
+	public Long getCourseGroupId() {
         return courseGroupId;
     }
 
     public void setCourseGroupId(Long courseGroupId) {
         this.courseGroupId = courseGroupId;
     }
-
-    public Long getCourseScheduleId() {
+    
+	public Long getCourseScheduleId() {
         return courseScheduleId;
     }
 
     public void setCourseScheduleId(Long courseScheduleId) {
         this.courseScheduleId = courseScheduleId;
     }
-
-    public Long getStudentId() {
+    
+	public Long getStudentId() {
         return studentId;
     }
 
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
-
-    public Date getSignInTime() {
+    
+	public Date getSignInTime() {
         return signInTime;
     }
 
     public void setSignInTime(Date signInTime) {
         this.signInTime = signInTime;
     }
-
-    public Date getSignOutTime() {
+    
+	public Date getSignOutTime() {
         return signOutTime;
     }
 
     public void setSignOutTime(Date signOutTime) {
         this.signOutTime = signOutTime;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    @Override
-    public String toString() {
-        return "StudentAttendance{" +
-				"id=" + id +
-						",courseGroupType='" + courseGroupType + "'" + 
-						",courseGroupId='" + courseGroupId + "'" + 
-						",courseScheduleId='" + courseScheduleId + "'" + 
-						",studentId='" + studentId + "'" + 
-						",signInTime='" + signInTime + "'" + 
-						",signOutTime='" + signOutTime + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -16,182 +19,132 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel(value = "StudentCourseHomework对象", description = "学生课程作业")
 public class StudentCourseHomework implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键; 
-    */
     @ApiModelProperty("主键; ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 作业编号; 
-    */
     @ApiModelProperty("作业编号; ")
 	@TableField(value = "course_homework_id_")
     private Long courseHomeworkId;
-    /** 
-    * 课程组类型PRACTICE、LIVE; 
-    */
     @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
 	@TableField(value = "course_group_type_")
     private String courseGroupType;
-    /** 
-    * 课程组编号 
-    */
     @ApiModelProperty("课程组编号 ")
 	@TableField(value = "course_group_id_")
     private Long courseGroupId;
-    /** 
-    * 课程编号 
-    */
     @ApiModelProperty("课程编号 ")
 	@TableField(value = "course_schedule_id_")
     private Long courseScheduleId;
-    /** 
-    * 学员编号; 
-    */
     @ApiModelProperty("学员编号; ")
 	@TableField(value = "student_id_")
     private Long studentId;
-    /** 
-    * 学员提交的作品附件 
-    */
     @ApiModelProperty("学员提交的作品附件 ")
 	@TableField(value = "attachments_")
     private String attachments;
-    /** 
-    * 老师的作业点评 
-    */
     @ApiModelProperty("老师的作业点评 ")
 	@TableField(value = "teacher_replied_")
     private String teacherReplied;
-    /** 
-    * 作业提交时间 
-    */
     @ApiModelProperty("作业提交时间 ")
 	@TableField(value = "submit_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date submitTime;
-    /** 
-    * 创建时间; 
-    */
     @ApiModelProperty("创建时间; ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间; 
-    */
     @ApiModelProperty("修改时间; ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getCourseHomeworkId() {
+    
+	public Long getCourseHomeworkId() {
         return courseHomeworkId;
     }
 
     public void setCourseHomeworkId(Long courseHomeworkId) {
         this.courseHomeworkId = courseHomeworkId;
     }
-
-    public String getCourseGroupType() {
+    
+	public String getCourseGroupType() {
         return courseGroupType;
     }
 
     public void setCourseGroupType(String courseGroupType) {
         this.courseGroupType = courseGroupType;
     }
-
-    public Long getCourseGroupId() {
+    
+	public Long getCourseGroupId() {
         return courseGroupId;
     }
 
     public void setCourseGroupId(Long courseGroupId) {
         this.courseGroupId = courseGroupId;
     }
-
-    public Long getCourseScheduleId() {
+    
+	public Long getCourseScheduleId() {
         return courseScheduleId;
     }
 
     public void setCourseScheduleId(Long courseScheduleId) {
         this.courseScheduleId = courseScheduleId;
     }
-
-    public Long getStudentId() {
+    
+	public Long getStudentId() {
         return studentId;
     }
 
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
-
-    public String getAttachments() {
+    
+	public String getAttachments() {
         return attachments;
     }
 
     public void setAttachments(String attachments) {
         this.attachments = attachments;
     }
-
-    public String getTeacherReplied() {
+    
+	public String getTeacherReplied() {
         return teacherReplied;
     }
 
     public void setTeacherReplied(String teacherReplied) {
         this.teacherReplied = teacherReplied;
     }
-
-    public Date getSubmitTime() {
+    
+	public Date getSubmitTime() {
         return submitTime;
     }
 
     public void setSubmitTime(Date submitTime) {
         this.submitTime = submitTime;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    @Override
-    public String toString() {
-        return "StudentCourseHomework{" +
-				"id=" + id +
-						",courseHomeworkId='" + courseHomeworkId + "'" + 
-						",courseGroupType='" + courseGroupType + "'" + 
-						",courseGroupId='" + courseGroupId + "'" + 
-						",courseScheduleId='" + courseScheduleId + "'" + 
-						",studentId='" + studentId + "'" + 
-						",attachments='" + attachments + "'" + 
-						",teacherReplied='" + teacherReplied + "'" + 
-						",submitTime='" + submitTime + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 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;
@@ -20,212 +20,154 @@ import java.math.BigDecimal;
 @ApiModel(value = "TeacherWithdrawal对象", description = "老师账户提现表")
 public class TeacherWithdrawal implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 提现id 
-    */
     @ApiModelProperty("提现id ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 用户表id 
-    */
     @ApiModelProperty("用户表id ")
 	@TableField(value = "user_id_")
     private Long userId;
-    /** 
-    * 账户变动记录id 
-    */
     @ApiModelProperty("账户变动记录id ")
 	@TableField(value = "user_account_record_id_")
     private Long userAccountRecordId;
-    /** 
-    * 提现金额 
-    */
     @ApiModelProperty("提现金额 ")
 	@TableField(value = "amount_")
     private BigDecimal amount;
-    /** 
-    * 平台服务费 
-    */
     @ApiModelProperty("平台服务费 ")
 	@TableField(value = "plantform_fee_")
     private BigDecimal plantformFee;
-    /** 
-    * 实际到账金额 
-    */
     @ApiModelProperty("实际到账金额 ")
 	@TableField(value = "actual_amount_")
     private String actualAmount;
-    /** 
-    * 银行卡 
-    */
     @ApiModelProperty("银行卡 ")
 	@TableField(value = "bank_card_")
     private String bankCard;
-    /** 
-    * 开户行 
-    */
     @ApiModelProperty("开户行 ")
 	@TableField(value = "bank_name_")
     private String bankName;
-    /** 
-    * 银行流水号 
-    */
     @ApiModelProperty("银行流水号 ")
 	@TableField(value = "bank_flow_no_")
     private String bankFlowNo;
-    /** 
-    * 转账时间 
-    */
     @ApiModelProperty("转账时间 ")
 	@TableField(value = "transfer_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date transferTime;
-    /** 
-    * 发起时间 
-    */
     @ApiModelProperty("发起时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间 
-    */
     @ApiModelProperty("修改时间 ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
-    /** 
-    * 提现状态 
-    */
     @ApiModelProperty("提现状态 ")
 	@TableField(value = "status_")
     private Byte status;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getUserId() {
+    
+	public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-
-    public Long getUserAccountRecordId() {
+    
+	public Long getUserAccountRecordId() {
         return userAccountRecordId;
     }
 
     public void setUserAccountRecordId(Long userAccountRecordId) {
         this.userAccountRecordId = userAccountRecordId;
     }
-
-    public BigDecimal getAmount() {
+    
+	public BigDecimal getAmount() {
         return amount;
     }
 
     public void setAmount(BigDecimal amount) {
         this.amount = amount;
     }
-
-    public BigDecimal getPlantformFee() {
+    
+	public BigDecimal getPlantformFee() {
         return plantformFee;
     }
 
     public void setPlantformFee(BigDecimal plantformFee) {
         this.plantformFee = plantformFee;
     }
-
-    public String getActualAmount() {
+    
+	public String getActualAmount() {
         return actualAmount;
     }
 
     public void setActualAmount(String actualAmount) {
         this.actualAmount = actualAmount;
     }
-
-    public String getBankCard() {
+    
+	public String getBankCard() {
         return bankCard;
     }
 
     public void setBankCard(String bankCard) {
         this.bankCard = bankCard;
     }
-
-    public String getBankName() {
+    
+	public String getBankName() {
         return bankName;
     }
 
     public void setBankName(String bankName) {
         this.bankName = bankName;
     }
-
-    public String getBankFlowNo() {
+    
+	public String getBankFlowNo() {
         return bankFlowNo;
     }
 
     public void setBankFlowNo(String bankFlowNo) {
         this.bankFlowNo = bankFlowNo;
     }
-
-    public Date getTransferTime() {
+    
+	public Date getTransferTime() {
         return transferTime;
     }
 
     public void setTransferTime(Date transferTime) {
         this.transferTime = transferTime;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public Byte getStatus() {
+    
+	public Byte getStatus() {
         return status;
     }
 
     public void setStatus(Byte status) {
         this.status = status;
     }
-
-    @Override
-    public String toString() {
-        return "TeacherWithdrawal{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",userAccountRecordId='" + userAccountRecordId + "'" + 
-						",amount='" + amount + "'" + 
-						",plantformFee='" + plantformFee + "'" + 
-						",actualAmount='" + actualAmount + "'" + 
-						",bankCard='" + bankCard + "'" + 
-						",bankName='" + bankName + "'" + 
-						",bankFlowNo='" + bankFlowNo + "'" + 
-						",transferTime='" + transferTime + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-						",status='" + status + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,126 +14,92 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 
 /**
- * 老师账户表
+ * 用户账户表
  */
 @TableName("user_account")
-@ApiModel(value = "UserAccount对象", description = "老师账户表")
+@ApiModel(value = "UserAccount对象", description = "用户账户表")
 public class UserAccount implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 用户表id 
-    */
     @ApiModelProperty("用户表id ")
     @TableId(value = "user_id_", type = IdType.AUTO)
     private Long userId;
-    /** 
-    * 总金额 
-    */
     @ApiModelProperty("总金额 ")
 	@TableField(value = "amount_total")
     private BigDecimal amountTotal;
-    /** 
-    * 可用余额 
-    */
     @ApiModelProperty("可用余额 ")
 	@TableField(value = "amount_usable")
     private BigDecimal amountUsable;
-    /** 
-    * 冻结金额 
-    */
     @ApiModelProperty("冻结金额 ")
 	@TableField(value = "amount_frozen")
     private BigDecimal amountFrozen;
-    /** 
-    * 状态 0-停用 1-使用 
-    */
     @ApiModelProperty("状态 0-停用 1-使用 ")
 	@TableField(value = "status_")
     private Byte status;
-    /** 
-    * 创建时间 
-    */
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 修改时间 
-    */
     @ApiModelProperty("修改时间 ")
 	@TableField(value = "update_time")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getUserId() {
+	public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-
-    public BigDecimal getAmountTotal() {
+    
+	public BigDecimal getAmountTotal() {
         return amountTotal;
     }
 
     public void setAmountTotal(BigDecimal amountTotal) {
         this.amountTotal = amountTotal;
     }
-
-    public BigDecimal getAmountUsable() {
+    
+	public BigDecimal getAmountUsable() {
         return amountUsable;
     }
 
     public void setAmountUsable(BigDecimal amountUsable) {
         this.amountUsable = amountUsable;
     }
-
-    public BigDecimal getAmountFrozen() {
+    
+	public BigDecimal getAmountFrozen() {
         return amountFrozen;
     }
 
     public void setAmountFrozen(BigDecimal amountFrozen) {
         this.amountFrozen = amountFrozen;
     }
-
-    public Byte getStatus() {
+    
+	public Byte getStatus() {
         return status;
     }
 
     public void setStatus(Byte status) {
         this.status = status;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    @Override
-    public String toString() {
-        return "UserAccount{" +
-				"userId=" + userId +
-						",amountTotal='" + amountTotal + "'" + 
-						",amountUsable='" + amountUsable + "'" + 
-						",amountFrozen='" + amountFrozen + "'" + 
-						",status='" + status + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,8 +1,8 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,154 +14,112 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.math.BigDecimal;
 
 /**
- * 老师账户流水表
+ * 用户账户流水表
  */
 @TableName("user_account_record")
-@ApiModel(value = "UserAccountRecord对象", description = "老师账户流水表")
+@ApiModel(value = "UserAccountRecord对象", description = "用户账户流水表")
 public class UserAccountRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 用户表id 
-    */
     @ApiModelProperty("用户表id ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 交易金额 
-    */
     @ApiModelProperty("交易金额 ")
 	@TableField(value = "trans_amount_")
     private BigDecimal transAmount;
-    /** 
-    * 账户余额 
-    */
     @ApiModelProperty("账户余额 ")
 	@TableField(value = "account_balance_")
     private BigDecimal accountBalance;
-    /** 
-    * 收支类型：1、收入 2、支出 
-    */
     @ApiModelProperty("收支类型：1、收入 2、支出 ")
 	@TableField(value = "in_or_out_")
     private Integer inOrOut;
-    /** 
-    * 业务类型：1、陪练课 2、直播课 3、乐谱 4、提现 
-    */
     @ApiModelProperty("业务类型：1、陪练课 2、直播课 3、乐谱 4、提现 ")
 	@TableField(value = "biz_type_")
     private Integer bizType;
-    /** 
-    * 业务id 
-    */
     @ApiModelProperty("业务id ")
 	@TableField(value = "biz_id_")
     private Long bizId;
-    /** 
-    * 业务名称 
-    */
     @ApiModelProperty("业务名称 ")
 	@TableField(value = "biz_name_")
     private String bizName;
-    /** 
-    * 订单id 
-    */
     @ApiModelProperty("订单id ")
 	@TableField(value = "order_id_")
     private Long orderId;
-    /** 
-    * 创建时间 
-    */
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public BigDecimal getTransAmount() {
+    
+	public BigDecimal getTransAmount() {
         return transAmount;
     }
 
     public void setTransAmount(BigDecimal transAmount) {
         this.transAmount = transAmount;
     }
-
-    public BigDecimal getAccountBalance() {
+    
+	public BigDecimal getAccountBalance() {
         return accountBalance;
     }
 
     public void setAccountBalance(BigDecimal accountBalance) {
         this.accountBalance = accountBalance;
     }
-
-    public Integer getInOrOut() {
+    
+	public Integer getInOrOut() {
         return inOrOut;
     }
 
     public void setInOrOut(Integer inOrOut) {
         this.inOrOut = inOrOut;
     }
-
-    public Integer getBizType() {
+    
+	public Integer getBizType() {
         return bizType;
     }
 
     public void setBizType(Integer bizType) {
         this.bizType = bizType;
     }
-
-    public Long getBizId() {
+    
+	public Long getBizId() {
         return bizId;
     }
 
     public void setBizId(Long bizId) {
         this.bizId = bizId;
     }
-
-    public String getBizName() {
+    
+	public String getBizName() {
         return bizName;
     }
 
     public void setBizName(String bizName) {
         this.bizName = bizName;
     }
-
-    public Long getOrderId() {
+    
+	public Long getOrderId() {
         return orderId;
     }
 
     public void setOrderId(Long orderId) {
         this.orderId = orderId;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    @Override
-    public String toString() {
-        return "UserAccountRecord{" +
-				"id=" + id +
-						",transAmount='" + transAmount + "'" + 
-						",accountBalance='" + accountBalance + "'" + 
-						",inOrOut='" + inOrOut + "'" + 
-						",bizType='" + bizType + "'" + 
-						",bizId='" + bizId + "'" + 
-						",bizName='" + bizName + "'" + 
-						",orderId='" + orderId + "'" + 
-						",createTime='" + createTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -10,187 +13,136 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 老师绑卡记录表
+ * 用户绑卡记录表
  */
 @TableName("user_bank_card")
-@ApiModel(value = "UserBankCard对象", description = "老师绑卡记录表")
+@ApiModel(value = "UserBankCard对象", description = "用户绑卡记录表")
 public class UserBankCard implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * id 
-    */
     @ApiModelProperty("id ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 用户表id 
-    */
     @ApiModelProperty("用户表id ")
 	@TableField(value = "user_id_")
     private Long userId;
-    /** 
-    * 持卡人姓名 
-    */
     @ApiModelProperty("持卡人姓名 ")
 	@TableField(value = "name_")
     private String name;
-    /** 
-    * 开户行 
-    */
     @ApiModelProperty("开户行 ")
 	@TableField(value = "bank_name_")
     private String bankName;
-    /** 
-    * 银行卡号 
-    */
     @ApiModelProperty("银行卡号 ")
 	@TableField(value = "bank_card_")
     private String bankCard;
-    /** 
-    * 银行预留手机号 
-    */
     @ApiModelProperty("银行预留手机号 ")
 	@TableField(value = "phone_")
     private String phone;
-    /** 
-    * 开户行编码 
-    */
     @ApiModelProperty("开户行编码 ")
 	@TableField(value = "bank_code_")
     private String bankCode;
-    /** 
-    * 逻辑删除 
-    */
     @ApiModelProperty("逻辑删除 ")
 	@TableField(value = "del_flag_")
-    @TableLogic
     private Byte delFlag;
-    /** 
-    * 是否默认 
-    */
     @ApiModelProperty("是否默认 ")
 	@TableField(value = "is_default_")
     private Byte isDefault;
-    /** 
-    * 创建时间 
-    */
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 更新时间 
-    */
     @ApiModelProperty("更新时间 ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getUserId() {
+    
+	public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-
-    public String getName() {
+    
+	public String getName() {
         return name;
     }
 
     public void setName(String name) {
         this.name = name;
     }
-
-    public String getBankName() {
+    
+	public String getBankName() {
         return bankName;
     }
 
     public void setBankName(String bankName) {
         this.bankName = bankName;
     }
-
-    public String getBankCard() {
+    
+	public String getBankCard() {
         return bankCard;
     }
 
     public void setBankCard(String bankCard) {
         this.bankCard = bankCard;
     }
-
-    public String getPhone() {
+    
+	public String getPhone() {
         return phone;
     }
 
     public void setPhone(String phone) {
         this.phone = phone;
     }
-
-    public String getBankCode() {
+    
+	public String getBankCode() {
         return bankCode;
     }
 
     public void setBankCode(String bankCode) {
         this.bankCode = bankCode;
     }
-
-    public Byte getDelFlag() {
+    
+	public Byte getDelFlag() {
         return delFlag;
     }
 
     public void setDelFlag(Byte delFlag) {
         this.delFlag = delFlag;
     }
-
-    public Byte getIsDefault() {
+    
+	public Byte getIsDefault() {
         return isDefault;
     }
 
     public void setIsDefault(Byte isDefault) {
         this.isDefault = isDefault;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    @Override
-    public String toString() {
-        return "UserBankCard{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",name='" + name + "'" + 
-						",bankName='" + bankName + "'" + 
-						",bankCard='" + bankCard + "'" + 
-						",phone='" + phone + "'" + 
-						",bankCode='" + bankCode + "'" + 
-						",delFlag='" + delFlag + "'" + 
-						",isDefault='" + isDefault + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 视频课基本信息表
@@ -23,7 +25,8 @@ public class VideoLessonGroup extends BaseEntity {
     private Long id;  //主键ID
 
     @TableField("lesson_name_")
-    @ApiModelProperty(value = "课程名称")
+    @ApiModelProperty(value = "课程名称",required = true)
+	@NotBlank(message = "课程名称不能为空;")
     private String lessonName;  //课程名称
 
     @TableField("lesson_subject_")
@@ -31,15 +34,18 @@ public class VideoLessonGroup extends BaseEntity {
     private String lessonSubject;  //课程声部
 
     @TableField("lesson_desc_")
-    @ApiModelProperty(value = "课程介绍")
+    @ApiModelProperty(value = "课程介绍",required = true)
+	@NotBlank(message = "课程介绍不能为空;")
     private String lessonDesc;  //课程介绍
 
     @TableField("lesson_price_")
-    @ApiModelProperty(value = "课程价格")
+    @ApiModelProperty(value = "课程价格",required = true)
+	@NotNull(message = "课程价格不能为空;")
     private Integer lessonPrice;  //课程价格
 
     @TableField("lesson_cover_url_")
-    @ApiModelProperty(value = "课程封面图片URL")
+    @ApiModelProperty(value = "课程封面图片URL",required = true)
+	@NotBlank(message = "课程封面图片URL不能为空;")
     private String lessonCoverUrl;  //课程封面图片URL
 
     @TableField("teacher_id_")
@@ -67,7 +73,7 @@ public class VideoLessonGroup extends BaseEntity {
     private Integer hotFlag;  //是否热门课程
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态")
+    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
     private Integer auditStatus;  //审核状态
 
     @TableField("create_time_")
@@ -78,7 +84,6 @@ public class VideoLessonGroup extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;  //更新时间
 
-
 	public VideoLessonGroup setId(Long id) {
 	    this.id = id;
 	    return this;

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

@@ -1,157 +0,0 @@
-package com.yonge.cooleshow.biz.dal.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-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("vip_card")
-@ApiModel(value = "VipCard对象", description = "会员卡表")
-public class VipCard implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 会员卡id 
-    */
-    @ApiModelProperty("会员卡id ")
-    @TableId(value = "id_", type = IdType.AUTO)
-    private Long id;
-    /** 
-    * 用户id 
-    */
-    @ApiModelProperty("用户id ")
-	@TableField(value = "user_id_")
-    private Long userId;
-    /** 
-    * 订单id 
-    */
-    @ApiModelProperty("订单id ")
-	@TableField(value = "order_id_")
-    private Long orderId;
-    /** 
-    * 时长类型：1、月卡 2、季卡 3、年卡 
-    */
-    @ApiModelProperty("时长类型：1、月卡 2、季卡 3、年卡 ")
-	@TableField(value = "time_type_")
-    private Integer timeType;
-    /** 
-    * 会员卡开始时间 
-    */
-    @ApiModelProperty("会员卡开始时间 ")
-	@TableField(value = "start_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date startTime;
-    /** 
-    * 创建时间 
-    */
-    @ApiModelProperty("创建时间 ")
-	@TableField(value = "create_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date createTime;
-    /** 
-    * 更新时间 
-    */
-    @ApiModelProperty("更新时间 ")
-	@TableField(value = "update_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date updateTime;
-    /** 
-    * 会员卡结束时间 
-    */
-    @ApiModelProperty("会员卡结束时间 ")
-	@TableField(value = "end_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date endTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getTimeType() {
-        return timeType;
-    }
-
-    public void setTimeType(Integer timeType) {
-        this.timeType = timeType;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    @Override
-    public String toString() {
-        return "VipCard{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",orderId='" + orderId + "'" + 
-						",timeType='" + timeType + "'" + 
-						",startTime='" + startTime + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-						",endTime='" + endTime + "'" + 
-		                '}';
-    }
-	
-}

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

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;
 
@@ -16,139 +19,101 @@ import org.springframework.format.annotation.DateTimeFormat;
 @ApiModel(value = "VipCardRecord对象", description = "购买会员卡记录表")
 public class VipCardRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
-    /** 
-    * 会员卡id 
-    */
     @ApiModelProperty("会员卡id ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    /** 
-    * 用户id 
-    */
     @ApiModelProperty("用户id ")
 	@TableField(value = "user_id_")
     private Long userId;
-    /** 
-    * 订单id 
-    */
     @ApiModelProperty("订单id ")
 	@TableField(value = "order_id_")
     private Long orderId;
-    /** 
-    * 时长类型：1、月卡 2、季卡 3、年卡 
-    */
     @ApiModelProperty("时长类型：1、月卡 2、季卡 3、年卡 ")
 	@TableField(value = "time_type_")
     private Integer timeType;
-    /** 
-    * 会员卡开始时间 
-    */
     @ApiModelProperty("会员卡开始时间 ")
 	@TableField(value = "start_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date startTime;
-    /** 
-    * 创建时间 
-    */
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
-    /** 
-    * 更新时间 
-    */
     @ApiModelProperty("更新时间 ")
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
-    /** 
-    * 会员卡结束时间 
-    */
     @ApiModelProperty("会员卡结束时间 ")
 	@TableField(value = "end_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date endTime;
 
-    public Long getId() {
+	public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-
-    public Long getUserId() {
+    
+	public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-
-    public Long getOrderId() {
+    
+	public Long getOrderId() {
         return orderId;
     }
 
     public void setOrderId(Long orderId) {
         this.orderId = orderId;
     }
-
-    public Integer getTimeType() {
+    
+	public Integer getTimeType() {
         return timeType;
     }
 
     public void setTimeType(Integer timeType) {
         this.timeType = timeType;
     }
-
-    public Date getStartTime() {
+    
+	public Date getStartTime() {
         return startTime;
     }
 
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
-
-    public Date getCreateTime() {
+    
+	public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
-    public Date getUpdateTime() {
+    
+	public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-
-    public Date getEndTime() {
+    
+	public Date getEndTime() {
         return endTime;
     }
 
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
-    @Override
-    public String toString() {
-        return "VipCardRecord{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",orderId='" + orderId + "'" + 
-						",timeType='" + timeType + "'" + 
-						",startTime='" + startTime + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-						",endTime='" + endTime + "'" + 
-		                '}';
-    }
-	
+    
 }

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

@@ -0,0 +1,43 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * Description 审核状态(0:待审核;1:通过;2:未通过)
+ *
+ * @author: liujunchi
+ * @date: 2022-03-30
+ */
+public enum AuditEnum implements BaseEnum<Integer,AuditEnum> {
+
+
+    AUDITING(0,"待审核"),
+    OPEN(1,"通过"),
+    REJECT(2,"未通过");
+    @EnumValue
+    private Integer code;
+    private String msg;
+
+    AuditEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * Description 收费类型(0:免费;1:会员;2:单曲收费)
+ *
+ * @author: liujunchi
+ * @date: 2022-03-30
+ */
+public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
+
+    FREE(0,"免费"),
+    VIP(1,"会员"),
+    CHARGE(2,"单曲收费");
+    @EnumValue
+    private Integer code;
+    private String msg;
+
+    ChargeTypeEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 课程类型
+ */
+public enum CourseScheduleEnum {
+    //课程类型
+    PRACTICE("PRACTICE", "陪练课"),
+    LIVE("LIVE", "直播课"),
+    //课程状态
+    NOT_START("NOT_START", "未开始"),
+    ING("ING", "进行中"),
+    COMPLETE("COMPLETE", "已完成"),
+    CANCEL("CANCEL", "已取消");
+
+    private String code;
+
+    private String msg;
+
+    CourseScheduleEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    /**
+     * 校验课程类型code是否正确
+     *
+     * @param code   code
+     * @param errMsg 错误异常
+     */
+    public static void existCourseType(String code, String errMsg) {
+        CourseScheduleEnum[] values = {PRACTICE, LIVE};
+        existCourse(values, code, errMsg);
+    }
+
+    /**
+     * 校验课程状态code是否正确
+     *
+     * @param code   code
+     * @param errMsg 错误异常
+     */
+    public static void existCourseState(String code, String errMsg) {
+        CourseScheduleEnum[] values = {NOT_START, ING, COMPLETE, CANCEL};
+        existCourse(values, code, errMsg);
+    }
+
+    private static void existCourse(CourseScheduleEnum[] values,String code,String errMsg){
+        List<String> collect = Arrays.stream(values).map(CourseScheduleEnum::getCode).collect(Collectors.toList());
+        boolean typeFlag = collect.contains(code);
+        if (!typeFlag) {
+            throw new RuntimeException(errMsg);
+        }
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

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

@@ -1,50 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 课程类型
- */
-public enum CourseScheduleTypeEnum {
-
-    PRACTICE("PRACTICE", "陪练课"),
-    LIVE("LIVE", "直播课");
-
-    private String code;
-
-    private String msg;
-
-    CourseScheduleTypeEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    /**
-     * 校验code是否存在
-     * @param code code
-     * @return true存在
-     */
-    public static boolean isExistCode(String code) {
-        CourseScheduleTypeEnum[] values = CourseScheduleTypeEnum.values();
-        List<String> collect = Arrays.stream(values).map(CourseScheduleTypeEnum::getCode).collect(Collectors.toList());
-        return collect.contains(code);
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

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

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * Description 标签列表是否展开列表
+ *
+ * @author: liujunchi
+ * @date: 2022-03-30
+ */
+public enum OpenEnum implements BaseEnum<Integer, OpenEnum> {
+    OPEN(0,"展开"),
+    CLOSE(1, "不展开");
+    @EnumValue
+    private Integer code;
+
+    private String msg;
+
+    OpenEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -24,8 +24,8 @@ public enum RoomTypeEnum {
      * @return true存在
      */
     public static boolean isExistCode(String code) {
-        CourseScheduleTypeEnum[] values = CourseScheduleTypeEnum.values();
-        List<String> collect = Arrays.stream(values).map(CourseScheduleTypeEnum::getCode).collect(Collectors.toList());
+        CourseScheduleEnum[] values = CourseScheduleEnum.values();
+        List<String> collect = Arrays.stream(values).map(CourseScheduleEnum::getCode).collect(Collectors.toList());
         return collect.contains(code);
     }
 

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

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * Description
+ *
+ * @author: liujunchi
+ * @date: 2022-03-30
+ */
+public enum StateEnum implements BaseEnum<Integer, StateEnum> {
+    STOP(0,"停用"),
+    ENABLE(1, "启用");
+    @EnumValue
+    private Integer code;
+
+    private String msg;
+
+    StateEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -2,20 +2,28 @@ 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.CourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
 
 /**
  * 课程作业表 服务类
  * @author liweifan
- * @date 2022-03-28
+ * @date 2022-03-30
  */
 public interface CourseHomeworkService extends IService<CourseHomework>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	CourseHomeworkVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-28
+ 	 * @date 2022-03-30
      */
-    IPage<CourseHomework> selectPage(IPage<CourseHomework> page, CourseHomework courseHomework);
+    IPage<CourseHomeworkVo> selectPage(IPage<CourseHomeworkVo> page, CourseHomeworkSearch query);
 }

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

@@ -2,20 +2,28 @@ 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.CourseScheduleRepliedVo;
+import com.yonge.cooleshow.biz.dal.dto.search.CourseScheduleRepliedSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
 
 /**
  * 课程点评 服务类
  * @author liweifan
- * @date 2022-03-28
+ * @date 2022-03-30
  */
 public interface CourseScheduleRepliedService extends IService<CourseScheduleReplied>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	CourseScheduleRepliedVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-28
+ 	 * @date 2022-03-30
      */
-    IPage<CourseScheduleReplied> selectPage(IPage<CourseScheduleReplied> page, CourseScheduleReplied courseScheduleReplied);
+    IPage<CourseScheduleRepliedVo> selectPage(IPage<CourseScheduleRepliedVo> page, CourseScheduleRepliedSearch query);
 }

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

@@ -3,10 +3,13 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.vo.TeacherCourseVo;
+import com.yonge.cooleshow.common.page.PageInfo;
 
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 老师课程表(CourseSchedule)表服务接口
@@ -18,10 +21,35 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     CourseScheduleDao getDao();
 
+    /**
+     * 老师端-首页-我的课程-直播课
+     *
+     * @param param 传入参数
+     *              <p> - year 年
+     *              <p> - month 月
+     *              <p> - row 条数
+     *              <p> - page 页数
+     *              <p> - status 课程状态 NOT_START未开始 ING进行中 COMPLETE已完成
+     */
+    PageInfo<TeacherCourseVo> queryTeacherLiveCourse(Map<String, Object> param);
+
+    /**
+     * 锁定课时
+     *
+     * @param id 课程id
+     */
     void lockCourseTime(Long id);
 
+    /**
+     * 解锁
+     *
+     * @param id 课程id
+     */
     void unlockCourseTime(Long id);
 
+    /**
+     * 添加课时
+     */
     void add(@Valid CourseSchedule course);
 
 }

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

@@ -0,0 +1,18 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.vo.HomeTotalVo;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/30 18:07
+ */
+public interface HomeService {
+    /***
+     * 查询首页待办事项
+     * @author liweifan
+     * @param: id
+     * @updateTime 2022/3/30 18:10
+     * @return: com.yonge.cooleshow.biz.dal.vo.HomeTotalVo
+     */
+    HomeTotalVo getUserToDoNum(Long id);
+}

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

@@ -3,7 +3,9 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.LiveRoomDao;
 import com.yonge.cooleshow.biz.dal.entity.LiveRoom;
+import com.yonge.cooleshow.biz.dal.entity.RoomInfoCache;
 import com.yonge.cooleshow.biz.dal.entity.RoomUserInfoCache;
+import com.yonge.cooleshow.biz.dal.vo.RoomVo;
 
 import java.util.List;
 import java.util.Map;
@@ -19,6 +21,13 @@ public interface LiveRoomService extends IService<LiveRoom> {
     LiveRoomDao getDao();
 
     /**
+     * 根据房间uid查询房间信息
+     *
+     * @param roomUid 房间uid
+     */
+    RoomVo queryRoomInfo(String roomUid);
+
+    /**
      * 定时任务创建直播间
      */
     void createCourseLiveRoom();
@@ -31,7 +40,7 @@ public interface LiveRoomService extends IService<LiveRoom> {
     /**
      * 创建临时房间-直播间
      */
-    void createTempLiveRoom(Map<String, Object> param);
+    String createTempLiveRoom(Map<String, Object> param);
 
     /**
      * 进入房间
@@ -39,7 +48,7 @@ public interface LiveRoomService extends IService<LiveRoom> {
      * @param roomUid 房间uid
      * @param userId  用户id 主讲人或者用户的id
      */
-    void joinRoom(String roomUid, Long userId);
+    RoomInfoCache joinRoom(String roomUid, Long userId);
 
     /**
      * 查询在观看直播的用户信息

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

@@ -1,9 +1,12 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 
 /**
  * MusicSheetService服务类
@@ -19,4 +22,21 @@ public interface MusicSheetService extends IService<MusicSheet> {
      */
     boolean saveMp3AndAccompaniment(MusicSheetDto musicSheetDto, SysUser sysUser);
 
+
+    /**
+     * 曲目分页查询
+     *
+     * @param page 分页
+     * @param query 查询条件
+     * @return iPage 分页信息
+     */
+    IPage<MusicSheetVo> selectPage(IPage<MusicSheetVo> page, MusicSheetSearch query);
+
+    /**
+     * 曲目状态修改 启用、停用
+     *
+     * @param id 曲目id
+     * @return boolean
+     */
+    boolean state(Long id);
 }

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

@@ -2,9 +2,10 @@ 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.MusicTagVo;
+import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 
 /**
  * 音乐标签表 服务类
@@ -26,4 +27,35 @@ public interface MusicTagService extends IService<MusicTag>  {
  	 * @date 2022-03-29
      */
     IPage<MusicTagVo> selectPage(IPage<MusicTagVo> page, MusicTagSearch query);
+
+	/**
+	 * 假删除标签
+	 *
+	 * @param musicTagId 标签ID
+	 * @return boolean
+	 */
+    boolean del(Long musicTagId);
+
+	/**
+	 * 启用/停用 标签
+	 *
+	 * @param musicTagId 标签ID
+	 * @return boolean
+	 */
+	boolean state(Long musicTagId);
+
+	/**
+	 * 创建音乐标签
+	 *
+	 * @param musicTagSaveDto 音乐标签信息
+	 */
+    void createMusicTag(MusicTagSaveDto musicTagSaveDto);
+
+	/**
+	 * 修改音乐标签
+	 *
+	 * @param musicTagSaveDto 音乐标签信息
+	 */
+	void updateMusicTag(MusicTagSaveDto musicTagSaveDto);
+
 }

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

@@ -2,20 +2,28 @@ 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.OrderDetailVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderDetailSearch;
 import com.yonge.cooleshow.biz.dal.entity.OrderDetail;
 
 /**
  * 平台订单表 服务类
  * @author liweifan
- * @date 2022-03-18
+ * @date 2022-03-30
  */
 public interface OrderDetailService extends IService<OrderDetail>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	OrderDetailVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-18
+ 	 * @date 2022-03-30
      */
-    IPage<OrderDetail> selectPage(IPage<OrderDetail> page, OrderDetail orderDetail);
+    IPage<OrderDetailVo> selectPage(IPage<OrderDetailVo> page, OrderDetailSearch query);
 }

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

@@ -2,20 +2,28 @@ 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.OrderRefundsVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderRefundsSearch;
 import com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
 
 /**
  * 用户退款表 服务类
  * @author liweifan
- * @date 2022-03-18
+ * @date 2022-03-30
  */
 public interface OrderRefundsService extends IService<OrderRefunds>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	OrderRefundsVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-18
+ 	 * @date 2022-03-30
      */
-    IPage<OrderRefunds> selectPage(IPage<OrderRefunds> page, OrderRefunds orderRefunds);
+    IPage<OrderRefundsVo> selectPage(IPage<OrderRefundsVo> page, OrderRefundsSearch query);
 }

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

@@ -2,20 +2,28 @@ 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.OrderVo;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.Order;
 
 /**
  * 平台订单表 服务类
  * @author liweifan
- * @date 2022-03-18
+ * @date 2022-03-30
  */
 public interface OrderService extends IService<Order>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	OrderVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-18
+ 	 * @date 2022-03-30
      */
-    IPage<Order> selectPage(IPage<Order> page, Order order);
+    IPage<OrderVo> selectPage(IPage<OrderVo> page, OrderSearch query);
 }

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

@@ -2,20 +2,28 @@ 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.StudentAttendanceVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentAttendanceSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentAttendance;
 
 /**
  * 学生考勤表 服务类
  * @author liweifan
- * @date 2022-03-23
+ * @date 2022-03-30
  */
 public interface StudentAttendanceService extends IService<StudentAttendance>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	StudentAttendanceVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-23
+ 	 * @date 2022-03-30
      */
-    IPage<StudentAttendance> selectPage(IPage<StudentAttendance> page, StudentAttendance studentAttendance);
+    IPage<StudentAttendanceVo> selectPage(IPage<StudentAttendanceVo> page, StudentAttendanceSearch query);
 }

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

@@ -2,20 +2,28 @@ 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.StudentCourseHomeworkVo;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentCourseHomeworkSearch;
 import com.yonge.cooleshow.biz.dal.entity.StudentCourseHomework;
 
 /**
  * 学生课程作业 服务类
  * @author liweifan
- * @date 2022-03-23
+ * @date 2022-03-30
  */
 public interface StudentCourseHomeworkService extends IService<StudentCourseHomework>  {
 
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-03-30
+     */
+	StudentCourseHomeworkVo detail(Long id);
 
     /**
-     * 自定义分页
+     * 分页查询
      * @author liweifan
- 	 * @date 2022-03-23
+ 	 * @date 2022-03-30
      */
-    IPage<StudentCourseHomework> selectPage(IPage<StudentCourseHomework> page, StudentCourseHomework studentCourseHomework);
+    IPage<StudentCourseHomeworkVo> selectPage(IPage<StudentCourseHomeworkVo> page, StudentCourseHomeworkSearch query);
 }

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

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.models.auth.In;
 
 /**
  * 老师入驻审核表 服务类
@@ -56,5 +57,11 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
      */
     TeacherAuthEntryRecordVo getLastRecordByUserId(Long userId);
-
+    /***
+     * 查询待处理的记录数
+     * @author liweifan
+     * @updateTime 2022/3/30 18:33
+     * @return: java.lang.Integer
+     */
+    Integer getUserToDoNum();
 }

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

@@ -66,5 +66,11 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord
      */
     TeacherAuthMusicianRecord getLastRecordByUserId(Long userId);
-
+    /***
+     * 查询待处理的记录数
+     * @author liweifan
+     * @updateTime 2022/3/30 18:41
+     * @return: java.lang.Integer
+     */
+    Integer getUserToDoNum();
 }