diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 90bc01bb..4e0fc9b3 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10219"; + ClientVersion = "10220"; } diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs index 90db238b..3084f87a 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs @@ -84,5 +84,10 @@ namespace BBWY.Client.Models /// 总计 包含销售运费 /// public decimal TotalCost2 { get; set; } = 0.00M; + + /// + /// 是否为预估成本 + /// + public bool IsEstimateCost { get; set; } = false; } } diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs index ef969c54..a01f346c 100644 --- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs @@ -53,6 +53,11 @@ namespace BBWY.Client.Models /// public bool IsManualEdited { get; set; } + /// + /// 是否为预估成本 + /// + public bool IsEstimateCost { get; set; } = false; + /// /// 刷单佣金 /// diff --git a/BBWY.Client/Models/Order/OrderCost.cs b/BBWY.Client/Models/Order/OrderCost.cs index eaf904f7..5626e2f9 100644 --- a/BBWY.Client/Models/Order/OrderCost.cs +++ b/BBWY.Client/Models/Order/OrderCost.cs @@ -53,6 +53,11 @@ /// public bool IsManualEdited { get; set; } + /// + /// 是否为预估成本 + /// + public bool IsEstimateCost { get; set; } = false; + /// /// 退款金额 /// diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml index 7d2ca3d5..c66cefa7 100644 --- a/BBWY.Client/Views/Order/OrderListControl.xaml +++ b/BBWY.Client/Views/Order/OrderListControl.xaml @@ -178,7 +178,7 @@ Margin=" 5,0,0,0"/> - @@ -188,7 +188,7 @@ - + --> @@ -806,6 +806,7 @@ + () .InnerJoin((ocd1, ocd2) => ocd1.MaxId == ocd2.Id) .ToList((ocd1, ocd2) => ocd2); + Console.WriteLine($"SKU最近成本同步-{shop.ShopName},有销量的订单sku一共{yesterdaycostDetailist.Count()}个"); if (yesterdaycostDetailist.Count() == 0) return; @@ -195,6 +196,7 @@ namespace BBWY.Server.Business o.StorageType == null && !fsql.Select().Where(oc => oc.OrderId == o.Id).Any()) .ToList(); + Console.WriteLine($"预估成本-{shop.ShopName},符合条件且没有成本的订单一共{orderList.Count()}个"); if (orderList.Count() == 0) return; var orderIdList = orderList.Select(o => o.Id).ToList(); diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs index 0fc9fbd0..ae2beaaf 100644 --- a/BBWY.Server.Model/Db/Order/Order.cs +++ b/BBWY.Server.Model/Db/Order/Order.cs @@ -246,6 +246,12 @@ namespace BBWY.Server.Model.Db [Column(IsIgnore = true)] public bool IsManualEdited { get; set; } = false; + /// + /// 是否预估成本 + /// + [Column(IsIgnore = true)] + public bool IsEstimateCost { get; set; } = false; + /// /// 退款金额 /// diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs index e7db91b6..1a320ad0 100644 --- a/BBWY.Server.Model/MappingProfiles.cs +++ b/BBWY.Server.Model/MappingProfiles.cs @@ -52,6 +52,7 @@ namespace BBWY.Server.Model .ForPath(t => t.OrderCost.PlatformCommissionRatio, opt => opt.MapFrom(f => f.PlatformCommissionRatio ?? 0)) .ForPath(t => t.OrderCost.PreferentialAmount, opt => opt.MapFrom(f => f.PreferentialAmount)) .ForPath(t => t.OrderCost.IsManualEdited, opt => opt.MapFrom(f => f.IsManualEdited)) + .ForPath(t => t.OrderCost.IsEstimateCost, opt => opt.MapFrom(f => f.IsEstimateCost)) .ForPath(t => t.OrderCost.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount)) .ForPath(t => t.OrderCost.SDOrderAmount, opt => opt.MapFrom(f => f.SDOrderAmount)) .ForPath(t => t.OrderCost.RefundAmount, opt => opt.MapFrom(f => f.RefundAmount))