修改马士基API订舱查询船期

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))
                 {