修改

mec-education/src/main/java/com/ym/mec/education/controller/TeacherController.java

@@ -66,6 +66,6 @@ public class TeacherController {
     @PostMapping(value = "/teacherVipClass")
     public PageResponse teacherVipClass(@RequestBody TeacherReq req){
 
-        return null;
+        return teacherService.teacherVipClass(req);
     }
 }

mec-education/src/main/java/com/ym/mec/education/controller/VipGroupController.java

@@ -35,7 +35,7 @@ public class VipGroupController {
     @ApiOperation("小课详情-le")
     public PageResponse courseList(@RequestBody VipGroupReq vipGroupReq){
 
-        return null;
+        return vipGroupService.courseList(vipGroupReq);
 
     }
 }

mec-education/src/main/java/com/ym/mec/education/entity/CourseSchedule.java

@@ -118,11 +118,7 @@ public class CourseSchedule extends Model<CourseSchedule> {
      */
     @TableField("teach_mode_")
     private String teachMode;
-    /**
-     * 投诉状态
-     */
-    @TableField("complaint_status_")
-    private String complaintStatus;
+
     /**
      * 课程类型(单技课、小班课、合奏课、综合课、练习课、启蒙课、集训课、VIP课、试听课)
      */
@@ -154,7 +150,6 @@ public class CourseSchedule extends Model<CourseSchedule> {
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", teachMode='" + teachMode + '\'' +
-                ", complaintStatus='" + complaintStatus + '\'' +
                 ", type='" + type + '\'' +
                 ", name='" + name + '\'' +
                 '}';

mec-education/src/main/java/com/ym/mec/education/entity/VipGroup.java

@@ -72,11 +72,7 @@ public class VipGroup extends Model<VipGroup> {
      */
     @TableField("vip_group_category_id_")
     private Integer vipGroupCategoryId;
-    /**
-     * 价格
-     */
-    @TableField("unit_price_")
-    private BigDecimal unitPrice;
+
     /**
      * 审核状态
      */
@@ -206,14 +202,6 @@ public class VipGroup extends Model<VipGroup> {
         return this;
     }
 
-    public BigDecimal getUnitPrice() {
-        return unitPrice;
-    }
-
-    public VipGroup setUnitPrice(BigDecimal unitPrice) {
-        this.unitPrice = unitPrice;
-        return this;
-    }
 
     public String getAuditStatus() {
         return auditStatus;
@@ -254,7 +242,6 @@ public class VipGroup extends Model<VipGroup> {
         ", registrationStartTime=" + registrationStartTime +
         ", name=" + name +
         ", vipGroupCategoryId=" + vipGroupCategoryId +
-        ", unitPrice=" + unitPrice +
         ", auditStatus=" + auditStatus +
         ", organIdList=" + organIdList +
         "}";

mec-education/src/main/java/com/ym/mec/education/entity/VipGroupCategory.java

@@ -28,16 +28,7 @@ public class VipGroupCategory extends Model<VipGroupCategory> {
      */
     @TableField("name_")
     private String name;
-    /**
-     * 线上薪水
-     */
-    @TableField("online_classes_salary_")
-    private BigDecimal onlineClassesSalary;
-    /**
-     * 线下薪水
-     */
-    @TableField("offline_classes_salary_")
-    private BigDecimal offlineClassesSalary;
+
     @TableField("del_flag_")
     private String delFlag;
     @TableField("create_time_")
@@ -64,23 +55,8 @@ public class VipGroupCategory extends Model<VipGroupCategory> {
         return this;
     }
 
-    public BigDecimal getOnlineClassesSalary() {
-        return onlineClassesSalary;
-    }
-
-    public VipGroupCategory setOnlineClassesSalary(BigDecimal onlineClassesSalary) {
-        this.onlineClassesSalary = onlineClassesSalary;
-        return this;
-    }
 
-    public BigDecimal getOfflineClassesSalary() {
-        return offlineClassesSalary;
-    }
 
-    public VipGroupCategory setOfflineClassesSalary(BigDecimal offlineClassesSalary) {
-        this.offlineClassesSalary = offlineClassesSalary;
-        return this;
-    }
 
     public String getDelFlag() {
         return delFlag;
@@ -119,8 +95,6 @@ public class VipGroupCategory extends Model<VipGroupCategory> {
         return "VipGroupCategory{" +
         ", id=" + id +
         ", name=" + name +
-        ", onlineClassesSalary=" + onlineClassesSalary +
-        ", offlineClassesSalary=" + offlineClassesSalary +
         ", delFlag=" + delFlag +
         ", createTime=" + createTime +
         ", updateTime=" + updateTime +

mec-education/src/main/java/com/ym/mec/education/service/impl/VipGroupDefaultClassesCycleServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-10-02
  */
-@Service
+@Service("IVipGroupDefaultClassesCycleService")
 public class VipGroupDefaultClassesCycleServiceImpl extends ServiceImpl<VipGroupDefaultClassesCycleMapper, VipGroupDefaultClassesCycle> implements IVipGroupDefaultClassesCycleService {
 
 }

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

@@ -16,7 +16,6 @@ import com.ym.mec.education.resp.VipClassScheduleResp;
 import com.ym.mec.education.resp.VipGroupResp;
 import com.ym.mec.education.service.*;
 import com.ym.mec.education.utils.DateUtil;
-import org.apache.velocity.util.ArrayListWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -93,6 +92,7 @@ public class VipGroupServiceImpl extends ServiceImpl<VipGroupMapper, VipGroup> i
     }
 
     /**
+     * 点名记录
      * @param vipGroupReq
      * @return
      */

mec-education/src/main/resources/mapper/CourseScheduleMapper.xml

@@ -16,8 +16,6 @@
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
         <result column="teach_mode_" property="teachMode" />
-        <result column="complaint_status_" property="complaintStatus" />
-        <result column="complaint_status_" property="complaintStatus" />
         <result column="type_" property="type" />
         <result column="name_" property="name" />
     </resultMap>
@@ -25,7 +23,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id_, class_group_id_, status_, subsidy_, class_date_, start_class_time_, end_class_time_, teacher_id_,
-        actual_teacher_id_, create_time_, update_time_, teach_mode_, complaint_status_,type_, name_
+        actual_teacher_id_, create_time_, update_time_, teach_mode_,type_, name_
     </sql>
 
 </mapper>

mec-education/src/main/resources/mapper/VipGroupCategoryMapper.xml

@@ -6,8 +6,6 @@
     <resultMap id="BaseResultMap" type="com.ym.mec.education.entity.VipGroupCategory">
         <id column="id_" property="id" />
         <result column="name_" property="name" />
-        <result column="online_classes_salary_" property="onlineClassesSalary" />
-        <result column="offline_classes_salary_" property="offlineClassesSalary" />
         <result column="del_flag_" property="delFlag" />
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
@@ -15,7 +13,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id_, name_, online_classes_salary_, offline_classes_salary_, del_flag_, create_time_, update_time_
+        id_, name_, del_flag_, create_time_, update_time_
     </sql>
 
 </mapper>

mec-education/src/main/resources/mapper/VipGroupMapper.xml

@@ -17,14 +17,13 @@
         <result column="registration_start_time_" property="registrationStartTime" />
         <result column="name_" property="name" />
         <result column="vip_group_category_id_" property="vipGroupCategoryId" />
-        <result column="price_" property="price" />
         <result column="audit_status_" property="auditStatus" />
         <result column="organ_id_list_" property="organIdList" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id_, user_id_, single_class_minutes_, payment_expire_date_, courses_expire_date_, create_time_, update_time_, teacher_school_id_, online_classes_num_, offline_classes_num_, registration_start_time_, name_, vip_group_category_id_, price_, audit_status_, organ_id_list_
+        id_, user_id_, single_class_minutes_, payment_expire_date_, courses_expire_date_, create_time_, update_time_, teacher_school_id_, online_classes_num_, offline_classes_num_, registration_start_time_, name_, vip_group_category_id_, audit_status_, organ_id_list_
     </sql>
 
 </mapper>