From 7b2cc558eb5287351fcc6c930539623a5936ccc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 22 Nov 2024 14:22:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?=
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 dad7060d..98597ea9 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
@@ -136,6 +136,7 @@ public class TbOrderDetail implements Serializable {
     private String discountSaleNote;
     private Boolean isPrint;
     private String useCouponInfo;
+    private BigDecimal returnAmount;
 
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
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 e7d41e52..240d386e 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
@@ -2841,6 +2841,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderDetail.setPackAmount(returnPackFee);
             orderDetail.setRefundNumber(returnNum);
             orderDetail.setReturnNum(returnNum.toPlainString());
+            orderDetail.setReturnAmount(returnAmount);
 //            orderDetail.setStatus(isOnline ? "refunding" : "refund");
             orderDetail.setStatus("refund");
         }