From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 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 37c2cde..ea4f405 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,5 +1,8 @@
package cc.mrbird.febs.mall.vo;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiLabelInfoVo;
+import cc.mrbird.febs.vip.entity.MallVipConfig;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +10,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
@Data
@ApiModel(value = "MallMemberVo", description = "商城用户信息返回类")
@@ -36,8 +40,14 @@
@ApiModelProperty(value = "余额")
private BigDecimal balance;
- @ApiModelProperty(value = "代理等级")
+ @ApiModelProperty(value = "佣金")
+ private BigDecimal commission;
+
+ @ApiModelProperty(value = "会员等级")
private String levelName;
+
+ @ApiModelProperty(value = "会员等级图标")
+ private String levelNamePng;
@ApiModelProperty(value = "推荐人昵称")
private String referrerName;
@@ -66,7 +76,7 @@
@ApiModelProperty(value = "累计消费")
private BigDecimal totalCost;
- @ApiModelProperty(value = "赠送积分")
+ @ApiModelProperty(value = "会员经验")
private BigDecimal score;
@ApiModelProperty(value = "抽奖积分")
@@ -75,7 +85,48 @@
@ApiModelProperty(value = "是否是团长 1: 是 2：否")
private Integer isTeamLeader;
+ @ApiModelProperty(value = "会员等级")
+ private Integer director;
+
+ @ApiModelProperty(value = "分销等级")
+ private Integer storeMaster;
+
@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;
+
+ @ApiModelProperty(value = "是否是自提核销员 0-否 1-是")
+ private Integer checkLeader;
+
+ @ApiModelProperty(value = "是否领取新人礼 0-否 1-是")
+ private Integer newGift;
+
+ @ApiModelProperty(value = "会员标识集合")
+ private List<ApiLabelInfoVo> labelList;
}
--
Gitblit v1.9.1