From 912d2e62391b1459952375a60ba87cfa842f1c41 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 10:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 2f29822..ca1a03f 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
@@ -40,7 +40,7 @@
@TableField("order_type")
private Integer orderType;
- @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中")
+ @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
@TableField("order_status")
private Integer orderStatus;
@@ -104,7 +104,6 @@
@TableField("discount_total_amount")
private BigDecimal discountTotalAmount;
-
@ApiModelProperty(value = "实际支付价格")
@TableField("payment_amount")
private BigDecimal paymentAmount;
@@ -113,7 +112,7 @@
@TableField("point")
private Integer point;
- @ApiModelProperty(value = "1wx2积分")
+ @ApiModelProperty(value = "1微信，2账户余额，3积分")
@TableField("pay_method")
private Integer payMethod;
@@ -128,6 +127,10 @@
@ApiModelProperty(value = "运费")
@TableField("express_amount")
private BigDecimal expressAmount;
+
+ @ApiModelProperty(value = "1微信，2账户余额")
+ @TableField("express_pay_method")
+ private Integer expressPayMethod;
@ApiModelProperty(value = "第三方快递信息")
@TableField("express_json")
@@ -165,6 +168,10 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
private LocalDateTime createTime;
-
+
+ @ApiModelProperty(value = "预计提货时间")
+ @TableField("expected_delivery_time")
+ private String expectedDeliveryTime;
+
}
--
Gitblit v1.7.1