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/TShoppingOrder.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
index 03de2ec..16a7aea 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
@@ -37,6 +37,9 @@
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
+ @ApiModelProperty(value = "订单标题")
+ @TableField("title")
+ private String title;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -102,7 +105,7 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
+ @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消 5=交易关闭）")
@TableField("status")
private Integer status;
@@ -116,7 +119,7 @@
@ApiModelProperty(value = "发货人id")
@TableField("consigner_id")
- private Integer consignerId;
+ private Long consignerId;
@ApiModelProperty(value = "发货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -135,7 +138,7 @@
@ApiModelProperty(value = "取消人id")
@TableField("cancellation_id")
- private Integer cancellationId;
+ private Long cancellationId;
@ApiModelProperty(value = "退款流水号")
@TableField("refund_code")
@@ -153,9 +156,39 @@
@TableField("refund_serial_number")
private String refundSerialNumber;
+ @ApiModelProperty(value = "地址json")
+ @TableField("address_json")
+ private String addressJson;
+
@ApiModelProperty(value = "退款成功时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "下单手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "商品/优惠券名称")
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "收货人")
+ @TableField(exist = false)
+ private String receivingName;
+ @ApiModelProperty(value = "收货地址")
+ @TableField(exist = false)
+ private String receivingAddress;
+ @ApiModelProperty(value = "发货人")
+ @TableField(exist = false)
+ private String consignerName;
+ @ApiModelProperty(value = "取消人")
+ @TableField(exist = false)
+ private String cancellationName;
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String uid;
}
--
Gitblit v1.7.1