From 36ce1f3549df46609b4e3bc0bf0810bd0c85277e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 17:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 fba67dd..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
@@ -56,9 +56,46 @@
@TableField("order_number")
private String orderNumber;
+ @ApiModelProperty(value = "商品数量")
+ @TableField("num")
+ private Integer num;
+
+ @ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
+ @TableField("good_pics")
+ private String goodPics;
+
+ @ApiModelProperty(value = "商品名称（多个名称逗号隔开））")
+ @TableField("good_name")
+ private String goodName;
+
@ApiModelProperty(value = "订单总金额")
@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")
@@ -76,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