提成优化修改、订单列表增加进粉字段、调理项目

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java

@@ -79,6 +79,9 @@ public class SysCustomer extends BaseEntity
     @Excel(name = "跟进状态")
     private Long followStatus;
 
+    /** 删除标识(0 未删除 1已删除) */
+    private Integer delFlag;
+
     /** 体征数据，非持久化字段 */
     private SysCustomerPhysicalSigns sign;
 
@@ -226,6 +229,14 @@ public class SysCustomer extends BaseEntity
         this.sign = sign;
     }
 
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java

@@ -108,8 +108,8 @@ public class SysCustomerPhysicalSigns extends BaseEntity
     @Excel(name = "联系沟通时间", readConverterExp = "2=4小时制")
     private Integer connectTime;
 
-    /** 备注 */
-    @Excel(name = "备注")
+    /** 饮食备注 */
+    @Excel(name = "饮食备注")
     private String remarks;
 
     /** 湿气数据 */
@@ -132,6 +132,13 @@ public class SysCustomerPhysicalSigns extends BaseEntity
     @Excel(name = "减脂经历")
     private String experience;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String comments;
+
+    /** 删除标识(0 未删除 1已删除) */
+    private Integer delFlag;
+
     /** 体征对象集合 **/
     private List<SysPhysicalSigns> signList;
 
@@ -402,6 +409,22 @@ public class SysCustomerPhysicalSigns extends BaseEntity
         this.signList = signList;
     }
 
+    public String getComments() {
+        return comments;
+    }
+
+    public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -440,5 +463,4 @@ public class SysCustomerPhysicalSigns extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .toString();
     }
-
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -188,6 +188,31 @@ public class SysOrder extends BaseEntity {
     @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
+    /**
+     * 调理项目id
+     */
+    private Integer conditioningProjectId;
+
+    /**
+     * 调理项目
+     */
+    @Excel(name = "调理项目", width = 30)
+    private String conditioningProject;
+
+    /**
+     * 服务结束时间（根据开始日期、服务月份、暂停记录计算而来）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "服务结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date serverEndTime;
+
+    /**
+     * 进粉时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date becomeFanTime;
+
     /**
      * 订单暂停记录 非持久化字段
      * */
@@ -476,6 +501,30 @@ public class SysOrder extends BaseEntity {
         this.orderPauseList = orderPauseList;
     }
 
+    public Integer getConditioningProjectId() {
+        return conditioningProjectId;
+    }
+
+    public void setConditioningProjectId(Integer conditioningProjectId) {
+        this.conditioningProjectId = conditioningProjectId;
+    }
+
+    public Date getServerEndTime() {
+        return serverEndTime;
+    }
+
+    public void setServerEndTime(Date serverEndTime) {
+        this.serverEndTime = serverEndTime;
+    }
+
+    public Date getBecomeFanTime() {
+        return becomeFanTime;
+    }
+
+    public void setBecomeFanTime(Date becomeFanTime) {
+        this.becomeFanTime = becomeFanTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -519,4 +568,12 @@ public class SysOrder extends BaseEntity {
                 .append("weight", getWeight())
                 .toString();
     }
+
+    public String getConditioningProject() {
+        return conditioningProject;
+    }
+
+    public void setConditioningProject(String conditioningProject) {
+        this.conditioningProject = conditioningProject;
+    }
 }