diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index c078073..6dbdd33 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -304,7 +304,7 @@ public class CartService {
                             TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
                             cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? 0 : cashierCart.getPlaceNum());
 
-                            if (cashierCart.getSkuId().equals(skuId) && cashierCart.getIsVip().intValue() == isVip) {
+                            if (cashierCart.getSkuId().equals(skuId) && (isVip == null || cashierCart.getIsVip().intValue() == isVip)) {
                                 cashierCart.setTotalNumber(buyNum);
                                 cashierCart.setNumber(buyNum);
                                 cashierCart.setNote(note);
@@ -325,7 +325,7 @@ public class CartService {
                                                 product.getPackFee().multiply(BigDecimal.valueOf(buyNum)) : BigDecimal.ZERO);
 
                                     }
-                                    if (isVip == 1) {
+                                    if (isVip != null && isVip == 1) {
                                         cashierCart.setTotalAmount(BigDecimal.ZERO);
                                     } else {
                                         cashierCart.setTotalAmount(new BigDecimal(cashierCart.getTotalNumber())