From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 b51db59..b6dee58 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,7 @@
package cc.mrbird.febs.mall.vo;
+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;
@@ -36,15 +38,19 @@
@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;
private String level;
-
- private Integer levelCnt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createdTime;
@@ -68,7 +74,7 @@
@ApiModelProperty(value = "累计消费")
private BigDecimal totalCost;
- @ApiModelProperty(value = "赠送积分")
+ @ApiModelProperty(value = "会员经验")
private BigDecimal score;
@ApiModelProperty(value = "抽奖积分")
@@ -76,6 +82,12 @@
@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;
@@ -97,4 +109,13 @@
@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