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

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseQueryOrderRequest.java

@@ -64,4 +64,10 @@ public class BaseQueryOrderRequest extends BaseConfig {
     // 合阔pos 商户订单状态不自动扭转
     private Boolean notAutomaticTwist;
 
+
+    /**
+     * 派单模式(0-系统自动派单;1-手动派单)
+     * 内置传参使用
+     */
+    private String dispatchType;
 }

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

@@ -62,13 +62,11 @@ import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.order.adapter.*;
 import com.freemud.sdk.api.assortment.order.constant.CommonConstant;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
-import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
-//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
 import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
@@ -87,6 +85,8 @@ import java.util.stream.Collectors;
 import static com.freemud.application.sdk.api.membercenter.constant.InterfaceAddressConstant.MEMBER_EXTEND_INFO;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
+
+//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 @Import(ManagerOrderBeanConfig.class)
 @Service
 public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@@ -878,6 +878,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setDispatchType(baseQueryOrderRequest.getDispatchType());
         // 引入门店基础服务 查询自动制作完成配置时间
         setTimeout(baseQueryOrderRequest,request);
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());

order-management/src/main/java/cn/freemud/management/entities/dto/request/order/OrderManagerRequest.java

@@ -62,4 +62,10 @@ public class OrderManagerRequest {
 
     private String remark;
     private Boolean horseman;
+
+    /**
+     * 派单模式(0-系统自动派单;1-手动派单)
+     * 内置传参使用
+     */
+    private String dispatchType;
 }

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -72,6 +72,7 @@ public class SaasOrderHandle {
     public BaseResponse orderConfirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
         //订单接单
         BaseQueryOrderRequest orderConfirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
+        orderConfirmRequest.setDispatchType(request.getDispatchType());
         orderSdkAdapter.convert2wmDeliveryTimeOut(orderConfirmRequest,this.wmDeliveryTimeOut);
         //合阔pos 商户订单状态不自动扭转
         // 2021-07-07 合阔自动

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

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.management.adapter.DeliverySdkAdapter;
-import cn.freemud.management.entities.dto.request.console.BizDTO;
-import cn.freemud.management.entities.dto.request.console.ConsoleResponseDTO;
-import cn.freemud.management.entities.dto.request.console.GetStoreMixRequest;
-import cn.freemud.management.entities.dto.request.console.QueryFlag;
+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;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
@@ -105,11 +101,18 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
      */
     @Override
     public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        QueryFlag query = QueryFlag.builder().queryBusinessInfo(true).queryStoreInfo(true).build();
+        ConsoleResponseDTO<BizDTO>  storeMix = this.getStoreMix(query, orderBean.getCompanyId(), orderBean.getShopId());
+        if (storeMix!=null && ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), storeMix.getStatusCode())) {
+            BizDTO bizVO = storeMix.getBizVO();
+            if (bizVO!=null && bizVO.getBusinessInfo() !=null) {
+                ExpandFieldsDTO expandFields = bizVO.getBusinessInfo().getExpandFields();
+                request.setDispatchType(expandFields.getDispatchType());
+            }
+        }
         // 订单接单
         BaseResponse baseResponse = saasOrderHandle.orderConfirm(request, orderBean);
         // 使用feign调用 获取门店信息
-        QueryFlag query = QueryFlag.builder().queryBusinessInfo(true).queryStoreInfo(true).build();
-        ConsoleResponseDTO<BizDTO>  storeMix = this.getStoreMix(query, orderBean.getCompanyId(), orderBean.getShopId());
         // 创建配送单
         deliveryHandle.createDelivery(orderBean, request, storeMix, true);
         // 推送pos、微信消息中心 重复接单不重复推消息（针对蜜雪做的修改）

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

@@ -27,4 +27,9 @@ public class POSOrderOperationBaseReq {
     //预约单接单提醒时间 提醒触发时间=预约时间-提醒时间
     private Integer remindTime;
 
+    /**
+     * 派单模式(0-系统自动派单;1-手动派单)
+     * 内置传参使用
+     */
+    private String dispatchType;
 }