自提单 不走配送计算逻辑

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -327,10 +327,6 @@ public class DeliveryHandle {
      * @return true 自配送
      */
     public boolean deliveryTypeSelf(String deliveryType){
-        // 防止 自提 堂食 订单 发配送
-        if (Objects.isNull(deliveryType)) {
-            return true;
-        }
         return delivery_type_self.equalsIgnoreCase(deliveryType);
     }
 }

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

@@ -108,10 +108,10 @@ 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 unReservedExpress = !Objects.equals(orderBean.getNewOrderType(), OrderType.RESERVED_EXPRESS.getIndex());
+            boolean reservedExpress = Objects.equals(orderBean.getNewOrderType(), OrderType.GENERAL_EXPRESS.getIndex());
             // fisherman 自配送 不走 自动 | 半自动逻辑
-            boolean deliveryTypeSelf = deliveryHandle.deliveryTypeSelf(orderBean.getAddInfo().getDeliveryType());
-            if (bizVO != null && bizVO.getBusinessInfo() != null && unReservedExpress && !deliveryTypeSelf) {
+            boolean deliveryTypeSelf = deliveryHandle.deliveryTypeSelf(Objects.isNull(orderBean.getAddInfo()) ? null : orderBean.getAddInfo().getDeliveryType());
+            if (bizVO != null && bizVO.getBusinessInfo() != null && reservedExpress && !deliveryTypeSelf) {
                 ExpandFieldsDTO expandFields = bizVO.getBusinessInfo().getExpandFields();
                 request.setDispatchType(expandFields.getDispatchType());
                 // fisherman 半自动派单时间获取