From ec707650a0a1a0bd3a5fc470cb67bb4b01ddca13 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 15:40:49 +0800
Subject: [PATCH] fix(mall): 修复活动列表查询异常

---
 src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 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 a51685b..67cd370 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,10 +1,12 @@
 package cc.mrbird.febs.mall.vo;
 
+import cc.mrbird.febs.vip.entity.MallVipConfig;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -26,18 +28,19 @@
     @ApiModelProperty(value = "性别")
     private String sex;
 
-    @ApiModelProperty(value = "邀请码")
+    @ApiModelProperty(value = "邀请码(如果是团长,邀请码就是团长特征码)")
     private String inviteId;
 
     @ApiModelProperty(value = "头像")
     private String avatar;
 
     @ApiModelProperty(value = "余额")
-    private String balance;
+    private BigDecimal balance;
 
     @ApiModelProperty(value = "代理等级")
     private String levelName;
 
+    @ApiModelProperty(value = "推荐人昵称")
     private String referrerName;
 
     private String level;
@@ -52,4 +55,54 @@
     public static final int ACCOUNTSTATUS_Y = 1;
     public static final int ACCOUNTSTATUS_N = 2;
 
+    @ApiModelProperty(value = "是否设置收款方式", example = "1是2否")
+    private Integer hasPayment = 2;
+
+    @ApiModelProperty(value = "是否设置交易密码", example = "1是2否")
+    private Integer hasTradePwd = 2;
+
+    @ApiModelProperty(value = "绑定手机号")
+    private String bindPhone;
+
+    @ApiModelProperty(value = "累计消费")
+    private BigDecimal totalCost;
+
+    @ApiModelProperty(value = "赠送积分")
+    private BigDecimal score;
+
+    @ApiModelProperty(value = "抽奖积分")
+    private BigDecimal prizeScore;
+
+    @ApiModelProperty(value = "是否是团长 1: 是 2:否")
+    private Integer isTeamLeader;
+
+    @ApiModelProperty(value = "是否是代理 1: 申请中 2:是 3:否")
+    private Integer isAgent;
+
+    @ApiModelProperty(value = "代理名称")
+    private String agentLevelName;
+
+    @ApiModelProperty(value = "代理等级数字  1:一级 2:二级 3:三级")
+    private Integer agentLevel;
+
+    @ApiModelProperty(value = "收藏数量")
+    private Integer collectionCnt;
+
+    @ApiModelProperty(value = "足迹数量")
+    private Integer footprintCnt;
+
+    @ApiModelProperty(value = "足迹数量")
+    private Integer childCnt;
+
+    @ApiModelProperty(value = "是否是推销员")
+    private Integer isSale;
+
+    @ApiModelProperty(value = "会员信息")
+    private MallVipConfig vipInfo;
+
+    @ApiModelProperty(value = "是否是医生")
+    private Integer doctorState;
+
+    @ApiModelProperty(value = "是否是核销员 0-否 1-是")
+    private Integer checkOrder;
 }

--
Gitblit v1.9.1