master
wufan 2 months ago
parent 1b3a804b3e
commit c662da76a0

@ -28794,7 +28794,7 @@ namespace TradeManageNew
Country = shopifyOrder?.Country, Country = shopifyOrder?.Country,
CountryCode = shopifyOrder?.CountryCode, CountryCode = shopifyOrder?.CountryCode,
Currency = shopifyOrder?.Currency, Currency = shopifyOrder?.Currency,
TotalPrice = shopifyOrder?.TotalPrice, TotalPrice = shopifyOrderItem.Price,
}; };
resultItem.ShopifyOrder = shopifyOrderDto; resultItem.ShopifyOrder = shopifyOrderDto;
@ -29623,6 +29623,9 @@ namespace TradeManageNew
}; };
} }
var isResidential = true;
if (shopifyUsedSaleOrder.IsResidential is null)
{
var getAddressTypeParameter = new FedexValidateAddressModel var getAddressTypeParameter = new FedexValidateAddressModel
{ {
addressesToValidate = new List<addressesToValidate>() addressesToValidate = new List<addressesToValidate>()
@ -29651,7 +29654,16 @@ namespace TradeManageNew
}; };
} }
//是否住宅地址 //是否住宅地址
bool isResidential = !(addressType.ToUpper() == "BUSINESS" || addressType.ToUpper() == "OFFICE"); isResidential = !(addressType.ToUpper() == "BUSINESS" || addressType.ToUpper() == "OFFICE");
db.DT_ShopifyUsedSaleOrder.Where(x => x.Id == shopifyUsedSaleOrderItem.DtShopifyUsedSaleOrderId)
.Set(x => x.IsResidential, isResidential)
.Update();
}
else
{
isResidential = shopifyUsedSaleOrder.IsResidential.Value;
}
//获取Fedex运费和面单 //获取Fedex运费和面单
var fedexCredential = new FedexCredential(isDebugMode: true) { ReadResponseAsString = true }; var fedexCredential = new FedexCredential(isDebugMode: true) { ReadResponseAsString = true };

@ -124,5 +124,10 @@ namespace TradeUsedSale.Repositories.Models
/// 取消时间 /// 取消时间
/// </summary> /// </summary>
public DateTime? CancelDate { get; set; } public DateTime? CancelDate { get; set; }
/// <summary>
/// 是否住宅地址
/// </summary>
public bool? IsResidential { get; set; }
} }
} }
Loading…
Cancel
Save