培训班

src/main/java/com/peanut/modules/common/entity/BuyOrder.java

@@ -171,7 +171,7 @@ public class BuyOrder implements Serializable {
 
     private Integer abroadBookId;//海外读书购买书籍id
 
-    private Integer offlineActivityId;//线下活动id
+    private Integer trainingClassId;//培训班id
 
     /**
      * 地址id
@@ -218,4 +218,6 @@ public class BuyOrder implements Serializable {
     private VipBuyConfigEntity vipBuyConfigEntity;
     @TableField(exist = false)
     private BookEntity bookEntity;
+    @TableField(exist = false)
+    private String trainingClassIdentity;
 }

src/main/java/com/peanut/modules/common/entity/TrainingClass.java

@@ -30,10 +30,13 @@ public class TrainingClass {
     //培训日期
     private String trainingDate;
 
+    //截至日期
+    private String endDate;
+
     //详情图片
     private String icon;
 
-    //报名开关 0可报名1不可报名
+    //报名开关 0不可报名1可报名
     private Integer singupFlag;
 
     //费用
@@ -70,5 +73,9 @@ public class TrainingClass {
 
     @TableField(exist = false)
     private int isJoin;
+    @TableField(exist = false)
+    private String identity;
+    @TableField(exist = false)
+    private String finalFee;
 
 }

src/main/java/com/peanut/modules/common/entity/TrainingToUser.java

@@ -24,8 +24,6 @@ public class TrainingToUser {
 
     private String identity;
 
-    private String payMethod;
-
     private Date createTime;
 
     @TableLogic
@@ -33,5 +31,11 @@ public class TrainingToUser {
 
     @TableField(exist = false)
     private MyUserEntity user;
+    @TableField(exist = false)
+    private String payMethod;
+    @TableField(exist = false)
+    private String realMoney;
+    @TableField(exist = false)
+    private String jfDeduction;
 
 }

src/main/java/com/peanut/modules/common/entity/UserVip.java

@@ -25,7 +25,7 @@ public class UserVip implements Serializable {
      */
     private Integer userId;
     /**
-     * 4中医学5针灸学6肿瘤学7国学8心理学
+     * 4中医学5针灸学6肿瘤学7国学8心理学9中西汇通
      */
     private Integer type;
     /**