From e7eb029ec5bc6d1a2a088f3e9151316757e537d7 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 10 Feb 2025 11:37:39 +0800 Subject: [PATCH] feat(pay): 添加 FIUU充值功能并优化支付流程 - 新增 FIUU 充值接口和相关请求模型 - 更新 FIUU 支付流程,支持订单和充值操作 - 优化 FIUU 回调处理,增加对充值订单的支持 - 调整订单状态更新逻辑,确保支付成功后正确更新 --- 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