Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into feature/1219_opt

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

@@ -23,6 +23,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -100,7 +101,7 @@ public class TeacherCourseGroupController extends BaseController {
 
     @ApiOperation("创建直播课程组-新增课程组")
     @PostMapping("/addLiveCourse")
-    public HttpResponseResult<Object> addLiveCourse(@RequestBody LiveCourseGroupDto dto) {
+    public HttpResponseResult<Object> addLiveCourse(@Validated @RequestBody LiveCourseGroupDto dto) {
 
         YesOrNoEnum appAuditVersion = appVersionInfoService.getAppAuditVersion(dto.getPlatform(), dto.getVersion());
         if (appAuditVersion == YesOrNoEnum.NO && dto.getCoursePrice().compareTo(BigDecimal.ZERO) <= 0) {
@@ -109,6 +110,11 @@ public class TeacherCourseGroupController extends BaseController {
         if(StringUtils.isEmpty(dto.getCourseType())){
             dto.setCourseType(CourseScheduleEnum.LIVE.getCode());
         }
+        if (StringUtils.equals(dto.getCourseType(),CourseScheduleEnum.GROUP.getCode())){
+            if(dto.getMaxStudentNum() == null || dto.getMaxStudentNum() <= 0){
+                return failed("最大成课人数必须大于0");
+            }
+        }
         courseGroupService.addLiveCourse(dto);
         return succeed();
     }

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

@@ -51,7 +51,6 @@ public class LiveCourseGroupDto implements Serializable {
     @ApiModelProperty(value = "课程介绍")
     private String courseIntroduce;
 
-    @NotNull(message = "课程组售价不能为空")
     @ApiModelProperty(value = "课程组售价")
     private BigDecimal coursePrice;
 
@@ -67,7 +66,7 @@ public class LiveCourseGroupDto implements Serializable {
     @ApiModelProperty(value = "课程组售卖结束日期")
     private Date salesEndDate;
 
-    @NotBlank(message = "直播模版不能为空")
+    @NotBlank(message = "背景图不能为空")
     @ApiModelProperty(value = "直播背景图")
     private String backgroundPic;
 
@@ -76,15 +75,12 @@ public class LiveCourseGroupDto implements Serializable {
     @ApiModelProperty(value = "最少成课人数")
     private Integer mixStudentNum;
 
-    @NotNull(message = "最大成课人数不能为空")
-    @Positive(message = "最大成课人数必须大于0")
     @ApiModelProperty(value = "最大成课人数")
     private Integer maxStudentNum;
 
     @ApiModelProperty(value = "课程类型")
     private String courseType;
 
-    @NotNull(message = "课程休息时长不能为空")
     @ApiModelProperty(value = "课程休息时长")
     private Integer courseFreeMinutes;
 

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

@@ -587,17 +587,11 @@
             AND ts.status_ = #{param.salaryStatus}
         </if>
         <if test="param.startTime != null">
-            AND cs.start_time_ &lt;= #{param.startTime}
+            AND cs.class_date_ BETWEEN #{param.startTime} AND #{param.endTime}
         </if>
         <if test="param.search != null and param.search != ''">
             AND cs.id_ = #{param.search}
         </if>
-        <if test="param.endTime != null">
-            AND cs.end_time_ &gt;= #{param.endTime}
-        </if>
-        <if test="param.endTime != null">
-            AND cs.id_ LIKE concat('%',#{param.courseId},'%')
-        </if>
     </select>
     <select id="selectVideoGroup" resultType="com.yonge.cooleshow.biz.dal.vo.CourseGroupVideoVo">
         SELECT