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

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

@@ -16,6 +16,8 @@ public class InterfaceAddressConstant {
     public static final String PAY_SUCCESS = "order/v2/paySuccess";
     //支付成功
     public static final String PAY_SUCCESS_MCCAFE = "order/v2/mcCafe/paySuccess";
+    //支付成功
+    public static final String MCCAFE_COLLECT_ORDER = "order/v2/mcCafe/syncPos";
     //父子订单支付成功
     public static final String FATHER_ORDER_PAY_SUCCESS = "/order/v2/relatedOrdersPaySuccess";
     //删除订单

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

@@ -186,6 +186,17 @@ public class OrderSdkService {
 
 
     /**
+     *  麦咖啡收到汇集回调后，把订单加入入机拉单队列
+     */
+    public BaseResponse collectOrder(OrderDeleteReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.DELETE_ORDER,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+
+    /**
      * 删除订单
      */
     public BaseResponse deleteOrder(OrderDeleteReq request, String trackingNo) {