为空不操作

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -659,10 +659,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
         String buyMonthlyCard = shoppingCartInfoRequestVo.getBuyMonthlyCard();
 
-        if(shoppingCartInfoRequestVo.getIsUseMonthCard() == null) {
-            shoppingCartInfoRequestVo.setIsUseMonthCard(1);
-        }
-
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
         log.info("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
@@ -672,7 +668,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             // check购物车中所有商品
             List<CartGoods> temList = new ArrayList<>();
             for (CartGoods goods : cartGoodsList) {
-                if(goods.getMonthCardInfo() != null) {
+                if(shoppingCartInfoRequestVo.getIsUseMonthCard() != null && goods.getMonthCardInfo() != null) {
                     goods.getMonthCardInfo().setIsUseMonthCard(shoppingCartInfoRequestVo.getIsUseMonthCard());
                 }
                 if (StringUtils.equals(goods.getSkuId(),"9999")){