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

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

@@ -198,7 +198,7 @@ public class DeliveryHandle {
             return false;
         }
         //自配送不创建配送单
-        if (delivery_type_self.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())) {
+        if (this.deliveryTypeSelf(orderBean.getAddInfo().getDeliveryType())) {
             return false;
         }
         return true;
@@ -321,4 +321,12 @@ public class DeliveryHandle {
         return null;
     }
 
+    /**
+     *  是否商家自配送
+     * @param deliveryType
+     * @return true 自配送
+     */
+    public boolean deliveryTypeSelf(String deliveryType){
+        return delivery_type_self.equalsIgnoreCase(deliveryType);
+    }
 }

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

@@ -111,8 +111,9 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             BizDTO bizVO = storeMix.getBizVO();
             // fisherman 预约单不走自动|半自动派单逻辑  【【野萃山】手动派单增加半自动配置】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001040800
             boolean unReservedExpress = !Objects.equals(orderBean.getNewOrderType(), OrderType.RESERVED_EXPRESS.getIndex());
-
-            if (bizVO != null && bizVO.getBusinessInfo() != null && unReservedExpress) {
+            // fisherman 自配送 不走 自动 | 半自动逻辑
+            boolean deliveryTypeSelf = deliveryHandle.deliveryTypeSelf(orderBean.getAddInfo().getDeliveryType());
+            if (bizVO != null && bizVO.getBusinessInfo() != null && unReservedExpress && !deliveryTypeSelf) {
                 ExpandFieldsDTO expandFields = bizVO.getBusinessInfo().getExpandFields();
                 request.setDispatchType(expandFields.getDispatchType());
                 // fisherman 半自动派单时间获取