From 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 23:38:59 +0800
Subject: [PATCH] bug：统计数据修正
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 a9096e4..cc8d7b6 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
@@ -11,6 +11,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -61,6 +62,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date verificationTime;
/**
+ * 入园方式：1=手环，2=门票核销。仅在完成核销后有值。
+ */
+ @TableField("goType")
+ private Integer goType;
+ /**
* 状态（1=待核销，2=已核销）
*/
@TableField("status")
@@ -72,20 +78,20 @@
@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;
/**
* 现金的支付状态
*/
@@ -101,6 +107,36 @@
*/
@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;
+
+ /** 本次购买使用的用户优惠券领取记录 ID */
+ @TableField("userCouponId")
+ private Long userCouponId;
@Override
--
Gitblit v1.7.1