From 70bd8d58c7cb7d549d567850fa5a613273724db5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 18:18:45 +0800
Subject: [PATCH] 12.18
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index ca1a03f..4efccf5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +51,10 @@
@TableField("end_time")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "核销人id")
+ @TableField("canceller_app_user_id")
+ private Long cancellerAppUserId;
+
@ApiModelProperty(value = "售后截止日期")
@TableField("after_sale_time")
private LocalDateTime afterSaleTime;
@@ -96,6 +99,10 @@
@TableField("good_amount")
private BigDecimal goodAmount;
+ @ApiModelProperty(value = "用户优惠券id")
+ @TableField("user_coupon_id")
+ private Long userCouponId;
+
@ApiModelProperty(value = "活动优惠金额")
@TableField("activity_amount")
private BigDecimal activityAmount;
@@ -136,6 +143,10 @@
@TableField("express_json")
private String expressJson;
+ @ApiModelProperty(value = "第三方快递结果")
+ @TableField("express_result")
+ private String expressResult;
+
@ApiModelProperty(value = "收货地址信息")
@TableField("address_json")
private String addressJson;
@@ -162,7 +173,6 @@
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -172,6 +182,18 @@
@ApiModelProperty(value = "预计提货时间")
@TableField("expected_delivery_time")
private String expectedDeliveryTime;
+
+ @ApiModelProperty("退款状态（1=退款中，2=已退款）")
+ @TableField("refund_status")
+ private Integer refundStatus;
+
+ @ApiModelProperty("退款流水号")
+ @TableField("refund_code")
+ private String refundCode;
+
+ @ApiModelProperty("退款时间")
+ @TableField("refund_time")
+ private LocalDateTime refundTime;
}
--
Gitblit v1.7.1