From bb15f16cbf950c4a8cfd9fb8a39474236f19d9f0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Oct 2025 14:18:37 +0800
Subject: [PATCH] fix(sql): 移除多余的产品ID分组条件
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 3a9cb20..44bb0a7 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -1,7 +1,5 @@
package cc.mrbird.febs.mall.entity;
-import cc.mrbird.febs.common.controller.BaseController;
-import cc.mrbird.febs.common.entity.BaseEntity;
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,10 +18,13 @@
@TableName("mall_member")
public class MallMember extends BaseEntity {
+ private String memberUuid;
/**
* 姓名
*/
private String name;
+
+ private String companyId;
/**
* 手机号
@@ -117,6 +118,8 @@
private BigDecimal prizeScore;
@TableField(exist = false)
private BigDecimal commission;
+ @TableField(exist = false)
+ private BigDecimal totalScore;
@TableField(exist = false)
private BigDecimal amount;
@@ -128,14 +131,18 @@
private String levelName;
/**
- * 董事
+ * 会员等级
*/
private Integer director;
+ @TableField(exist = false)
+ private String directorName;
/**
- * 店长
+ * 分销等级
*/
private Integer storeMaster;
+ @TableField(exist = false)
+ private String storeMasterName;
/**
* 微信用户标识
@@ -173,9 +180,22 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayQuery;
+
private String realName;
private Date lastLoginTime;
private Date vipLevelTime;
+ //是否是医生 0-否 1-是
+ private Integer doctorState;
+ //是否是核销员 0-否 1-是
+ private Integer checkOrder;
+ //是否领取新人礼 0-否 1-是
+ private Integer newGift;
+ //是否是订单核销员 0-否 1-是
+ private Integer checkLeader;
}
--
Gitblit v1.9.1