From 086eb3523b7df63ebee34fd104fa01ab7ceb61af Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 1 Nov 2024 16:51:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=AE=A2=E5=8D=95=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
index 00c63939..dc8a40c8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
@@ -246,9 +246,11 @@ public class TbOrderInfo implements Serializable {
     // 使用的积分数量
     private Integer pointsNum;
     // 用户优惠券id
-    private String activateInInfoList;
+    private String userCouponInfoList;
     // 优惠券折扣金额
-    private BigDecimal activateInDiscountAmount;
+    private BigDecimal productCouponDiscountAmount;
+    // 满减抵扣金额
+    private BigDecimal fullCouponDiscountAmount;
 
     public void copy(TbOrderInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));