From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询，加入了积分金额和积分价格的计算
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 2 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 33117f0..62dab95 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -1,11 +1,14 @@
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;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -99,4 +102,91 @@
@TableField(exist = false)
private String account;
+ private String bindPhone;
+
+ @TableField(exist = false)
+ private String referrerName;
+
+ @TableField(exist = false)
+ private BigDecimal balance;
+ @TableField(exist = false)
+ private BigDecimal score;
+ @TableField(exist = false)
+ private BigDecimal prizeScore;
+ @TableField(exist = false)
+ private BigDecimal commission;
+
+ @TableField(exist = false)
+ private BigDecimal amount;
+
+ @TableField(exist = false)
+ private String query;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ /**
+ * 会员等级
+ */
+ private Integer director;
+ @TableField(exist = false)
+ private String directorName;
+
+ /**
+ * 分销等级
+ */
+ private Integer storeMaster;
+ @TableField(exist = false)
+ private String storeMasterName;
+
+ /**
+ * 微信用户标识
+ */
+ private String openId;
+
+ /**
+ * 会话密钥
+ */
+ private String sessionKey;
+
+ //团长申请状态 1：审核通过 2：审核不通过 3：申请中
+ @TableField(exist = false)
+ private Integer leaderState;
+
+ private Long salesmansId;
+
+ //推销员姓名
+ @TableField(exist = false)
+ private String salesmansName;
+
+ private String inviteImg;
+ //是否是推销员1:是 2：否
+ private Integer isSale;
+
+ //优惠卷名称
+ @TableField(exist = false)
+ private String couponName;
+
+ //优惠卷名称
+ @TableField(exist = false)
+ private Long couponId;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @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;
}
--
Gitblit v1.9.1