From c8abded1fbdf8bd26cfd1fbf951436f0b36cd54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 4 Dec 2024 09:39:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=B4=E6=97=B6=E8=8F=9C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=87=AA=E5=8F=96=E6=8A=A5=E9=94=99=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 | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 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 ea3751e3..de29036c 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
@@ -2744,34 +2744,41 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (OrderUseTypeEnum.TAKEOUT.getValue().equals(choseModelDTO.getUseType())) {
             ArrayList<Integer> productIds = new ArrayList<>();
             cashierCarts.forEach(item -> {
-                productIds.add(Integer.valueOf(item.getProductId()));
+                if (item.getProductId() != null) {
+                    productIds.add(Integer.valueOf(item.getProductId()));
+                }
             });
-            List<TbProduct> productList = productMapper.selectBatchIds(productIds);
-            Map<String, TbProduct> productMap = productList.stream()
-                    .collect(Collectors.toMap(product -> String.valueOf(product.getId()), product -> product));
-            cashierCarts.forEach(item -> {
-                TbProduct product = productMap.get(item.getProductId());
+
+            Map<String, TbProduct> productMap = new HashMap<>();
+            if (!productIds.isEmpty()) {
+                List<TbProduct> productList = productMapper.selectBatchIds(productIds);
+                productMap = productList.stream()
+                        .collect(Collectors.toMap(product -> String.valueOf(product.getId()), product -> product));
+            }
+            for (TbCashierCart cashierCart : cashierCarts) {
+                TbProduct product = productMap.get(cashierCart.getProductId());
+
                 // 设置打包费
                 mpCashierCartService.update(new LambdaUpdateWrapper<TbCashierCart>()
-                        .eq(TbCashierCart::getId, item.getId())
-                        .set(TbCashierCart::getPackFee, product.getPackFee() != null ?
-                                product.getPackFee().multiply(item.getNumber()) : BigDecimal.ZERO)
+                        .eq(TbCashierCart::getId, cashierCart.getId())
+                        .set(TbCashierCart::getPackFee, product != null && product.getPackFee() != null ?
+                                product.getPackFee().multiply(cashierCart.getNumber()) : BigDecimal.ZERO)
                         .set(TbCashierCart::getTableId, null)
                         .set(TbCashierCart::getUseType, OrderUseTypeEnum.TAKEOUT.getValue())
                         .set(TbCashierCart::getIsPack, "true"));
 
-            });
+            }
 
             List<TbOrderDetail> detailList = orderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
                     .in(TbOrderDetail::getCartId, choseModelDTO.getCartIds())
                     .eq(TbOrderDetail::getShopId, choseModelDTO.getShopId()));
-            detailList.forEach(item -> {
+            for (TbOrderDetail item : detailList) {
                 item.setUseType(OrderUseTypeEnum.TAKEOUT.getValue());
                 TbProduct product = productMap.get(item.getProductId().toString());
                 // 设置打包费
-                item.setPackAmount(product.getPackFee() != null ?
+                item.setPackAmount(product != null && product.getPackFee() != null ?
                         product.getPackFee().multiply(item.getNum()) : BigDecimal.ZERO);
-            });
+            }
 
             if (!detailList.isEmpty()) {
                 mpOrderDetailService.updateBatchById(detailList);