From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
index 6b1386c..12d5793 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -34,7 +35,7 @@
@TableId(value = "id", type = IdType.NONE)
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
@TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
@@ -57,6 +58,7 @@
* 核销时间
*/
@TableField("verificationTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date verificationTime;
/**
* 状态（1=待核销，2=已核销）
@@ -68,6 +70,36 @@
*/
@TableField("insertTime")
private Date insertTime;
+ /**
+ * 现金支付方式(1=微信2支付宝)
+ */
+ @TableField("payType")
+ private Integer payType;
+ /**
+ * code
+ */
+ @TableField("code")
+ private String code;
+ /**
+ * orderNumber
+ */
+ @TableField("orderNumber")
+ private String orderNumber;
+ /**
+ * 现金的支付状态
+ */
+ @TableField("payStatus")
+ private Integer payStatus;
+ /**
+ * 可使用的门店id
+ */
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ * 1=正常 2=删除
+ */
+ @TableField("state")
+ private Integer state;
@Override
--
Gitblit v1.7.1