From edf83149d0f26fb99eb6548d9e68bcc81a8cc893 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 13 十月 2023 17:03:37 +0800
Subject: [PATCH] 10.13bug2
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 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 22f0842..1399bb6 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
@@ -31,10 +31,10 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
@TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
@@ -44,25 +44,60 @@
@TableField("userId")
private Integer userId;
/**
- * 状态（1=待核销，2=已核销）
- */
- @TableField("status")
- private Integer status;
- /**
* 核销人员id
*/
@TableField("verificationUserId")
private Integer verificationUserId;
+ /**
+ * 核销门店id
+ */
+ @TableField("verifiStoreId")
+ private Integer verifiStoreId;
/**
* 核销时间
*/
@TableField("verificationTime")
private Date verificationTime;
/**
+ * 状态（1=待核销，2=已核销）
+ */
+ @TableField("status")
+ private Integer status;
+ /**
* 领取时间
*/
@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