Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa

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

@@ -1604,12 +1604,14 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(allCartGoodsList)) {
             int size = allCartGoodsList.size();
             for(int i=0;i<size;i++) {
-                if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId) && i != size-1) {
+                if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
                     CartGoods cartGoods = allCartGoodsList.get(i);
                     cartGoods.setIsTableWare(true);
-                    allCartGoodsList.remove(i);
-                    allCartGoodsList.add(cartGoods);
-                    i--;
+                    if(i != size-1) {
+                        allCartGoodsList.remove(i);
+                        allCartGoodsList.add(cartGoods);
+                        i--;
+                    }
                 }
             }
         }