Merge remote-tracking branch 'origin/master'

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

@@ -552,7 +552,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }
             if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
-                if (cartGoods_.getIsMonthCard() == 1 && qty == 0){
+                if (cartGoods_.getIsMonthCard() == 1 && cartGoods_.getMonthCardInfo() != null && qty != null && qty == 0){
                     cartGoodsList = clearMonthCouponInfo(cartGoodsList,cartGoods_.getMonthCardInfo().getCardCode(),cartGoodsUid);
                 }
                 cartGoods = cartGoods_;