From bc167fc1c7ba82f13e418a4eb601f6e3acc4e6bf Mon Sep 17 00:00:00 2001
From: 19991905653 <jing121710>
Date: Tue, 2 Apr 2024 11:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8F=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BD=93=E5=A4=A9=E8=B4=AD=E7=89=A9=E8=BD=A6=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=A2=9E=E5=8A=A0=E9=94=80=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java   | 11 ++++++-----
 1 file changed, 6 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 fd2a8a4..bb85626 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -104,16 +104,17 @@ public class OrderService {
             cart.setNumber(number);
             cart.setIsGift(isGift);
             cart.setIsPack(isPack);
-            if (isGift.equals("false")) {
-                cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()));
-            } else {
-                cart.setTotalAmount(BigDecimal.ZERO);
-            }
             if (isPack.equals("false")){
                 cart.setPackFee(BigDecimal.ZERO);
             }else {
                 cart.setPackFee(new BigDecimal(number).multiply(product.getPackFee()));
             }
+            if (isGift.equals("false")) {
+                cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()));
+            } else {
+                cart.setTotalAmount(BigDecimal.ZERO);
+            }
+
             cart.setTotalNumber(number);
             cart.setUuid(uuid);
             cashierCartMapper.updateByPrimaryKeySelective(cart);