Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -481,7 +481,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         Integer orderType = 1;
         String userId = assortmentCustomerInfoVo.getMemberId();
         String partnerId = requestVo.getPartnerId();
-        String storeId = requestVo.getShopId();
         String appId = requestVo.getAppId();
         String orderId = requestVo.getOrderId();
         String trackingNo = LogThreadLocal.getTrackingNo();
@@ -492,7 +491,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         List<CartGoods> cartGoodsList = getOrderGoods(orderInfo.getResult());
-
+        String storeId = orderInfo.getResult().getStoreId();
         if(orderInfo.getResult().getOrderType() == 3 || orderInfo.getResult().getOrderType() == 4){
             menuType = "saasdelivery";
             orderType = 2;