订单类型改版

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

@@ -93,6 +93,9 @@ public class SysOrder extends BaseEntity {
      */
     private Long nutritionistId;
 
+    //营养师数组，比例拆分单时需要两个营养师，非持久化字段
+    private Long[] nutritionistIdList;
+
     /**
      * 营养师
      */
@@ -227,11 +230,37 @@ public class SysOrder extends BaseEntity {
      * 订单暂停记录 非持久化字段
      * */
     private List<SysOrderPause> orderPauseList;
+
+    //查询参数
     private Integer amountFlag;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public Date getStartTime() {
-        return startTime;
-    }
+    /**
+     * 订单类型 0普通单 1比例拆分单 2售后二开提成单
+     */
+    private String orderType;
+
+    /**
+     * 订单次数类型 0一开单  1二开单
+     */
+    private String orderCountType;
+
+    /**
+     * 订单金额类型 0全款单  1定金单  2尾款单
+     */
+    private String orderMoneyType;
+
+    /**
+     * 拆分订单中的主订单id，非拆分订单时，该id都为0
+     */
+    private Long mainOrderId;
+
+    //订单类型数组，用于接收订单类型、订单次数类型、订单金额类型，非持久化字段
+    private Long[] orderTypeList;
+
+    //是否自动创建售后二开提成单，非持久化字段
+    private Integer secondAfterSaleFlag;
+
+    //拆分比例，如：1,9就是按照比例10%、90%拆分，非持久化字段
+    private Integer[] nutritionistRate;
 
 }

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

@@ -2,6 +2,7 @@ package com.stdiet.custom.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.stdiet.common.core.domain.BaseEntity;
  * @author xzj
  * @date 2021-01-15
  */
+@Data
 public class SysRecipesPlan extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -24,6 +26,9 @@ public class SysRecipesPlan extends BaseEntity
     //@Excel(name = "订单ID")
     private Long orderId;
 
+    //客户ID
+    private Long customerId;
+
     //非持久化字段，客户姓名
     @Excel(name = "客户姓名")
     private String customer;
@@ -82,167 +87,4 @@ public class SysRecipesPlan extends BaseEntity
 
     /** 删除标识 0未删除 1已删除 默认0 */
     private Integer delFlag;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setOrderId(Long orderId)
-    {
-        this.orderId = orderId;
-    }
-
-    public Long getOrderId()
-    {
-        return orderId;
-    }
-    public void setStartDate(Date startDate)
-    {
-        this.startDate = startDate;
-    }
-
-    public Date getStartDate()
-    {
-        return startDate;
-    }
-    public void setEndDate(Date endDate)
-    {
-        this.endDate = endDate;
-    }
-
-    public Date getEndDate()
-    {
-        return endDate;
-    }
-    public void setRecipesId(Long recipesId)
-    {
-        this.recipesId = recipesId;
-    }
-
-    public Long getRecipesId()
-    {
-        return recipesId;
-    }
-    public void setSendFlag(Integer sendFlag)
-    {
-        this.sendFlag = sendFlag;
-    }
-
-    public Integer getSendFlag()
-    {
-        return sendFlag;
-    }
-    public void setSendTime(Date sendTime)
-    {
-        this.sendTime = sendTime;
-    }
-
-    public Date getSendTime()
-    {
-        return sendTime;
-    }
-    public void setDelFlag(Integer delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public String getCustomer() {
-        return customer;
-    }
-
-    public void setCustomer(String customer) {
-        this.customer = customer;
-    }
-
-    public Long getNutritionistId() {
-        return nutritionistId;
-    }
-
-    public void setNutritionistId(Long nutritionistId) {
-        this.nutritionistId = nutritionistId;
-    }
-
-    public String getNutritionist() {
-        return nutritionist;
-    }
-
-    public void setNutritionist(String nutritionist) {
-        this.nutritionist = nutritionist;
-    }
-
-    public Long getNutritionistAssisId() {
-        return nutritionistAssisId;
-    }
-
-    public void setNutritionistAssisId(Long nutritionistAssisId) {
-        this.nutritionistAssisId = nutritionistAssisId;
-    }
-
-    public String getNutritionistAssis() {
-        return nutritionistAssis;
-    }
-
-    public void setNutritionistAssis(String nutritionistAssis) {
-        this.nutritionistAssis = nutritionistAssis;
-    }
-
-    public Date getOrderStartDate() {
-        return orderStartDate;
-    }
-
-    public void setOrderStartDate(Date orderStartDate) {
-        this.orderStartDate = orderStartDate;
-    }
-
-    public Date getOrderEndDate() {
-        return orderEndDate;
-    }
-
-    public void setOrderEndDate(Date orderEndDate) {
-        this.orderEndDate = orderEndDate;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getHidePhone() {
-        return hidePhone;
-    }
-
-    public void setHidePhone(String hidePhone) {
-        this.hidePhone = hidePhone;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("orderId", getOrderId())
-                .append("startDate", getStartDate())
-                .append("endDate", getEndDate())
-                .append("recipesId", getRecipesId())
-                .append("sendFlag", getSendFlag())
-                .append("sendTime", getSendTime())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .append("delFlag", getDelFlag())
-                .toString();
-    }
 }