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 | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 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 96daacd..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
@@ -1,7 +1,13 @@
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.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -13,63 +19,108 @@
* @since 2023-06-29
*/
@Data
-public class UserPointsMerchandise{
+public class UserPointsMerchandise {
+
private static final long serialVersionUID = 1L;
/**
* 主键
*/
+ @TableId(value = "id", type = IdType.NONE)
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")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date verificationTime;
/**
* 状态（1=待核销，2=已核销）
*/
+ @TableField("status")
private Integer status;
/**
* 领取时间
*/
+ @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;
/**
- * 现金支付的交易订单号
+ * 现金的支付状态
*/
- private String orderNumber;
- /**
- * 现金的支付状态（1=待支付 2=已支付）
- */
+ @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;
+ /**
+ * 支付时间
+ */
+ @TableField("paymentTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date paymentTime;
}
--
Gitblit v1.7.1