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

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

@@ -422,7 +422,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         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)){
+        if (!Objects.equals(orderBaseResp.getCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)){
             this.commonSendEmailAlert(orderBean,orderBaseResp,"取消配送,修改订单配送状态失败");
             return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_EDIT_FAILED);
         }