b3s1

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

@@ -2041,8 +2041,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                 shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
             }
             allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
+            if(null != b3S1CartGoods) {
                 allCartGoodsList.add(b3S1CartGoods);
             }
+        }
 
         //添加商品为超值加购活动商品
         if (CollectionUtils.isNotEmpty(reduceGoods)) {