From 50c33997871a01b76cb4ad8847c4fe173008a094 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Mon, 22 Apr 2024 11:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB=E5=9F=BAAP?=
 =?UTF-8?q?I=E8=AE=A2=E8=88=B1=E6=9F=A5=E8=AF=A2=E8=88=B9=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingMSKAPIService.cs        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs
index cc8f816c..47eb515b 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs
@@ -121,10 +121,6 @@ namespace Myshipping.Application.Service.BookingOrder
                     userSecret = App.Configuration["MSKAPIDjyUserSecret"],
                     operatingEnvironment = App.Configuration["MSKAPIOPEnvironment"],
                     mskAppKey = webAccountConfig.Account,
-                    collectionOriginCityName = model.collectionOriginCityName,
-                    collectionOriginCountryCode = model.collectionOriginCountryCode,
-                    deliveryDestinationCityName = model.deliveryDestinationCityName,
-                    deliveryDestinationCountryCode = model.deliveryDestinationCountryCode,
                     cargoType = model.cargoType,
                     exportServiceMode = model.exportServiceMode,
                     importServiceMode = model.importServiceMode,
@@ -133,6 +129,19 @@ namespace Myshipping.Application.Service.BookingOrder
                     startDateType = "D",
                 };
 
+                if(!string.IsNullOrWhiteSpace(model.carrierCollectionOriginGeoID) && !string.IsNullOrWhiteSpace(model.carrierDeliveryDestinationGeoID))
+                {
+                    queryInfo.carrierCollectionOriginGeoID = model.carrierCollectionOriginGeoID;
+                    queryInfo.carrierDeliveryDestinationGeoID = model.carrierDeliveryDestinationGeoID;
+                }
+                else
+                {
+                    queryInfo.collectionOriginCityName = model.collectionOriginCityName;
+                    queryInfo.collectionOriginCountryCode = model.collectionOriginCountryCode;
+                    queryInfo.deliveryDestinationCityName = model.deliveryDestinationCityName;
+                    queryInfo.deliveryDestinationCountryCode = model.deliveryDestinationCountryCode;
+                }
+
                 //有时候船期需要带上箱型检索
                 if (!string.IsNullOrWhiteSpace(model.ISOEquipmentCode))
                 {