Merge remote-tracking branch 'origin/qa' into qa

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

@@ -531,6 +531,9 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         List<CartGoods> cartGoodsList = getOrderGoods(orderInfo.getResult());
         String storeId = orderInfo.getResult().getStoreId();
+        if(StringUtils.isNotEmpty(requestVo.getShopId())){
+            storeId = requestVo.getShopId();
+        }
         if (orderInfo.getResult().getOrderType() == 3 || orderInfo.getResult().getOrderType() == 4) {
             menuType = "saasdelivery";
             orderType = 2;