From 2a6013f1dda183df6c976a717dea7ff45c763e5f 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, 13 Nov 2024 11:23:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BB=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 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 77bf0bf6..53535245 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
@@ -570,7 +570,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setCategoryId(product.getCategoryId());
             tbCashierCart.setNote(addCartDTO.getNote());
             tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
-            tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1);
+//            tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1);
+            tbCashierCart.setIsMember(addCartDTO.getVipUserId() == null ? 0 : 1);
             if (tbCashierCart.getIsMember() == 1) {
                 tbCashierCart.setMemberPrice(productSku.getMemberPrice());
             }
@@ -1467,7 +1468,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         for (TbCashierCart cashierCart : fullCashierCarts) {
             if (orderInfo != null && shopEatTypeInfoDTO != null) {
-                cashierCart.setIsMember(orderInfo.getMemberId() == null ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
+                cashierCart.setIsMember(StrUtil.isBlank(orderInfo.getMemberId()) ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
             }
             cashierCart.resetTotalAmount();
 
@@ -2650,7 +2651,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderInfoMapper.updateById(returnOrder);
         }
 
-
         updateStockAndRecord(detailList);
         mpOrderDetailService.updateBatchById(detailList);
         HashMap<String, Object> data = new HashMap<>();