diff --git a/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java new file mode 100644 index 00000000..f4068a56 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java @@ -0,0 +1,30 @@ +package com.ghy.common.enums; + +/** + * 财务细单类型.所有类型合起来等于主订单实付金额 + * @author clunt + */ +public enum FinancialDetailType { + + ORDER_FEE(0, "订单金额"), + WORKER_FEE(1,"大师傅/店铺提成金额"), + PLATFORM_FEE(2,"平台提成金额"), + PLACE_FEE(3, "分销金额,可能存在多级"), + RETURN_FEE(4, "退款金额"); + + private final Integer code; + private final String desc; + + FinancialDetailType(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 5de283f5..c610666c 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -3,7 +3,6 @@ package com.ghy.order.domain; import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; import lombok.Data; -import lombok.EqualsAndHashCode; /** * @author clunt diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java index 5fbd7e3d..63b7e4b5 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java @@ -9,4 +9,7 @@ import lombok.Data; */ @Data public class OrderMasterGoods extends BaseEntity { + + private static final long serialVersionUID = 1L; + } diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java index c8b47674..598d389a 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -1,10 +1,51 @@ package com.ghy.payment.domain; +import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +import java.math.BigDecimal; /** * @author clunt - * 财务细单(分佣) + * 财务细单(可能是师傅分佣后的细单关联,也可能是分佣账单,平台提成账单等类型) */ +@Data public class FinancialDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "编码") + private String code; + + @Excel(name = "子订单序号", cellType = Excel.ColumnType.NUMERIC) + private Long orderMasterId; + + @Excel(name = "子订单编码", cellType = Excel.ColumnType.NUMERIC) + private String orderMasterCode; + + @Excel(name = "子单总金额", cellType = Excel.ColumnType.STRING) + private BigDecimal totalMoney; + + @Excel(name = "优惠金额", cellType = Excel.ColumnType.STRING) + private BigDecimal discountMoney; + + @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING) + private BigDecimal payMoney; + + @Excel(name = "财务子单类型,师傅转派/多级分销/平台抽成", cellType = Excel.ColumnType.NUMERIC) + private Integer financialDetailType; + + @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + private Integer payType; + + @Excel(name = "支付状态, 未付款/已付款", cellType = Excel.ColumnType.NUMERIC) + private Integer payStatus; + + @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) + private String payTime; + } diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java index a276eb51..728f8d0f 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java @@ -1,13 +1,45 @@ package com.ghy.payment.domain; +import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +import java.math.BigDecimal; /** * @author clunt * 财务单主单(对应付款) */ +@Data public class FinancialMaster extends BaseEntity { + private static final long serialVersionUID = 1L; + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "主订单序号", cellType = Excel.ColumnType.NUMERIC) + private Long orderMasterId; + + @Excel(name = "主订单编码", cellType = Excel.ColumnType.NUMERIC) + private String orderMasterCode; + + @Excel(name = "整单总金额", cellType = Excel.ColumnType.STRING) + private BigDecimal totalMoney; + + @Excel(name = "优惠金额", cellType = Excel.ColumnType.STRING) + private BigDecimal discountMoney; + + @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING) + private BigDecimal payMoney; + + @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + private Integer payType; + + @Excel(name = "支付状态, 未付款/已付款", cellType = Excel.ColumnType.NUMERIC) + private Integer payStatus; + + @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) + private String payTime; }