From 888da8f97aab268eeac73078c9eccb6056de4739 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 15:52:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/entity/VipPayment.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/VipPayment.java b/cloud-server-account/src/main/java/com/dsh/account/entity/VipPayment.java
index c6da1e9..7f6ad32 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/VipPayment.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/VipPayment.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dsh.account.util.UUIDUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.text.SimpleDateFormat;
@@ -43,7 +44,7 @@
@TableField("payType")
private Integer payType;
/**
- * 支付状态（1=待支付，2=已支付）
+ * 支付状态（1=待支付，2=已支付 3=已退款）
*/
@TableField("payStatus")
private Integer payStatus;
@@ -63,13 +64,34 @@
@TableField("state")
private Integer state;
/**
+ * 会员id
+ */
+ @TableField("vipId")
+ private Integer vipId;
+ /**
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
+ /**
+ * 购买会员时 获得的门票权益
+ */
+ @TableField("ticketJson")
+ private String ticketJson;
+ /**
+ * 购买会员时 获得的优惠券权益
+ */
+ @TableField("couponJson")
+ private String couponJson;
+ /**
+ * 退款备注
+ */
+ @TableField("remark")
+ private String remark;
- public static String CODE(){
+ public static String CODE() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
return sdf.format(new Date()) + UUIDUtil.getNumberRandom(3);
}
--
Gitblit v1.7.1