学生端课程购买

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupShowListDto.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.VipGroupActivityTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -10,6 +11,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2019/9/23
  */
+@Data
 public class StudentVipGroupShowListDto {
 
     @ApiModelProperty(value = "vip课ID",required = false)
@@ -64,156 +66,4 @@ public class StudentVipGroupShowListDto {
     private Date createTime;
 
     private String groupType;
-
-    public String getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(String groupType) {
-        this.groupType = groupType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getCourseStartDate() {
-        return courseStartDate;
-    }
-
-    public void setCourseStartDate(Date courseStartDate) {
-        this.courseStartDate = courseStartDate;
-    }
-
-    public Integer getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Integer teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public String getCategoryName() {
-        return categoryName;
-    }
-
-    public void setCategoryName(String categoryName) {
-        this.categoryName = categoryName;
-    }
-
-    public VipGroupActivityTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(VipGroupActivityTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getAttribute1() {
-        return attribute1;
-    }
-
-    public void setAttribute1(String attribute1) {
-        this.attribute1 = attribute1;
-    }
-
-    public String getIntroduction() {
-        return introduction;
-    }
-
-    public void setIntroduction(String introduction) {
-        this.introduction = introduction;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public Long getVipGroupId() {
-        return vipGroupId;
-    }
-
-    public void setVipGroupId(Long vipGroupId) {
-        this.vipGroupId = vipGroupId;
-    }
-
-    public String getVipGroupName() {
-        return vipGroupName;
-    }
-
-    public void setVipGroupName(String vipGroupName) {
-        this.vipGroupName = vipGroupName;
-    }
-
-    public Integer getSingleClassMinutes() {
-        return singleClassMinutes;
-    }
-
-    public void setSingleClassMinutes(Integer singleClassMinutes) {
-        this.singleClassMinutes = singleClassMinutes;
-    }
-
-    public Date getPaymentExpireDate() {
-        return paymentExpireDate;
-    }
-
-    public void setPaymentExpireDate(Date paymentExpireDate) {
-        this.paymentExpireDate = paymentExpireDate;
-    }
-
-    public Integer getOnlineClassesNum() {
-        return onlineClassesNum;
-    }
-
-    public void setOnlineClassesNum(Integer onlineClassesNum) {
-        this.onlineClassesNum = onlineClassesNum;
-    }
-
-    public Integer getOfflineClassesNum() {
-        return offlineClassesNum;
-    }
-
-    public void setOfflineClassesNum(Integer offlineClassesNum) {
-        this.offlineClassesNum = offlineClassesNum;
-    }
-
-    public BigDecimal getTotalPrice() {
-        return totalPrice;
-    }
-
-    public void setTotalPrice(BigDecimal totalPrice) {
-        this.totalPrice = totalPrice;
-    }
-
-    public Integer getExpectStudentNum() {
-        return expectStudentNum;
-    }
-
-    public void setExpectStudentNum(Integer expectStudentNum) {
-        this.expectStudentNum = expectStudentNum;
-    }
-
-    public Integer getStudentNum() {
-        return studentNum;
-    }
-
-    public void setStudentNum(Integer studentNum) {
-        this.studentNum = studentNum;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentVipGroupQueryInfo.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -9,6 +10,7 @@ import java.util.Date;
  * @Author Joburgess
  * @Date 2019/9/25
  */
+@Data
 public class StudentVipGroupQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "科目ID",required = false)
@@ -29,51 +31,6 @@ public class StudentVipGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否剔除已缴费截止数据")
     private Boolean expireFlag = false;
 
-    public Boolean getExpireFlag() {
-        return expireFlag;
-    }
-
-    public void setExpireFlag(Boolean expireFlag) {
-        this.expireFlag = expireFlag;
-    }
-
-    public Integer getOrganId() {
-        return organId;
-    }
-
-    public void setOrganId(Integer organId) {
-        this.organId = organId;
-    }
-
-    public String getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public String getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(String subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getClassType() {
-        return classType;
-    }
-
-    public void setClassType(String classType) {
-        this.classType = classType;
-    }
+    @ApiModelProperty(value = "课程类型: VIP, LIVE", required = true)
+    private String groupType;
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -4420,10 +4420,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         queryInfo.setExpireFlag(true);
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
-        // VIP小课
+        // VIP小课、直播课
         List<StudentVipGroupShowListDto> vipGroups = vipGroupDao.findVipGroups(params);
-        // TODO: 直播课
-
         // 网课
         vipGroups.addAll(practiceGroupService.findPracticeGroups(params));
         // 删除返回null值数据

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -380,9 +380,12 @@
             <if test="classType!=null and classType.toString()=='1'.toString()">
                 AND vg.online_classes_num_>0
             </if>
-            <if test="search!=null">
+            <if test="search != null and search != ''">
                 AND vg.name_ like concat('%',#{search},'%')
             </if>
+            <if test="groupType != null and groupType != ''">
+                AND vg.group_type_ = #{groupType}
+            </if>
         </where>
     </sql>
 
@@ -404,10 +407,10 @@
         t.introduction_,
         vga.type_,
         vgc.name_ category_name_,vg.create_time_,
-        'VIP' group_type_
+        vg.group_type_
         FROM
         vip_group vg
-        LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
+        LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = vg.group_type_
         LEFT JOIN teacher t ON vg.user_id_=t.id_
         LEFT JOIN sys_user su ON vg.user_id_=su.id_
         LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_=vga.id_

mec-student/src/main/java/com/ym/mec/student/controller/StudentVipGroupController.java

@@ -64,7 +64,7 @@ public class StudentVipGroupController extends BaseController {
         return succeed(result);
     }
 
-    @ApiOperation(value = "获取可购买vip、网管课列表")
+    @ApiOperation(value = "获取可购买vip、网管课、直播课列表")
     @RequestMapping(value = "/queryVipPracticeGroups")
     public HttpResponseResult<List<StudentVipGroupShowListDto>> queryVipPracticeGroups(@RequestBody StudentVipGroupQueryInfo queryInfo){
         SysUser sysUser = sysUserService.getUser();