Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

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

@@ -1,5 +1,6 @@
 package com.stdiet.custom.domain;
 
+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 java.math.BigDecimal;
  * @author wonder
  * @date 2020-09-24
  */
+@Data
 public class SysCommision extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -58,86 +60,6 @@ public class SysCommision extends BaseEntity {
     @Excel(name = "提成", scale = 2)
     private BigDecimal commision;
 
-    public BigDecimal getCommision() {
-        return commision;
-    }
-
-    public void setCommision(BigDecimal commision) {
-        this.commision = commision;
-    }
-
-    public Long getPostId() {
-        return postId;
-    }
-
-    public void setPostId(Long postId) {
-        this.postId = postId;
-    }
-
-    public void setPostName(String postName) {
-        this.postName = postName;
-    }
-
-    public String getPostName() {
-        return postName;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setRate(Float rate) {
-        this.rate = rate;
-    }
-
-    public Float getRate() {
-        return rate;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("ruleId", getRuleId())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("postId", getPostId())
-                .append("postName", getPostName())
-                .append("amount", getAmount())
-                .append("commision", getCommision())
-                .append("rate", getRate())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
+    //订单审核状态
+    private String reviewStatus;
 }

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.stdiet.common.annotation.Excel;
@@ -269,6 +270,9 @@ public class SysOrder extends BaseEntity {
     //拆分比例，如：1,9就是按照比例10%、90%拆分，非持久化字段
     private String nutritionistRate;
 
+    //订单查询时的订单类型二维数组
+    private JSONArray searchOrderTypeArray;
+
 
 
 }