Merge remote-tracking branch 'origin/dev_1_3_3_20220822' into dev_1_3_3_20220822

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

@@ -105,7 +105,7 @@ public class Teacher implements Serializable {
     private Date entryAuthDate;
 
 
-    @ApiModelProperty("老师点亮图标 STYLE:个人风采 VIDEO：视频课 LIVE：直播课，MUSIC：曲目 ")
+    @ApiModelProperty("老师点亮图标 STYLE:个人风采 VIDEO：视频课 LIVE：直播课，MUSIC：曲目 DEGREE:学历 TEACHER：教资")
     @TableField(value = "tag_")
     private String tag;
 

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

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -94,6 +95,9 @@ public class TeacherCourseGroupController extends BaseController {
     @ApiOperation("创建直播课程组-新增课程组")
     @PostMapping("/addLiveCourse")
     public HttpResponseResult<Object> addLiveCourse(@RequestBody LiveCourseGroupDto dto) {
+        if (dto.getCoursePrice().compareTo(BigDecimal.ZERO) <= 0) {
+            return failed("课程价格不能为0元");
+        }
         courseGroupService.addLiveCourse(dto);
         return succeed();
     }

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +56,9 @@ public class CourseGroupController extends BaseController {
     @ApiOperation("创建直播课程组-新增课程组")
     @PostMapping("/addLiveCourse")
     public HttpResponseResult<Object> addLiveCourse(@RequestBody LiveCourseGroupDto dto) {
+        if (dto.getCoursePrice().compareTo(BigDecimal.ZERO) <= 0) {
+            return failed("课程价格不能为0元");
+        }
         courseGroupService.addLiveCourse(dto);
         return succeed();
     }