From 353c694ee9bf139556a1b8691556f9238eccac70 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 28 十一月 2024 17:10:45 +0800
Subject: [PATCH] 1.添加字段

---
 ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
index d6abb6a..c0bf9a7 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
@@ -72,6 +72,31 @@
     @TableField("total_amount")
     private BigDecimal totalAmount;
 
+    @ApiModelProperty(value = "满减金额")
+    @TableField("full_reduction_amount")
+    private BigDecimal fullReductionAmount;
+
+    @ApiModelProperty(value = "代金券抵扣金额")
+    @TableField("money_amount")
+    private BigDecimal moneyAmount;
+
+    @ApiModelProperty(value = "折扣券抵扣金额")
+    @TableField("discount_amount")
+    private BigDecimal discountAmount;
+
+    @ApiModelProperty(value = "商品券抵扣总金额")
+    @TableField("good_amount")
+    private BigDecimal goodAmount;
+
+    @ApiModelProperty(value = "活动优惠金额")
+    @TableField("activity_amount")
+    private BigDecimal activityAmount;
+
+    @ApiModelProperty(value = "优惠总金额")
+    @TableField("discount_total_amount")
+    private BigDecimal discountTotalAmount;
+
+
     @ApiModelProperty(value = "实际支付价格")
     @TableField("payment_amount")
     private BigDecimal paymentAmount;
@@ -88,6 +113,10 @@
     @TableField("coupon_json")
     private String couponJson;
 
+    @ApiModelProperty(value = "订单优惠活动的json快照")
+    @TableField("activity_json")
+    private String activityJson;
+
     @ApiModelProperty(value = "运费")
     @TableField("express_amount")
     private BigDecimal expressAmount;

--
Gitblit v1.7.1