From ad8c87d3139c5c99fd0928a7104d2c3faccab9fc Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 29 Oct 2024 14:54:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 ef17fb6c..82b93771 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
@@ -2033,7 +2033,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     }
 
-    private TbOrderInfo updateReturnOrderInfo(ReturnOrderDTO returnOrderDTO, TbOrderInfo oldOrderInfo, boolean isOnline) {
+    private HashMap<String, Object> updateReturnOrderInfo(ReturnOrderDTO returnOrderDTO, TbOrderInfo oldOrderInfo, boolean isOnline) {
         ArrayList<Integer> detailIds = new ArrayList<>();
         HashMap<String, Integer> returnNumMap = new HashMap<>();
         returnOrderDTO.getOrderDetails().forEach(item -> {
@@ -2127,7 +2127,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         updateStockAndRecord(detailList);
         mpOrderDetailService.updateBatchById(detailList);
-        return returnOrder;
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("returnOrder", returnOrder);
+        data.put("returnAmount", returnAmount);
+        return data;
     }
 
     private void updateStockAndRecord(List<TbOrderDetail> orderDetailList) {
@@ -2187,7 +2190,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // TODO 密码校验
         }
 
-        TbOrderInfo returnOrderInfo = updateReturnOrderInfo(returnOrderDTO, orderInfo, true);
+        HashMap<String, Object> returnInfoData = updateReturnOrderInfo(returnOrderDTO, orderInfo, true);
+        TbOrderInfo returnOrderInfo = (TbOrderInfo) returnInfoData.get("returnOrder");
+        BigDecimal returnAmount = (BigDecimal) returnInfoData.get("returnAmount");
         String shopId = orderInfo.getShopId();
         String payType = orderInfo.getPayType();
 
@@ -2199,7 +2204,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderInfo.setStatus("refund");
             // 储值卡支付退款
         } else if ("deposit".equals(payType)) {
-            orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount());
+            orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnAmount);
             orderInfo.setStatus("refund");
             mpOrderDetailService.updateStatusByOrderIdAndIds(OrderStatusEnums.REFUNDING, OrderStatusEnums.REFUND,
                     returnOrderDTO.getOrderId(), returnOrderDTO.getOrderDetails().stream().map(ReturnOrderDTO.OrderDetail::getId).collect(Collectors.toList()));