From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/entity/payment/OrderItem.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/payment/OrderItem.java b/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
index 5d1167b..fa2bdd7 100644
--- a/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
+++ b/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
@@ -61,7 +61,7 @@
private BigDecimal markupPartner;//合伙人加价
@TableField("price")
- private BigDecimal price;//商品售价
+ private BigDecimal price;//商品售价(会员价)
@TableField("total")
private BigDecimal total;//总金额
@@ -84,4 +84,19 @@
@TableField("deduct_amount")
private BigDecimal deductAmount;//扣款金额
+ @TableField("coupon_amount")
+ private BigDecimal couponAmount;//优惠券金额/扎
+
+ @TableField("original_price")
+ private BigDecimal originalPrice;//优惠前售价/扎
+
+ @TableField("real_price")
+ private BigDecimal realPrice;//真实成交价格/每扎
+
+ @TableField("coupon_amount_total")
+ private BigDecimal couponAmountTotal;//优惠券总金额
+
+ @TableField("real_total")
+ private BigDecimal realTotal;//真实成交总价格
+
}
--
Gitblit v1.9.3