From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
index 5d9a7df..e6dd78b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
@Data
@ApiModel(description = "分佣明细")
public class CommissionDetail {
@@ -12,59 +15,62 @@
* 用户获得总分佣金额
*/
@ApiModelProperty(value = "用户获得总分佣金额")
- private Double totalCommission;
+ private BigDecimal totalCommission;
/**
* 门店获得总服务费用总分佣金额
*/
@ApiModelProperty(value = "门店获得总服务费用总分佣金额")
- private Double totalServiceFee;
+ private BigDecimal totalServiceFee;
/**
* 门店获得关联用户总分佣金额
*/
@ApiModelProperty(value = "门店获得关联用户总分佣金额")
- private Double totalUserCommission;
+ private BigDecimal totalUserCommission;
/**
* 普通会员获得总分佣金额
*/
@ApiModelProperty(value = "普通会员获得总分佣金额")
- private Double totalNormalCommission;
+ private BigDecimal totalNormalCommission;
/**
* 黄金会员获得总分佣金额
*/
@ApiModelProperty(value = "黄金会员获得总分佣金额")
- private Double totalGoldCommission;
+ private BigDecimal totalGoldCommission;
/**
* 钻石会员获得总分佣金额
*/
@ApiModelProperty(value = "钻石会员获得总分佣金额")
- private Double totalDiamondCommission;
+ private BigDecimal totalDiamondCommission;
/**
* 准代理获得总分佣金额
*/
@ApiModelProperty(value = "准代理获得总分佣金额")
- private Double totalAgentCommission;
+ private BigDecimal totalAgentCommission;
/**
* 代理获得总分佣金额
*/
@ApiModelProperty(value = "代理获得总分佣金额")
- private Double totalSuperAgentCommission;
+ private BigDecimal totalSuperAgentCommission;
/**
* 总代获得总分佣金额
*/
@ApiModelProperty(value = "总代获得总分佣金额")
- private Double totalTopAgentCommission;
+ private BigDecimal totalTopAgentCommission;
/**
* 合伙人获得总分佣金额
*/
@ApiModelProperty(value = "合伙人获得总分佣金额")
- private Double totalPartnerCommission;
+ private BigDecimal totalPartnerCommission;
+
+ private List<CommissionDate> commissionDateList;
+
}
--
Gitblit v1.7.1