From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 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..f0022ae 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
@@ -3,13 +3,11 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -21,20 +19,18 @@
* @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)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
- * 优惠券id
+ * 商品id
*/
@TableField("pointsMerchandiseId")
private Integer pointsMerchandiseId;
@@ -57,6 +53,7 @@
* 核销时间
*/
@TableField("verificationTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date verificationTime;
/**
* 状态（1=待核销，2=已核销）
@@ -67,27 +64,63 @@
* 领取时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
/**
- * 现金支付方式(1=微信2支付宝)
+ * 现金支付方式（1=积分兑换，2=积分+现金）
*/
@TableField("payType")
private Integer payType;
+ /**
+ * 商品数量
+ */
+ @TableField("goodsNumber")
+ private Integer goodsNumber;
/**
* code
*/
@TableField("code")
private String code;
/**
- * orderNumber
+ * 现金的支付状态
+ */
+ @TableField("payStatus")
+ private Integer payStatus;
+ /**
+ * 可使用的门店id
+ */
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ * 1=正常 2=删除
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 积分支付数量
+ */
+ @TableField("integral")
+ private Integer integral;
+ /**
+ * 现金支付金额
+ */
+ @TableField("cash")
+ private BigDecimal cash;
+ /**
+ * 现金支付方式（1=微信，2=支付宝）
+ */
+ @TableField("cashPayType")
+ private Integer cashPayType;
+ /**
+ * 第三方支付流水号
*/
@TableField("orderNumber")
private String orderNumber;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ /**
+ * 支付时间
+ */
+ @TableField("paymentTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date paymentTime;
}
--
Gitblit v1.7.1