From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java
index 720a03b..b55d179 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java
@@ -1,18 +1,28 @@
package com.ruoyi.account.vo;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.account.api.model.UserPoint;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.model.BalanceChangeRecord;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
@ApiModel(description = "用户分佣统计响应")
@Data
public class CommissionStatistics {
- @ApiModelProperty(value = "统计数据", required = true)
- private UserPointStatistics statistics;
+ @ApiModelProperty(value = "分佣总计")
+ private BigDecimal totalCommission;
@ApiModelProperty(value = "分页数据", required = true)
- private IPage<UserPoint> userPointPage;
+ private IPage<BalanceChangeRecord> userPointPage;
+
+ public CommissionStatistics() {
+ }
+ public CommissionStatistics(BigDecimal totalCommission, IPage<BalanceChangeRecord> changeRecordPage) {
+ this.totalCommission = totalCommission;
+ this.userPointPage = changeRecordPage;
+ }
}
--
Gitblit v1.7.1