预估成本

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10219";
+            ClientVersion = "10220";
         }
 
 

BBWY.Client/Models/APIModel/Response/Order/OrderCostDetailResponse.cs

@@ -84,5 +84,10 @@ namespace BBWY.Client.Models
         /// 总计 包含销售运费
         /// </summary>
         public decimal TotalCost2 { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 是否为预估成本
+        /// </summary>
+        public bool IsEstimateCost { get; set; } = false;
     }
 }

BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs

@@ -53,6 +53,11 @@ namespace BBWY.Client.Models
 		/// </summary>
         public bool IsManualEdited { get; set; }
 
+        /// <summary>
+        /// 是否为预估成本
+        /// </summary>
+        public bool IsEstimateCost { get; set; } = false;
+
         /// <summary>
         /// 刷单佣金
         /// </summary>

BBWY.Client/Models/Order/OrderCost.cs

@@ -53,6 +53,11 @@
 		/// </summary>
         public bool IsManualEdited { get; set; }
 
+        /// <summary>
+        /// 是否为预估成本
+        /// </summary>
+        public bool IsEstimateCost { get; set; } = false;
+
         /// <summary>
         /// 退款金额
         /// </summary>

BBWY.Client/Views/Order/OrderListControl.xaml

@@ -178,7 +178,7 @@
                                                                    Margin=" 5,0,0,0"/>
                                                         </StackPanel>
                                                     </StackPanel>
-                                                    <c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="{StaticResource Text.Pink}"
+                                                    <!--<c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="{StaticResource Text.Pink}"
                                                                    Visibility="{Binding DataContext.IsAfterSaleOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
                                                                    Command="{Binding DataContext.FindAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}">
                                                         <c:BButton.CommandParameter>
@@ -188,7 +188,7 @@
                                                                 <Binding Path="DataContext.OrderStartTime" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
                                                             </MultiBinding>
                                                         </c:BButton.CommandParameter>
-                                                    </c:BButton>
+                                                    </c:BButton>-->
                                                 </StackPanel>
                                                 <TextBlock>
                                                             <Run Text="货号:" />
@@ -806,6 +806,7 @@
                                 <TextBlock>
                                             <Run Text="成本总计"/>
                                             <Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
+                                            <Run Text="{Binding OrderCost.IsEstimateCost,Converter={StaticResource objConverter},ConverterParameter=true:预估:}" Foreground="{StaticResource Text.Pink}"/>
                                 </TextBlock>
                             </StackPanel>
                             <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" VerticalAlignment="Bottom" Margin="0,0,0,23"

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -150,6 +150,7 @@ namespace BBWY.Server.Business
                 Profit = oct.Profit,
                 PurchaseAmount = oct.PurchaseAmount,
                 IsManualEdited = oct.IsManualEdited,
+                IsEstimateCost = oct.IsEstimateCost,
                 SDCommissionAmount = oct.SDCommissionAmount,
                 SDOrderAmount = oct.SDOrderAmount,
                 RefundAmount = oct.RefundAmount,

BBWY.Server.Business/Sync/OrderEstimateCostSyncBusiness.cs

@@ -82,6 +82,7 @@ namespace BBWY.Server.Business
                                                  .From<OrderCostDetail>()
                                                  .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<OrderCost>().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();

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;
 
+        /// <summary>
+        /// 是否预估成本
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public bool IsEstimateCost { get; set; } = false;
+
         /// <summary>
         /// 退款金额
         /// </summary>

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