diff --git a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java
index ecab41b1..6a0e0f17 100644
--- a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java
+++ b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java
@@ -27,6 +27,9 @@ public class TrainingClass {
     //年份
     private String year;
 
+    //培训日期
+    private String trainingDate;
+
     //详情图片
     private String icon;
 
@@ -36,14 +39,26 @@ public class TrainingClass {
     //费用
     private BigDecimal fee;
 
+    //可以用vip价格的VIP类型
+    private String vipType;
+
     //vip费用
     private BigDecimal vipFee;
 
+    //可以用svip价格的sVIP类型
+    private String svipType;
+
     //svip费用
     private BigDecimal svipFee;
 
-    //湖粉费用
-    private BigDecimal huFee;
+    //三星湖粉费用（90湖分以上）
+    private BigDecimal threeHuFee;
+
+    //五星湖粉费用（150湖分以上）
+    private BigDecimal fiveHuFee;
+
+    //学生费用
+    private BigDecimal studentFee;
 
     //排序
     private Integer sort;
diff --git a/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java b/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java
index 04772ac1..6b1144ef 100644
--- a/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java
+++ b/src/main/java/com/peanut/modules/master/controller/TrainingClassController.java
@@ -7,9 +7,11 @@ import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.common.entity.TrainingClass;
 import com.peanut.modules.common.entity.TrainingToUser;
+import com.peanut.modules.common.entity.VipBuyConfigEntity;
 import com.peanut.modules.common.service.MyUserService;
 import com.peanut.modules.common.service.TrainingClassService;
 import com.peanut.modules.common.service.TrainingToUserService;
+import com.peanut.modules.master.service.VipBuyConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -34,10 +37,25 @@ public class TrainingClassController {
     private TrainingToUserService trainingToUserService;
     @Autowired
     private MyUserService userService;
+    @Autowired
+    private VipBuyConfigService vipBuyConfigService;
+
+    //vip商品类型
+    @RequestMapping("/getVipBuyConfigList")
+    public R getVipBuyConfigList() {
+        List vipBuyConfigList = vipBuyConfigService.list(new LambdaQueryWrapper<VipBuyConfigEntity>()
+                .select(VipBuyConfigEntity::getType,VipBuyConfigEntity::getTitle)
+                .and(r->r.eq(VipBuyConfigEntity::getDateType,0).or(f->f.eq(VipBuyConfigEntity::getDateType,1).lt(VipBuyConfigEntity::getStartTime,new Date()).gt(VipBuyConfigEntity::getEndTime,new Date())))
+                .notLike(VipBuyConfigEntity::getTitle,"延期")
+                .groupBy(VipBuyConfigEntity::getType)
+                .groupBy(VipBuyConfigEntity::getType));
+        return R.ok().put("vipBuyConfigList",vipBuyConfigList);
+    }
 
     //新建培训班
     @RequestMapping("/addTrainingClass")
     public R addTrainingClass(@RequestBody TrainingClass trainingClass) {
+        trainingClass.setYear(trainingClass.getTrainingDate().substring(0,4));
         trainingClassService.save(trainingClass);
         return R.ok();
     }
@@ -45,6 +63,7 @@ public class TrainingClassController {
     //修改培训班
     @RequestMapping("/editTrainingClass")
     public R editTrainingClass(@RequestBody TrainingClass trainingClass) {
+        trainingClass.setYear(trainingClass.getTrainingDate().substring(0,4));
         trainingClassService.updateById(trainingClass);
         return R.ok();
     }
@@ -52,13 +71,30 @@ public class TrainingClassController {
     //培训班列表
     @RequestMapping("/trainingClassList")
     public R trainingClassList(@RequestBody Map<String,Object> params) {
+        LambdaQueryWrapper<TrainingClass> wrapper = new LambdaQueryWrapper();
+        wrapper.like(StringUtils.isNotEmpty(params.get("title").toString()),TrainingClass::getTitle,params.get("title"));
+        wrapper.eq(StringUtils.isNotEmpty(params.get("type").toString()),TrainingClass::getType,params.get("type"));
+        wrapper.like(StringUtils.isNotEmpty(params.get("year").toString()),TrainingClass::getYear,params.get("year"));
+        wrapper.eq(StringUtils.isNotEmpty(params.get("singupFlag").toString()),TrainingClass::getSingupFlag,params.get("singupFlag"));
+        if (StringUtils.isNotEmpty(params.get("trainingDateSort").toString())){
+            if ("1".equals(params.get("trainingDateSort").toString())){
+                wrapper.orderByDesc(TrainingClass::getTrainingDate);
+            }else {
+                wrapper.orderByAsc(TrainingClass::getTrainingDate);
+            }
+        }else if (StringUtils.isNotEmpty(params.get("createTimeSort").toString())){
+            if ("1".equals(params.get("createTimeSort").toString())){
+                wrapper.orderByDesc(TrainingClass::getCreateTime);
+            }else {
+                wrapper.orderByAsc(TrainingClass::getCreateTime);
+            }
+        }else {
+            wrapper.orderByDesc(TrainingClass::getYear);
+            wrapper.orderByAsc(TrainingClass::getSort);
+            wrapper.orderByDesc(TrainingClass::getCreateTime);
+        }
         Page<TrainingClass> trainingClassList = trainingClassService.page(new Page<>(
-                Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),new LambdaQueryWrapper<TrainingClass>()
-                .like(StringUtils.isNotEmpty(params.get("title").toString()),TrainingClass::getTitle,params.get("title"))
-                .eq(StringUtils.isNotEmpty(params.get("type").toString()),TrainingClass::getType,params.get("type"))
-                .eq(StringUtils.isNotEmpty(params.get("year").toString()),TrainingClass::getYear,params.get("year"))
-                .eq(StringUtils.isNotEmpty(params.get("singupFlag").toString()),TrainingClass::getSingupFlag,params.get("singupFlag"))
-                .orderByAsc(TrainingClass::getSort));
+                Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         return R.ok().put("trainingClassList",trainingClassList);
     }