From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交:订单最小金额配置

---
 src/main/java/com/mzl/flower/entity/payment/Order.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/payment/Order.java b/src/main/java/com/mzl/flower/entity/payment/Order.java
index 7706db4..8c66dea 100644
--- a/src/main/java/com/mzl/flower/entity/payment/Order.java
+++ b/src/main/java/com/mzl/flower/entity/payment/Order.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -16,7 +17,7 @@
     private String orderNo;//单号
 
     @TableField("flower_amount")
-    private BigDecimal flowerAmount;//商品金额
+    private BigDecimal flowerAmount;//商品金额(会员价)
 
     @TableField("packing_fee")
     private BigDecimal packingFee;//打包费
@@ -134,4 +135,38 @@
 
     @TableField("wx_delivery_msg")
     private String wxDeliveryMsg;// 微信发货返回消息
+
+    @TableField("member_coupon_id")
+    private String memberCouponId;//用户优惠券id
+
+    @TableField("member_coupon_code")
+    private String memberCouponCode;//优惠券编码
+
+    @TableField("member_coupon_name")
+    private String memberCouponName;//优惠券名称
+
+    @TableField("member_coupon_amount")
+    private BigDecimal memberCouponAmount;//优惠券金额
+
+    @TableField("member_id")
+    private Long memberId;//会员等级id
+
+    @TableField("member_name")
+    private String memberName;//会员等级名称
+
+    @TableField("member_discount_type")
+    private String memberDiscountType;//折扣类型(discount_type)
+
+    @TableField("member_discount_ratio")
+    private BigDecimal memberDiscountRatio;//会员折扣
+
+    @TableField("member_discount_amount")
+    private BigDecimal memberDiscountAmount;//优惠金额(每扎)
+
+    @TableField("payment_date_sta")
+    private LocalDate paymentDateSta;//支付日期
+
+    @TableField("create_date_sta")
+    private LocalDate createDateSta;//创建日期
+
 }

--
Gitblit v1.9.3