From 49306af1995aec6264410e624bb91db6876f666a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 10:34:47 +0800
Subject: [PATCH] fix(mall):修复小程序登录时公司ID查询错误 - 将查询条件从 apiXcxLoginDto.getCode() 更正为 apiXcxLoginDto.getCompanyId() - 确保公司信息查询使用正确的参数 - 修复因参数错误导致的公司信息无法正确获取的问题
---
src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java b/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
index 7f3f1ff..f5f9200 100644
--- a/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
+++ b/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
@@ -1,14 +1,28 @@
package cc.mrbird.febs.vip.entity;
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.util.Date;
@Data
@TableName(value = "mall_vip_benefits_record")
public class MallVipBenefitsRecord extends BaseEntity {
+
+ @TableField(exist = false)
+ private String memberName;
+
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthday;
private Long memberId ;
/** 权益名称 */
@@ -20,9 +34,39 @@
/** 领取数量 */
private Integer receiveCnt ;
/** 领取时间 */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date receiveTime ;
/** 领取类型;2-商品 3-优惠券 */
private Integer receiveType ;
/** 领取ID */
private Long receiveId ;
+
+ private Integer status;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayStart;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayEnd;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date receiveStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date receiveEndTime;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ @TableField(exist = false)
+ private String hasReceive;
}
--
Gitblit v1.9.1