From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
index 4f9b6d5..e347deb 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
@@ -1,15 +1,7 @@
package com.dsh.account.feignclient.activity.model;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
import java.util.Date;
/**
@@ -21,73 +13,66 @@
* @since 2023-06-29
*/
@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_user_points_merchandise")
-public class UserPointsMerchandise extends Model<UserPointsMerchandise> {
+public class UserPointsMerchandise{
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
- @TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
/**
* 用户id
*/
- @TableField("userId")
private Integer userId;
/**
* 核销人员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;
+ /**
+ * 现金的支付状态（1=待支付 2=已支付）
+ */
+ private Integer payStatus;
+ /**
+ * 可使用的门店id
+ */
+ private Integer storeId;
+ /**
+ * 1=正常 2= 删除
+ */
+ private Integer state;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.7.1