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

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -332,7 +332,6 @@ public class OrderManagerAdapter {
         if (orderBean == null) {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
-        String companyId = orderBean.getCompanyId();
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCreateDelivery(request, orderBean);
         return handleResponse(request,orderBean,orderManagerResponse);
     }

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

@@ -402,8 +402,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         QueryFlag query = QueryFlag.builder().queryBusinessInfo(true).queryStoreInfo(true).build();
         ConsoleResponseDTO<BizDTO>  storeMix = this.getStoreMix(query, orderBean.getCompanyId(), orderBean.getShopId());
         // 创建配送单
-        deliveryHandle.createDelivery(orderBean, request, storeMix, false);
-        return null;
+        return deliveryHandle.createDelivery(orderBean, request, storeMix, false);
     }
 
     @Override