From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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..a9b23be 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
@@ -1,8 +1,14 @@
package com.ruoyi.account.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
@Data
@ApiModel(description = "分佣明细")
@@ -12,59 +18,70 @@
* 用户获得总分佣金额
*/
@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;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
+
}
--
Gitblit v1.7.1