Merge branch 'feature/zxh/【ka】商户号以及部分接口废弃-20220922' into develop

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

@@ -1506,7 +1506,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         String appId = requestVo.getAppId();
         String orderId = requestVo.getOrderId();
         String trackingNo = LogThreadLocal.getTrackingNo();
-        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null, orderId, null, null, trackingNo);
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null, orderId, null, null, trackingNo,partnerId);
 
         if (orderInfo == null || orderInfo.getResult() == null) {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);