From a83dee6c6e14a2dfa0746c2e658ab94d12035ee3 Mon Sep 17 00:00:00 2001
From: 19991905653 <jing121710>
Date: Tue, 2 Apr 2024 13:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 263c467..84fe4a0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -280,11 +280,11 @@ public class OrderService {
             orderDetail.setCreateTime(new Date());
             orderDetail.setNum(cashierCart.getNumber());
             orderDetail.setPrice(cashierCart.getSalePrice());
-            if (cashierCart.getIsPack().equals("true")) {
-                orderDetail.setPriceAmount(cashierCart.getTotalAmount().add(cashierCart.getPackFee()));
-            } else {
+//            if (cashierCart.getIsPack().equals("true")) {
+//                orderDetail.setPriceAmount(cashierCart.getTotalAmount().add(cashierCart.getPackFee()));
+//            } else {
                 orderDetail.setPriceAmount(cashierCart.getTotalAmount());
-            }
+//            }
             orderDetail.setProductId(Integer.valueOf(cashierCart.getProductId()));
             orderDetail.setProductSkuId(Integer.valueOf(cashierCart.getSkuId()));
             orderDetail.setProductSkuName(tbProduct.getSpecSnap());
@@ -320,7 +320,7 @@ public class OrderService {
             orderInfo.setUserId(orderVo.getUserId());
             tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
         } else {
-            orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount.add(packAMount), feeAmount, "",
+            orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
                     "table", "cash", orderVo.getMerchantId().toString(), orderVo.getShopId().toString(),
                     "", (byte) 1, day, masterId);
             orderInfo.setMasterId(masterId);