视频课添加收费方式

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

@@ -55,6 +55,11 @@ public class VideoLessonGroup extends BaseEntity {
     @NotBlank(message = "课程介绍不能为空;", groups = {AddGroup.class, UpdateGroup.class})
     private String lessonDesc;  //课程介绍
 
+    @TableField("lesson_desc_")
+    @ApiModelProperty(value = "收费方式：VIP:会员，PAY:购买;", required = true)
+    @NotBlank(message = "收费方式不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private String payType;
+
     @TableField("lesson_price_")
     @ApiModelProperty(value = "课程价格", required = true)
     @NotNull(message = "课程价格不能为空;", groups = {AddGroup.class, UpdateGroup.class})
@@ -351,4 +356,12 @@ public class VideoLessonGroup extends BaseEntity {
     public void setShelvesId(Long shelvesId) {
         this.shelvesId = shelvesId;
     }
+
+    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/vo/LessonGroupVo.java

@@ -2,11 +2,14 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.enums.course.CourseRelationTypeEnum;
+import com.yonge.cooleshow.biz.dal.valid.AddGroup;
+import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 
 /**
@@ -30,6 +33,9 @@ public class LessonGroupVo extends BaseEntity {
     @ApiModelProperty(value = "课程介绍")
     private String lessonDesc;
 
+    @ApiModelProperty(value = "收费方式：VIP:会员，PAY:购买;")
+    private String payType;
+
     @ApiModelProperty(value = "课程价格")
     private BigDecimal lessonPrice;
 
@@ -188,4 +194,12 @@ public class LessonGroupVo extends BaseEntity {
     public void setRelationType(CourseRelationTypeEnum relationType) {
         this.relationType = relationType;
     }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 }

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

@@ -7,6 +7,7 @@
 		<result column="lesson_name_" jdbcType="VARCHAR" property="lessonName" />
 		<result column="lesson_subject_" jdbcType="VARCHAR" property="lessonSubject" />
 		<result column="lesson_desc_" jdbcType="VARCHAR" property="lessonDesc" />
+		<result column="pay_type_" jdbcType="VARCHAR" property="payType" />
 		<result column="lesson_price_" jdbcType="INTEGER" property="lessonPrice" />
 		<result column="lesson_cover_url_" jdbcType="VARCHAR" property="lessonCoverUrl" />
 		<result column="teacher_id_" jdbcType="BIGINT" property="teacherId" />
@@ -32,6 +33,7 @@
 		g.lesson_name_ AS lessonName,
 		g.lesson_subject_ AS lessonSubject,
 		g.lesson_desc_ AS lessonDesc,
+		g.pay_type_ AS payType,
 		g.lesson_price_ AS lessonPrice,
 		g.lesson_cover_url_ AS lessonCoverUrl,
 		g.teacher_id_ AS teacherId,
@@ -59,6 +61,7 @@
 		g.lesson_subject_ AS lessonSubject,
 		g.lesson_desc_ AS lessonDesc,
 		g.lesson_price_ AS lessonPrice,
+		g.lesson_price_ AS lessonPrice,
 		g.lesson_cover_url_ AS lessonCoverUrl,
 		g.teacher_id_ AS teacherId,
 		g.lesson_count_ AS lessonCount,
@@ -85,6 +88,7 @@
 			<if test="lessonSubject !=null and lessonSubject !=''">lesson_subject_ = #{lessonSubject},</if>
 			<if test="lessonDesc !=null and lessonDesc !=''">lesson_desc_ = #{lessonDesc},</if>
 			<if test="lessonPrice !=null and lessonPrice !=''">lesson_price_ = #{lessonPrice},</if>
+			<if test="payType !=null and payType !=''">pay_type_ = #{payType},</if>
 			<if test="lessonCoverUrl !=null and lessonCoverUrl !=''">lesson_cover_url_ = #{lessonCoverUrl},</if>
 			<if test="sortNumber !=null">sort_number_ = #{sortNumber},</if>
 			<if test="lessonTag !=null and lessonTag !=''">lesson_tag_ = #{lessonTag},</if>
@@ -283,6 +287,7 @@
 			g.lesson_subject_ AS lessonSubject,
 			s.name_ AS lessonSubjectName,
 			g.lesson_desc_ AS lessonDesc,
+			g.pay_type_ AS payType,
 			g.lesson_price_ AS lessonPrice,
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.lesson_count_ AS lessonCount,
@@ -388,6 +393,7 @@
 			g.lesson_name_ AS lessonName,
 			g.lesson_subject_ AS lessonSubject,
 			g.lesson_desc_ AS lessonDesc,
+			g.pay_type_ AS payType,
 			g.lesson_price_ AS lessonPrice,
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.teacher_id_ AS teacherId,
@@ -525,6 +531,7 @@
 			g.lesson_name_ AS lessonName,
 			g.lesson_subject_ AS lessonSubject,
 			g.lesson_desc_ AS lessonDesc,
+			g.pay_type_ AS payType,
 			g.lesson_price_ AS lessonPrice,
 			g.lesson_cover_url_ AS lessonCoverUrl,
 			g.teacher_id_ AS teacherId,