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

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

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

@@ -447,6 +447,21 @@ public class ShoppingCartMCoffeeServiceImpl {
                 temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
             }
             cartGoodsList = temList;
+            //如果是餐具商品，则放到最后
+            if (CollectionUtils.isNotEmpty(cartGoodsList)) {
+                int size = cartGoodsList.size();
+                for(int i=0;i<size;i++) {
+                    if(cartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
+                        CartGoods cartGoods = cartGoodsList.get(i);
+                        cartGoods.setIsTableware(true);
+                        if(i != size-1) {
+                            cartGoodsList.remove(i);
+                            cartGoodsList.add(cartGoods);
+                            break;
+                        }
+                    }
+                }
+            }
             // 重新存储最新购物车
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
         }
@@ -1641,8 +1656,6 @@ public class ShoppingCartMCoffeeServiceImpl {
             }
         }
 
-        log.info(JSON.toJSONString(allCartGoodsList));
-
         return allCartGoodsList;
     }