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 | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 8ca1f39..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
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -18,7 +19,7 @@
* @since 2023-06-29
*/
@Data
-public class UserPointsMerchandise{
+public class UserPointsMerchandise {
private static final long serialVersionUID = 1L;
@@ -63,22 +64,23 @@
* 领取时间
*/
@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("orderNumber")
- private String orderNumber;
/**
* 现金的支付状态
*/
@@ -94,9 +96,31 @@
*/
@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;
+ /**
+ * 支付时间
+ */
+ @TableField("paymentTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date paymentTime;
}
--
Gitblit v1.7.1