From b977bf61c82b7dc39079974d7316b7a80cf520fa Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 09:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/payment/OrderItem.java | 11 ++++++++++-
1 files changed, 10 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..84c559f 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,13 @@
@TableField("deduct_amount")
private BigDecimal deductAmount;//扣款金额
+ @TableField("coupon_amount")
+ private BigDecimal couponAmount;//优惠券金额/扎
+
+ @TableField("original_price")
+ private BigDecimal originalPrice;//优惠前售价/扎
+
+ @TableField("real_price")
+ private BigDecimal realPrice;//真实成交价格/每扎
+
}
--
Gitblit v1.9.3