添加 调用基础服务 标识: 商户号

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -923,6 +923,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOperator(baseQueryOrderRequest.getOperator());
         request.setDispatchType(baseQueryOrderRequest.getDispatchType());
         request.setDispatchTimeout(baseQueryOrderRequest.getDispatchTimeout());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 引入门店基础服务 查询自动制作完成配置时间
         setTimeout(baseQueryOrderRequest,request);
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());
@@ -934,6 +935,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 引入门店基础服务 查询自动制作完成配置时间
         setTimeout(baseQueryOrderRequest,request);
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrderMCCafe(request, baseQueryOrderRequest.getTrackingNo());
@@ -1025,6 +1027,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         Boolean isTakeOut = false;
         Integer timeOut   = 0;
         Integer takeOutTimeOut = (null==baseQueryOrderRequest.getTimeout() || baseQueryOrderRequest.getTimeout()==0) ? 180 : baseQueryOrderRequest.getTimeout();
@@ -1069,6 +1072,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         request.setRemark("已完成");
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -1146,6 +1150,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 调用门店服务查询自动完成配置信息
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderChangeStateReq.java

@@ -19,6 +19,8 @@ import java.util.List;
  */
 @Data
 public class OrderChangeStateReq {
+
+    private  String partnerId;
     private String orderCode;
     private Integer orderState;
     private String remark;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/POSOrderOperationBaseReq.java

@@ -19,6 +19,8 @@ public class POSOrderOperationBaseReq {
 
     private  String orderCode;
 
+    private  String partnerId;
+
     private String operator;
 
     //从接单、制作完成、送出开始计时，超时的时间（单位：分钟）