From 8265dc92e37589b6e491ecee63a089afd39a0034 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 1 Jul 2025 17:56:00 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=A6=82=E6=9E=9C=E6=98=AF=E9=9D=9E?=
 =?UTF-8?q?=E5=90=88=E6=95=B0=E5=95=86=E5=93=81=E8=B0=83=E6=8D=A2=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=EF=BC=8C=E5=95=86=E5=93=81ID=E6=B8=850=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/OrderBusinessServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
index bb316212..3ad20739 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
@@ -2312,10 +2312,10 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
                     // 不同产品，需要更新
                     // 调换货物选择不同产品，没有商品信息，此处先全部按默认值来处理
 
-//                    // 2025.02.11 如果盒数商品，历史商品ID不变，非盒数商品进行处理
-//                    if (saOrder.getBoxNum() == 0) {
-//                        saOrderItems.setPkWares(0);
-//                    }
+                    // 2025.02.11 如果盒数商品，历史商品ID不变，非盒数商品进行处理
+                    if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) {
+                        saOrderItems.setPkWares(0);
+                    }
                     saOrderItems.setPkWares(0);
                     saOrderItems.setPkWaresDetail(0);
                     saOrderItems.setPkWaresSpecsSku(0);