From 667151fefbf75cc7e87688e2ca57d07bdc11d793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 10:23:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E4=BB=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=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, 6 insertions(+), 5 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 427f4bc1..bcaa957f 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
@@ -1488,6 +1488,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         ArrayList<Integer> cartIdList = new ArrayList<>();
         // 订单总价
         for (TbCashierCart tbCashierCart : cartInfoDTO.getCashierCarts()) {
+            if (shopUser != null) {
+                tbCashierCart.setIsMember(!shopEatTypeInfoDTO.isMemberPrice() ? 0 : shopUser.getIsVip() == 1 ? 0 : 1);
+            }
+            tbCashierCart.resetTotalAmount();
+
             if (tbCashierCart.getOrderId() != null) {
                 cartInfoDTO.setOrderId(tbCashierCart.getOrderId());
             }
@@ -1495,10 +1500,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) {
                 cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount()));
             }
-            if (shopUser != null) {
-                tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && tbCashierCart.getMemberPrice() == null && shopUser.getIsVip() == 1 ? 0 : 1);
-            }
-            tbCashierCart.resetTotalAmount();
 
             cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount()));
         }
@@ -2433,8 +2434,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .set(TbOrderInfo::getUserId, null)
                     .set(TbOrderInfo::getMemberId, null));
         }
-
         if (dto != null) {
+            dto.setVipUserId(updateVipDTO.getVipUserId());
             return createOrder(dto, true);
         }
         return "哈哈哈";