Merge branch 'feature/jimmy/20240914-新增诺心client' into qa

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

@@ -131,7 +131,9 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         if (storeMix != null && ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), storeMix.getStatusCode())) {
             BizDTO bizVO = storeMix.getBizVO();
             // fisherman 预约单不走自动|半自动派单逻辑  【【野萃山】手动派单增加半自动配置】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001040800
-            boolean reservedExpress = Objects.equals(orderBean.getNewOrderType(), OrderType.GENERAL_EXPRESS.getIndex());
+            // 预约外卖也支持半自动
+            boolean reservedExpress = Objects.equals(orderBean.getNewOrderType(), OrderType.GENERAL_EXPRESS.getIndex()) ||
+                    Objects.equals(orderBean.getNewOrderType(), OrderType.RESERVED_EXPRESS.getIndex());
             // fisherman 自配送 不走 自动 | 半自动逻辑
             boolean deliveryTypeSelf = deliveryHandle.deliveryTypeSelf(Objects.isNull(orderBean.getAddInfo()) ? null : orderBean.getAddInfo().getDeliveryType());
             if (bizVO != null && bizVO.getBusinessInfo() != null && reservedExpress && !deliveryTypeSelf) {