From 4ca85ef425ef9dcc58cda90352621e13bc35e869 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, 6 Nov 2024 15:08:01 +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=E8=AE=A1=E7=AE=97=E6=9C=89=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ysk/cashier/pojo/order/TbCashierCart.java    | 2 +-
 .../service/impl/shopimpl/TbShopTableServiceImpl.java    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
index 8e79075f..4915beac 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
@@ -165,7 +165,7 @@ public class TbCashierCart implements Serializable {
     private String platformType;
     // 优惠券id
     private Integer userCouponId;
-    private BigDecimal memberPrice;
+    private BigDecimal memberPrice = BigDecimal.ZERO;
     private Integer isMember;
 
     public void copy(TbCashierCart source){
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 041951f9..a5f6fc2f 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
@@ -1344,14 +1344,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) {
                 cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount()));
             }
+            tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null && shopUser != null && shopUser.getIsVip() == 1 ? 0 : 1);
             tbCashierCart.resetTotalAmount();
-            if (shopUser != null) {
-                if (shopUser.getIsVip() == 0) {
-                    tbCashierCart.setIsMember(0);
-                }else {
-                    tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null ? 0 : 1);
-                }
-            }
+
             cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount()));
         }
         cartInfoDTO.setCashierCartIds(cartIdList);