视频课添加收费方式

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

@@ -31,6 +31,9 @@ public class CourseGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "课程状态 DOING UNPASS PASS")
     private String status;
 
+    @ApiModelProperty("收费方式，VIP：会员，PAY:购买")
+    private String payType;
+
     @ApiModelProperty(value = "结算状态")
     private String salaryStatus;
 
@@ -186,4 +189,12 @@ public class CourseGroupSearch extends QueryInfo {
     public void setShelvesFlag(Integer shelvesFlag) {
         this.shelvesFlag = shelvesFlag;
     }
+
+    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/VideoLessonGroupServiceImpl.java

@@ -434,6 +434,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         //添加组
         lessonGroup.setTeacherId(sysUser.getId());
         lessonGroup.setAuditVersion(YesOrNoEnum.NO);
+        if ("VIP".equals(lessonGroup.getPayType())) {
+            lessonGroup.setLessonPrice(BigDecimal.ZERO);
+        }
         videoLessonGroupDao.insert(lessonGroup);
 
         for (VideoLessonGroupDetail detail : lessonList) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseGroupVideoVo.java

@@ -24,6 +24,9 @@ public class CourseGroupVideoVo extends BaseEntity {
     private Long subjectId;
     @ApiModelProperty("声部名称")
     private String subjectName;
+
+    @ApiModelProperty("收费方式，VIP：会员，PAY:购买")
+    private String payType;
     @ApiModelProperty("购课人数")
     private Integer buyCount;
     @ApiModelProperty("课时总数")
@@ -192,4 +195,12 @@ public class CourseGroupVideoVo extends BaseEntity {
     public void setShelvesFlag(Integer shelvesFlag) {
         this.shelvesFlag = shelvesFlag;
     }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 }

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

@@ -580,6 +580,7 @@
             IFNULL(p.count_,0)  AS buyCount,
             g.teacher_id_ AS teacherId,
             u.username_ AS teacherName,
+            g.pay_type_ AS payType,
             u.real_name_ AS teacherRealName,
             g.create_time_ AS createTime,
             g.shelves_time_ AS recordTime,
@@ -622,6 +623,9 @@
             <if test="param.relationType != null">
                 AND g.relation_type_ = #{param.relationType}
             </if>
+            <if test="param.payType != null">
+                AND g.pay_type_ = #{param.payType}
+            </if>
         </where>
         order by g.top_flag_ desc ,g.sort_number_ desc,g.id_ desc
     </select>