Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-20 d60e946afb25dc8bd295a14e27a4ccf2df382283

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(description = "分佣明细")
public class CommissionDetail {
@@ -12,59 +14,59 @@
     * 用户获得总分佣金额
     */
    @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;
}