视频课添加收费方式

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

@@ -160,14 +160,11 @@ public class VideoLessonGroupController extends BaseController {
         }
 
         VideoLessonStudentVo videoLessonStudentVo = videoLessonGroupService.selectVideoLesson(groupId);
-        if (videoLessonStudentVo.getLessonGroup().getTeacherId().equals(sysUser.getId())) {
+        if (videoLessonStudentVo.getLessonGroup() != null && videoLessonStudentVo.getLessonGroup().getTeacherId().equals(sysUser.getId())) {
             videoLessonStudentVo.setMyself(true);
-        } else {
-            videoLessonStudentVo.setMyself(false);
-        }
-        if (videoLessonStudentVo.getLessonGroup() != null && sysUser.getId().equals(videoLessonStudentVo.getLessonGroup().getId())) {
             videoLessonStudentVo.setAlreadyBuy(true);
         } else {
+            videoLessonStudentVo.setMyself(false);
             videoLessonStudentVo.setAlreadyBuy(false);
         }
         return succeed(videoLessonStudentVo);

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

@@ -1,11 +1,15 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.valid.AddGroup;
+import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -42,6 +46,9 @@ public class VideoGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "历史记录所属视频组id")
     private Long groupId;
 
+    @ApiModelProperty(value = "收费方式：VIP:会员，PAY:购买;")
+    private String payType;
+
     public String getSearch() {
         return search;
     }
@@ -105,4 +112,12 @@ public class VideoGroupSearch extends QueryInfo {
     public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 }

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

@@ -239,6 +239,11 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
             lessonStudentVo.setDegreeFlag(teacher.getDegreeFlag());
         }
 
+        VideoLessonGroup videoLessonGroup = videoLessonGroupDao.selectGroupById(groupId);
+        if (videoLessonGroup != null) {
+            videoLessonGroupVo.setPayType(videoLessonGroup.getPayType());
+        }
+
         lessonStudentVo.setLessonGroup(videoLessonGroupVo);
 
         VideoLessonSearch search = new VideoLessonSearch();

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

@@ -458,6 +458,7 @@
 			g.lesson_name_ AS lessonName,
 			g.lesson_subject_ AS lessonSubject,
 			g.lesson_desc_ AS lessonDesc,
+			vlg.pay_type_ AS payType,
 			g.lesson_price_ AS lessonPrice,
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.teacher_id_ AS teacherId,
@@ -486,6 +487,7 @@
 			t.real_name_ AS realName,
 			t.phone_ AS teacherPhone
 		FROM video_lesson_auth_record r
+		LEFT JOIN video_lesson_group vlg on r.video_group_id_ = vlg.id_
 		LEFT JOIN video_lesson_group_log g ON g.video_lesson_group_id_=r.video_group_id_ and r.version_ = g.version_
 		LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
 		LEFT JOIN sys_user t ON g.teacher_id_=t.id_