From b64d67ef01e81a857046f19dd556b4e4f0695e1c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 02 八月 2023 16:41:51 +0800
Subject: [PATCH] 后台代码  门店管理

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 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 134991f..37d14c1 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,7 +31,7 @@
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.NONE)
     private Long id;
     /**
      * 优惠券id
@@ -49,16 +49,45 @@
     @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;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1