From 80be3657ef5ee8bca886e005f6fb7ebc10eb8e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 15:29:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=93=81?=
 =?UTF-8?q?=E6=94=B9=E4=BB=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java   | 1 +
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
index 52eb2a9c..db192934 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
@@ -134,6 +134,7 @@ public class TbOrderDetail implements Serializable {
     private Integer isMember;
     private Integer isTemporary;
     private String discountSaleNote;
+    private BigDecimal discountSaleAmount;
     private Boolean isPrint;
     private String useCouponInfo;
     private BigDecimal returnAmount;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 3af7259a..4d048b54 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1611,6 +1611,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId()));
             }
 
+            orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount());
             orderDetail.setIsWaitCall(cashierCart.getIsWaitCall());
             orderDetail.setUserCouponId(cashierCart.getUserCouponId());
             orderDetail.setMemberPrice(cashierCart.getMemberPrice());