diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs index 136bf7b..495f307 100644 --- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs @@ -83,7 +83,7 @@ namespace BBWYB.Server.Business.Sync foreach (var qtOrder in qtOrderList.Items) { var dbOrder = dbOrderList.FirstOrDefault(o => o.Id == qtOrder.OrderId); - var orderState = !qtOrder.IsPay ? Enums.OrderState.待付款 : ConvertQuanTanOrderState(qtOrder.OrderState, dbOrder?.IsPurchased ?? false); + var orderState = ConvertQuanTanOrderState(qtOrder.OrderState, qtOrder.IsPay, dbOrder?.IsPurchased ?? false); if (dbOrder == null) { //新订单 @@ -150,7 +150,7 @@ namespace BBWYB.Server.Business.Sync Title = qtOrderSku.SkuTitle, ShopId = shopId, ProductId = qtOrderSku.ProductId, - BelongSkuId = belongSkus?.FirstOrDefault(j=>j.Value("SkuId") == qtOrderSku.SkuId)?.Value("BelongSkuId") ?? string.Empty + BelongSkuId = belongSkus?.FirstOrDefault(j => j.Value("SkuId") == qtOrderSku.SkuId)?.Value("BelongSkuId") ?? string.Empty }); } @@ -230,7 +230,7 @@ namespace BBWYB.Server.Business.Sync } } - private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPurchased) + private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPay, bool isPurchased) { /* -1、已取消; @@ -241,6 +241,10 @@ namespace BBWYB.Server.Business.Sync */ if (qtOrderState == "-1") return Enums.OrderState.已取消; + + if (isPay) + return Enums.OrderState.待付款; + if (qtOrderState == "0") { if (!isPurchased)