From b88509133c7a5773160c8ce8d0793ae1450ec62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 17 Dec 2024 14:42:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/PayController.java      | 2 +-
 .../system/cashierservice/service/PayService.java            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
index 99416e8..87c7fa0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -238,7 +238,7 @@ public class PayController {
     }
 
     @RequestMapping("returnOrder")
-//    @LimitSubmit(key = "returnOrder:%s", limit = 10)
+    @LimitSubmit(key = "returnOrder:%s", limit = 10)
     public Result returnOrder(@RequestHeader("token") String token,
                               @RequestHeader("loginName") String loginName,
                               @RequestHeader("clientType") String clientType,
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 4b1eed4..a6ec140 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1253,7 +1253,7 @@ public class PayService {
                 hasNormalReturn = true;
                 saleAmount = saleAmount.add(orderDetail.getPrice());
                 if (remainNum.compareTo(BigDecimal.ZERO) <= 0) {
-                    returnAmount = orderDetail.getPriceAmount();
+                    returnAmount = returnAmount.add(orderDetail.getPriceAmount());
                     packAMount = orderDetail.getPackAmount();
                 } else {
                     currentDetailAMount = orderDetail.getPriceAmount()
@@ -1326,6 +1326,9 @@ public class PayService {
             returnOrder.setPayAmount(returnAmount);
             mPOrderInfoMapper.insert(returnOrder);
 
+        for (TbOrderDetail orderDetail : detailList) {
+            orderDetail.setOrderId(returnOrder.getId());
+        }
 
         updateStockAndRecord(detailList);
         mpOrderDetailService.updateBatchById(detailList);