Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa

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

@@ -88,6 +88,11 @@ public interface OrderCenterSdkService {
     BaseOrderResponse orderConfirmTake(BaseQueryOrderRequest baseQueryOrderRequest);
 
     /**
+     * 订单确认接单 POS
+     */
+    BaseOrderResponse orderConfirmTakeMCCafe(BaseQueryOrderRequest baseQueryOrderRequest);
+
+    /**
      * 订单POS拒单 POS
      */
     BaseOrderResponse orderReject(CancelOrderRequest cancelOrderRequest);

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

@@ -667,6 +667,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
+    public BaseOrderResponse orderConfirmTakeMCCafe(BaseQueryOrderRequest baseQueryOrderRequest) {
+        POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
+        request.setOrderCode(baseQueryOrderRequest.getOrderId());
+        request.setOperator(baseQueryOrderRequest.getOperator());
+        // 引入门店基础服务 查询自动制作完成配置时间
+        setTimeout(baseQueryOrderRequest,request);
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.acceptOrderMCCafe(request, baseQueryOrderRequest.getTrackingNo());
+        return orderSdkAdapter.convent2BaseOrderResponse(response);
+    }
+
+    @Override
     public BaseOrderResponse orderReject(CancelOrderRequest cancelOrderRequest) {
         OrderCancelReq request = new OrderCancelReq();
         //商户号必传

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -886,7 +886,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         BaseQueryOrderRequest var2 = new BaseQueryOrderRequest();
         var2.setOrderId(confirmOrderDto.getOrderId());
         var2.setPartnerId(partnerId);
-        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderConfirmTake(var2);
+        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderConfirmTakeMCCafe(var2);
         LogUtil.info("paySuccessCallback_orderConfirmTake", gson.toJson(var2), gson.toJson(baseOrderResponse));
 
         // TODO 订单序号替换取餐码显示

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -40,6 +40,8 @@ public class InterfaceAddressConstant {
     public static final String PULL_ORDERS = "order/v2/pullOrders";
     //接单
     public static final String ACCEPT_ORDER = "order/v2/accept";
+    //接单
+    public static final String ACCEPT_ORDER_MCCAFE = "order/v2/mcCafe/accept";
     /**
      * 拒单 同取消订单接口
      */

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -290,6 +290,16 @@ public class OrderSdkService {
     }
 
     /**
+     * 接单
+     */
+    public BaseResponse acceptOrderMCCafe(POSOrderOperationBaseReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.ACCEPT_ORDER_MCCAFE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+    /**
      * 制作完成
      */
     public BaseResponse prepareComplete(POSOrderOperationBaseReq request, String trackingNo) {