From d3cac60125dd6c09df51455ce178f46a5f9a57c9 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 12 Oct 2024 17:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 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 4232727c..b590be3e 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
@@ -468,10 +468,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setSalePrice(productSku.getSalePrice());
             tbCashierCart.setTotalAmount(new BigDecimal(addCartDTO.getNum()).multiply(productSku.getSalePrice()));
             tbCashierCart.setSkuName(productSku.getSpecSnap());
-            if (!addCartDTO.isPack()) {
+            // 设置打包费
+            if (!addCartDTO.isPack() && !shopEatTypeInfoDTO.isTakeout()) {
                 tbCashierCart.setPackFee(BigDecimal.ZERO);
             } else {
-                tbCashierCart.setPackFee(new BigDecimal(addCartDTO.getNum()).multiply(product.getPackFee()));
+                tbCashierCart.setPackFee(product.getPackFee() != null ?
+                        product.getPackFee().multiply(BigDecimal.valueOf(addCartDTO.getNum())) : BigDecimal.ZERO);
                 tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee()));
 
             }
@@ -483,11 +485,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setCategoryId(product.getCategoryId());
             tbCashierCart.setNote(addCartDTO.getNote());
             tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
-            // 设置打包费
-            if (shopEatTypeInfoDTO.isTakeout()) {
-                tbCashierCart.setPackFee(product.getPackFee() != null ?
-                        product.getPackFee().multiply(BigDecimal.valueOf(addCartDTO.getNum())) : BigDecimal.ZERO);
-            }
             cashierCartRepository.save(tbCashierCart);
 
         } else {