Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -172,6 +172,7 @@ public enum ResponseResult {
     AGREE_REFUND_APPLY_ORDER_FAIL("45087", "同意退款申请失败"),
     AGREE_REFUND_APPLY_ORDER_NOT_ALLOW("45088", "商户配置不允许退款，请检查商户配置"),
     PARTNER_ORDER_CANCEL_ERROR("45089", "取消订单失败"),
+    ORDER_DELIVERY_EDIT_FAILED("45090", "修改配送状态失败"),
 
     /**
      * 支付

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.adapter.DeliverySdkAdapter;
+import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.entities.dto.request.console.*;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
@@ -16,6 +17,7 @@ import cn.freemud.management.thirdparty.OrderCallbackClient;
 import cn.freemud.management.util.ResponseUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
@@ -410,8 +412,21 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     }
 
     @Override
-    public BaseResponse<OrderManagerResponse> orderCancelDelivery(OrderManagerRequest request, OrderBeanV1 orderBean) {
-        return deliveryHandle.cancelDelivery(orderBean,request);
+    public BaseResponse orderCancelDelivery(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        BaseResponse response =  deliveryHandle.cancelDelivery(orderBean,request);
+        if (!Objects.equals(response.getCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)){
+            return response;
+        }
+        OrderExpressReq expressReq = new OrderExpressReq();
+        expressReq.setOrderCode(orderBean.getOid());
+        expressReq.setPartnerId(orderBean.getCompanyId());
+        expressReq.setOrderSubState(DeliveryStatus.DELIVERYCANCEL.getCode());
+        OrderBaseResp orderBaseResp =  orderSdkService.updateDeliveryInfo(expressReq, LogThreadLocal.getTrackingNo());
+        if (Objects.equals(orderBaseResp.getCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)){
+            this.commonSendEmailAlert(orderBean,orderBaseResp,"取消配送,修改订单配送状态失败");
+            return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_EDIT_FAILED);
+        }
+        return ResponseUtil.success();
     }
 
     /**

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

@@ -19,6 +19,7 @@ import java.math.BigDecimal;
 
 @Data
 public class OrderExpressReq {
+    private String partnerId;
 
     //订单编号
     private String orderCode;