From a5e3570cdea8f5449f2e9fcc9974368a6e1a7917 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 14 Mar 2025 15:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=8F=9C=E4=BC=98=E5=85=88=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=20=E5=A0=82=E9=A3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/service/order/service/impl/PayServiceImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index e135d0218..7eb3286e9 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -537,6 +537,9 @@ public class PayServiceImpl implements PayService {
                     }
                 } else {
                     orderDetail.setReturnNum(orderDetail.getReturnNum().add(refNum));
+                    if (orderDetail.getPackNumber().compareTo(BigDecimal.ZERO) > 0 && orderDetail.getPackNumber().compareTo(orderDetail.getNum().subtract(orderDetail.getReturnNum())) > 0) {
+                        orderDetail.setPackNumber(orderDetail.getPackNumber().subtract(orderDetail.getReturnNum()));
+                    }
                 }
                 orderDetail.setRefundNo(refPayOrderNo);
                 orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason());