From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 6442849..72e4204 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
@@ -42,6 +42,10 @@
@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
@TableField("order_status")
private Integer orderStatus;
+
+ @ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
+ @TableField("old_order_status")
+ private Integer oldOrderStatus;
@ApiModelProperty(value = "是否已分佣: 0-否 1-是")
@TableField("is_commission")
@@ -99,6 +103,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;
@@ -139,6 +147,34 @@
@TableField("express_json")
private String expressJson;
+ @ApiModelProperty(value = "第三方快递结果")
+ @TableField("express_result")
+ private String expressResult;
+
+ @ApiModelProperty(value = "发货省")
+ @TableField("deliver_province")
+ private String deliverProvince;
+
+ @ApiModelProperty(value = "发货省编号")
+ @TableField("deliver_province_code")
+ private String deliverProvinceCode;
+
+ @ApiModelProperty(value = "发货市")
+ @TableField("deliver_city")
+ private String deliverCity;
+
+ @ApiModelProperty(value = "发货市编号")
+ @TableField("deliver_city_code")
+ private String deliverCityCode;
+
+ @ApiModelProperty(value = "发货区")
+ @TableField("deliver_district")
+ private String deliverDistrict;
+
+ @ApiModelProperty(value = "发货区编号")
+ @TableField("deliver_district_code")
+ private String deliverDistrictCode;
+
@ApiModelProperty(value = "收货地址信息")
@TableField("address_json")
private String addressJson;
--
Gitblit v1.7.1