From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
index 9e5a80c..35ebd28 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -31,10 +33,16 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
+ @TableField("refund_status")
+ private Integer refundStatus;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
+ @ApiModelProperty(value = "标题")
+ @TableField("title")
+ private String title;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -64,7 +72,7 @@
@TableField("discount_amount")
private BigDecimal discountAmount;
- @ApiModelProperty(value = "支付金额")
+ @ApiModelProperty(value = "实付支付金额")
@TableField("payment_amount")
private BigDecimal paymentAmount;
@@ -80,4 +88,24 @@
@TableField("serial_number")
private String serialNumber;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+ @ApiModelProperty(value = "退款金额")
+ @TableField("refund_amount")
+ private BigDecimal refundAmount;
+ @ApiModelProperty(value = "会员类型名称")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "uid")
+ @TableField(exist = false)
+ private String uid;
+ @ApiModelProperty(value = "userUid")
+ @TableField(exist = false)
+ private String userUid;
+ @ApiModelProperty(value = "购买用户")
+ @TableField(exist = false)
+ private String userPhone;
+
}
--
Gitblit v1.7.1