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

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

@@ -62,4 +62,10 @@ public class SysCommision extends BaseEntity {
 
     //订单审核状态
     private String reviewStatus;
+
+    //服务开始时间，用于计算该时间段的提成
+    private String serverScopeStartTime;
+
+    //服务结束时间，用于计算该时间段的提成
+    private String serverScopeEndTime;
 }

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

@@ -3,6 +3,7 @@ package com.stdiet.custom.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.stdiet.common.annotation.Excel;
 import com.stdiet.common.core.domain.BaseEntity;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -12,22 +13,27 @@ import java.util.Map;
 /**
  * 每个订单的提成详情
  * */
+@Data
 public class SysOrderCommisionDayDetail extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    /**订单ID*/
+    private Long orderId;
+
     /**订单成交时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime orderTime;
 
     /**客户姓名*/
     private String name;
 
     /**服务结束时间*/
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate serverStartDate;
 
     /**服务结束时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate serverEndDate;
 
     /**服务月数*/
@@ -36,15 +42,27 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
     /**赠送天数*/
     private Integer giveDay;
 
-    /**订单金额*/
+    /**订单金额或服务订单金额*/
     private BigDecimal orderAmount;
 
+    /**订单总提成**/
+    private BigDecimal orderCommission;
+
+    //已发放提成
+    private BigDecimal hasSendOrderCommission;
+
+    //未发放提成
+    private BigDecimal notHasSendOrderCommission;
+
     /**服务天数*/
     private Integer serverDay;
 
     /**每天金额*/
     private BigDecimal dayMoney;
 
+    /** 暂停总天数 **/
+    private int pauseTotalDay;
+
     /**每年每月暂停天数*/
     private Map<String, Integer> everyYearMonthPauseDay;
 
@@ -54,99 +72,15 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
     /**每年每月对应金额*/
     private Map<String, BigDecimal> everyYearMonthServerMoney;
 
-    public LocalDateTime getOrderTime() {
-        return orderTime;
-    }
+    /**每年每月对应提成*/
+    private Map<String, BigDecimal> everyYearMonthServerCommission;
 
-    public void setOrderTime(LocalDateTime orderTime) {
-        this.orderTime = orderTime;
-    }
+    /**每年每月的提成是否发放**/
+    private Map<String, Boolean> everyYearMonthCommissionSendFlag;
 
-    public String getName() {
-        return name;
-    }
+    //该笔订单成交的当月的总成交额，用于确定提成比例
+    private BigDecimal monthOrderTotalAmount;
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public LocalDate getServerStartDate() {
-        return serverStartDate;
-    }
-
-    public void setServerStartDate(LocalDate serverStartDate) {
-        this.serverStartDate = serverStartDate;
-    }
-
-    public LocalDate getServerEndDate() {
-        return serverEndDate;
-    }
-
-    public void setServerEndDate(LocalDate serverEndDate) {
-        this.serverEndDate = serverEndDate;
-    }
-
-    public Integer getServerMonth() {
-        return serverMonth;
-    }
-
-    public void setServerMonth(Integer serverMonth) {
-        this.serverMonth = serverMonth;
-    }
-
-    public Integer getGiveDay() {
-        return giveDay;
-    }
-
-    public void setGiveDay(Integer giveDay) {
-        this.giveDay = giveDay;
-    }
-
-    public BigDecimal getOrderAmount() {
-        return orderAmount;
-    }
-
-    public void setOrderAmount(BigDecimal orderAmount) {
-        this.orderAmount = orderAmount;
-    }
-
-    public Integer getServerDay() {
-        return serverDay;
-    }
-
-    public void setServerDay(Integer serverDay) {
-        this.serverDay = serverDay;
-    }
-
-    public BigDecimal getDayMoney() {
-        return dayMoney;
-    }
-
-    public void setDayMoney(BigDecimal dayMoney) {
-        this.dayMoney = dayMoney;
-    }
-
-    public Map<String, Integer> getEveryYearMonthPauseDay() {
-        return everyYearMonthPauseDay;
-    }
-
-    public void setEveryYearMonthPauseDay(Map<String, Integer> everyYearMonthPauseDay) {
-        this.everyYearMonthPauseDay = everyYearMonthPauseDay;
-    }
-
-    public Map<String, Integer> getEveryYearMonthServerDay() {
-        return everyYearMonthServerDay;
-    }
-
-    public void setEveryYearMonthServerDay(Map<String, Integer> everyYearMonthServerDay) {
-        this.everyYearMonthServerDay = everyYearMonthServerDay;
-    }
-
-    public Map<String, BigDecimal> getEveryYearMonthServerMoney() {
-        return everyYearMonthServerMoney;
-    }
-
-    public void setEveryYearMonthServerMoney(Map<String, BigDecimal> everyYearMonthServerMoney) {
-        this.everyYearMonthServerMoney = everyYearMonthServerMoney;
-    }
+    //该笔订单对应提成比例
+    private Float commissionRate;
 }