From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Mar 2025 11:46:02 +0800
Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 7679f6a..20ae176 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,37 +1,63 @@
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;
@Data
+@ApiModel(value = "MallMemberVo", description = "商城用户信息返回类")
public class MallMemberVo {
+ @ApiModelProperty(value = "id")
private Long id;
-
+ @ApiModelProperty(value = "昵称")
private String name;
-
+ @ApiModelProperty(value = "头像")
+ private String avatar;
+ @ApiModelProperty(value = "手机号")
private String phone;
-
- private String email;
-
- private String sex;
-
+ @ApiModelProperty(value = "邀请码（如果是团长，邀请码就是团长特征码）")
private String inviteId;
-
- private String referrerName;
-
+ @ApiModelProperty(value = "VIP等级图片")
+ private String levelPng;
+ @ApiModelProperty(value = "VIP等级名称")
+ private String levelName;
+ @ApiModelProperty(value = "VIP等级编码")
private String level;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+ @ApiModelProperty(value = "是否允许碳积分兑换碳币 1是0否")
+ private Integer changeState;//是否允许碳积分兑换碳币 1是0否
+ @ApiModelProperty(value = "是否允许碳币提现 1是0否")
+ private Integer withdrawState;//是否允许碳币提现 1是0否
- /**
- * 账户状态;1-正常 2-禁用
- */
- private Integer accountStatus;
- public static final int ACCOUNTSTATUS_Y = 1;
- public static final int ACCOUNTSTATUS_N = 2;
+ @ApiModelProperty(value = "是否允许内转 1-是0-否")
+ private Integer insideState;//是否允许内转 1-是0-否
+
+
+ @ApiModelProperty(value = "是否允许USDT提现 1是0否")
+ private Integer commissionState;//是否允许USDT提现 1是0否
+
+ @ApiModelProperty(value = "是否允许权益升级 1-是0-否")
+ private Integer growState;//是否允许权益升级 1-是0-否
+
+ @ApiModelProperty(value = "碳币")
+ private BigDecimal balance = BigDecimal.ZERO;
+ @ApiModelProperty(value = "碳积分")
+ private BigDecimal score = BigDecimal.ZERO;
+ @ApiModelProperty(value = "USDT")
+ private BigDecimal commission = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "是否有支付密码 1:是 0：否")
+ private Integer tradeWord;
+
+ @ApiModelProperty(value = "会员到期时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date vipLevelTime;
}
--
Gitblit v1.9.1