Merge branch 'feature/2.0.4-修改支持的订单类型'

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

@@ -23,6 +23,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import javafx.util.Pair;
@@ -54,6 +55,8 @@ public class DeliveryHandle {
 
     @Value("${saas.order.delivery.callBackUrl}")
     private String deliveryCallBackUrl;
+    @Value("${delivery.support.ordersource}")
+    private String supportOrderSource;
 
     @Autowired
     private DeliveryService deliveryService;
@@ -166,7 +169,15 @@ public class DeliveryHandle {
             return false;
         }
         //订单来源异常
-        if (!orderBean.getSource().equalsIgnoreCase(OrderSourceType.SAAS.getCode())) {
+        boolean sourceCheck = false;
+        String[] supportSource = supportOrderSource.split(","); // OrderSourceType.SAAS.getCode()
+        for (String source : supportSource){
+            if (orderBean.getSource().equalsIgnoreCase(source)) {
+                sourceCheck = true;
+                break;
+            }
+        }
+        if (!sourceCheck){
             return false;
         }
         //配送信息为空，则不创建配送单
@@ -179,4 +190,7 @@ public class DeliveryHandle {
         }
         return true;
     }
+
+
+
 }