From 099093dcafbe53dee99fcefa36a8840fa3d2688a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 04 Jan 2025 10:20:53 +0800
Subject: [PATCH] fix(mall): 修复会员权益收益计算逻辑

---
 src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
index 0bd7bfc..dc1bb43 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
@@ -1,24 +1,47 @@
 package cc.mrbird.febs.mall.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.util.Date;
 import java.util.List;
 
 @Data
 @ApiModel(value = "MyTeamVo", description = "我的团队返回参数类")
 public class MyTeamVo {
 
-    @ApiModelProperty(value = "我的业绩")
-    private BigDecimal myAchieve;
+    @ApiModelProperty(value = "我的碳币")
+    private BigDecimal myBalance = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "我的团队业绩")
-    private BigDecimal myTeamAchieve;
+    @ApiModelProperty(value = "我的USDT")
+    private BigDecimal myCommission = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "团队数量")
-    private int myTeamCnt;
+    @ApiModelProperty(value = "团队总数")
+    private int myTeamCnt = 0;
+
+    @ApiModelProperty(value = "团队碳币")
+    private BigDecimal myTeamBalance = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "团队USDT")
+    private BigDecimal myTeamCommission = BigDecimal.ZERO;
+
+    /**
+     * 是否是节点 1是 0否
+     */
+    @ApiModelProperty(value = "是否是节点 1是 0否")
+    private Integer director;
+    //升级为节点的时间
+    @ApiModelProperty(value = "业绩累计开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date directorTime;
+
+    @ApiModelProperty(value = "业绩累计")
+    private BigDecimal directorAchieve;
 
     @ApiModelProperty(value = "团队列表")
     private List<TeamListVo> team;

--
Gitblit v1.9.1