From b85f2ef59c820000cb2d9fa0b510a2d79e7243ee Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 10:16:23 +0800
Subject: [PATCH] feat(mall): 为 HappyActivityOrderRefundByTimeout 方法添加支付类型参数
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 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 0deba36..38170fb 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -1,13 +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
@@ -112,6 +113,8 @@
private BigDecimal score;
@TableField(exist = false)
private BigDecimal prizeScore;
+ @TableField(exist = false)
+ private BigDecimal commission;
@TableField(exist = false)
private BigDecimal amount;
@@ -132,4 +135,54 @@
*/
private Integer storeMaster;
+ /**
+ * 微信用户标识
+ */
+ 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