按天计算提成相关

2021-01-11 21:06:46 +08:00
parent a9ada467d2
commit 64cda6be9e
16 changed files with 1278 additions and 5 deletions
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java
@@ -0,0 +1,185 @@
+package com.stdiet.custom.domain;
+
+import com.stdiet.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public class SysCommissionDayDetail extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    //用户ID
+    private Long userId;
+
+    //用户姓名
+    private String nickName;
+
+    //用户账户
+    private String userName;
+
+    //用户岗位ID
+    private Long postId;
+
+    //岗位名称
+    private String postName;
+
+    private BigDecimal totalCommissionAmount;
+
+    private BigDecimal totalHasSentCommissionAmount;
+
+    private BigDecimal totalNotSentCommissionAmount;
+
+    private List<Map<String, Object>> sendDetailList;
+
+
+    //提成比例
+    private Float rate;
+
+    //订单成交总额
+    private BigDecimal orderTotalAmount;
+
+    //服务总天数
+    private Integer serverTotalDay;
+
+    //服务总额（每笔订单的服务天数 * 每天金额，相加）
+    private BigDecimal serverTotalAmount;
+
+    //服务订单总数量
+    private Integer serverOrderTotalCount;
+
+    //服务暂停总天数
+    private Integer serverOrderPauseTotalDay;
+
+    //服务提成金额
+    private BigDecimal commissionTotalAmount;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getPostName() {
+        return postName;
+    }
+
+    public void setPostName(String postName) {
+        this.postName = postName;
+    }
+
+    public Float getRate() {
+        return rate;
+    }
+
+    public void setRate(Float rate) {
+        this.rate = rate;
+    }
+
+    public BigDecimal getOrderTotalAmount() {
+        return orderTotalAmount;
+    }
+
+    public void setOrderTotalAmount(BigDecimal orderTotalAmount) {
+        this.orderTotalAmount = orderTotalAmount;
+    }
+
+    public Integer getServerTotalDay() {
+        return serverTotalDay;
+    }
+
+    public void setServerTotalDay(Integer serverTotalDay) {
+        this.serverTotalDay = serverTotalDay;
+    }
+
+    public BigDecimal getServerTotalAmount() {
+        return serverTotalAmount;
+    }
+
+    public void setServerTotalAmount(BigDecimal serverTotalAmount) {
+        this.serverTotalAmount = serverTotalAmount;
+    }
+
+    public Integer getServerOrderTotalCount() {
+        return serverOrderTotalCount;
+    }
+
+    public void setServerOrderTotalCount(Integer serverOrderTotalCount) {
+        this.serverOrderTotalCount = serverOrderTotalCount;
+    }
+
+    public Integer getServerOrderPauseTotalDay() {
+        return serverOrderPauseTotalDay;
+    }
+
+    public void setServerOrderPauseTotalDay(Integer serverOrderPauseTotalDay) {
+        this.serverOrderPauseTotalDay = serverOrderPauseTotalDay;
+    }
+
+    public BigDecimal getCommissionTotalAmount() {
+        return commissionTotalAmount;
+    }
+
+    public void setCommissionTotalAmount(BigDecimal commissionTotalAmount) {
+        this.commissionTotalAmount = commissionTotalAmount;
+    }
+
+    public Long getPostId() {
+        return postId;
+    }
+
+    public void setPostId(Long postId) {
+        this.postId = postId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public BigDecimal getTotalCommissionAmount() {
+        return totalCommissionAmount;
+    }
+
+    public void setTotalCommissionAmount(BigDecimal totalCommissionAmount) {
+        this.totalCommissionAmount = totalCommissionAmount;
+    }
+
+    public BigDecimal getTotalHasSentCommissionAmount() {
+        return totalHasSentCommissionAmount;
+    }
+
+    public void setTotalHasSentCommissionAmount(BigDecimal totalHasSentCommissionAmount) {
+        this.totalHasSentCommissionAmount = totalHasSentCommissionAmount;
+    }
+
+    public BigDecimal getTotalNotSentCommissionAmount() {
+        return totalNotSentCommissionAmount;
+    }
+
+    public void setTotalNotSentCommissionAmount(BigDecimal totalNotSentCommissionAmount) {
+        this.totalNotSentCommissionAmount = totalNotSentCommissionAmount;
+    }
+
+    public List<Map<String, Object>> getSendDetailList() {
+        return sendDetailList;
+    }
+
+    public void setSendDetailList(List<Map<String, Object>> sendDetailList) {
+        this.sendDetailList = sendDetailList;
+    }
+}
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
@@ -2,6 +2,7 @@ package com.stdiet.custom.domain;

 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;

 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -173,7 +174,7 @@ public class SysOrder extends BaseEntity {
     * 赠送时长
     */
    @Excel(name = "赠送时长", width = 30, suffix = "天")
-    private String giveServeDay;
+    private Integer giveServeDay;

    private Long serveTimeId;

@@ -187,6 +188,11 @@ public class SysOrder extends BaseEntity {
    @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderTime;

+    /**
+     * 订单暂停记录 非持久化字段
+     * */
+    private List<SysOrderPause> orderPauseList;
+
    @JsonFormat(pattern = "yyyy-MM-dd")
    public Date getStartTime() {
        return startTime;
@@ -454,14 +460,22 @@ public class SysOrder extends BaseEntity {
        return orderTime;
    }

-    public String getGiveServeDay() {
+    public Integer getGiveServeDay() {
        return giveServeDay;
    }

-    public void setGiveServeDay(String giveServeDay) {
+    public void setGiveServeDay(Integer giveServeDay) {
        this.giveServeDay = giveServeDay;
    }

+    public List<SysOrderPause> getOrderPauseList() {
+        return orderPauseList;
+    }
+
+    public void setOrderPauseList(List<SysOrderPause> orderPauseList) {
+        this.orderPauseList = orderPauseList;
+    }
+
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java
@@ -0,0 +1,152 @@
+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 java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * 每个订单的提成详情
+ * */
+public class SysOrderCommisionDayDetail extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**订单成交时间*/
+    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")
+    private LocalDate serverStartDate;
+
+    /**服务结束时间*/
+    private LocalDate serverEndDate;
+
+    /**服务月数*/
+    private Integer serverMonth;
+
+    /**赠送天数*/
+    private Integer giveDay;
+
+    /**订单金额*/
+    private BigDecimal orderAmount;
+
+    /**服务天数*/
+    private Integer serverDay;
+
+    /**每天金额*/
+    private BigDecimal dayMoney;
+
+    /**每年每月暂停天数*/
+    private Map<String, Integer> everyYearMonthPauseDay;
+
+    /**每年每月服务天数**/
+    private Map<String, Integer> everyYearMonthServerDay;
+
+    /**每年每月对应金额*/
+    private Map<String, BigDecimal> everyYearMonthServerMoney;
+
+    public LocalDateTime getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(LocalDateTime orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    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;
+    }
+}