Merge branch 'feature-ka半自动派单ID1040800-20211222-zxh' into qa

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

@@ -107,6 +107,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     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());
+        boolean idAutoCreate = false;
         if (storeMix!=null && ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), storeMix.getStatusCode())) {
             BizDTO bizVO = storeMix.getBizVO();
             // fisherman 预约单不走自动|半自动派单逻辑  【【野萃山】手动派单增加半自动配置】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001040800
@@ -118,13 +119,14 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
                 request.setDispatchType(expandFields.getDispatchType());
                 // fisherman 半自动派单时间获取
                 request.setDispatchTimeout(deliveryHandle.getDispatchTimeout(expandFields.getDispatchConfig()));
+                idAutoCreate = true;
             }
         }
         // 订单接单
         BaseResponse baseResponse = saasOrderHandle.orderConfirm(request, orderBean);
         // 使用feign调用 获取门店信息
         // 创建配送单
-        deliveryHandle.createDelivery(orderBean, request, storeMix, true);
+        deliveryHandle.createDelivery(orderBean, request, storeMix, idAutoCreate);
         // 推送pos、微信消息中心 重复接单不重复推消息（针对蜜雪做的修改）
         if(baseResponse != null && baseResponse.getResult() == null){
             orderBaseService.sendMessage(orderBean, OperateType.ORDER_CONFIRM, request.getReason());