Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa

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

@@ -184,10 +184,10 @@ public class ShoppingCartMCoffeeServiceImpl {
             //餐具和月享卡数量限制
             if (mcCafeTablewareSkuId.equals(skuId) || StringUtils.equals("9999",skuId)) {
                 for (CartGoods cartGoods : oldCartGoodsList) {
-                    if (mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
+                    if (mcCafeTablewareSkuId.equals(skuId) && mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
                         return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_ERROR.getCode(), "不能重复添加餐具商品");
                     }
-                    if (StringUtils.equals("9999",cartGoods.getSkuId())) {
+                    if (StringUtils.equals("9999",skuId) && StringUtils.equals("9999",cartGoods.getSkuId())) {
                         // 返回购物车数据
                         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, oldCartGoodsList, null, ShoppingCartConstant.ADD_AND_UPDATE, null);
                         return ResponseUtil.success(shoppingCartGoodsResponseVo);