刷单号费 服务端

BBWY.Client/App.xaml.cs

@@ -32,10 +32,10 @@ namespace BBWY.Client
             string userToken = string.Empty;
 #if DEBUG
             //齐越山鸡
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
             //齐越愉辰
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNDU1MzExNDYyNDAwIiwidGVhbUlkIjoiMTQzOTg5ODYxNzM1ODg0ODAwMCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUwNDA0ODZ9.0TvEhPzTeKvpQY31E5YhgfvRBJHYdvwWRrEHNnF9kkA";
             //齐越悠仁

BBWY.Client/Views/Order/SD.xaml

@@ -55,7 +55,6 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="刷单平台" HorizontalAlignment="Right" VerticalAlignment="Center" />
             <ComboBox x:Name="cbx_sdType" Grid.Column="1" ItemsSource="{Binding Source={StaticResource SDTypeProvider}}"
-                      SelectionChanged="cbx_sdType_SelectionChanged"
                       SelectedIndex="0" Height="25" Width="100" 
                       HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
 

BBWY.Client/Views/Order/SD.xaml.cs

@@ -74,7 +74,7 @@ namespace BBWY.Client.Views.Order
             this.txtDeliveryExpressFreight.Text = DeliveryExpressFreight.ToString();
             this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString();
 
-            lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
+            //lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
         }
 
         private void btn_Save_Click(object sender, RoutedEventArgs e)
@@ -101,11 +101,11 @@ namespace BBWY.Client.Views.Order
             this.Close();
         }
 
-        private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (lblSDCommissionAmount == null)
-                return;
-            lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
-        }
+        //private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        //{
+        //    if (lblSDCommissionAmount == null)
+        //        return;
+        //    lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
+        //}
     }
 }

BBWY.Server.Business/Extensions/OrderCostExtension.cs

@@ -33,7 +33,7 @@ namespace BBWY.Server.Business.Extensions
 
             //退款之后平台扣点
             orderCost.PlatformCommissionAmount = (order.OrderSellerPrice - orderCost.RefundAmount) * (orderCost.PlatformCommissionRatio);
-            orderCost.Profit = (orderCost.SDCommissionAmount + orderCost.DeliveryExpressFreight + orderCost.PlatformCommissionAmount + orderCost.AfterTotalCost) * -1;
+            orderCost.Profit = (orderCost.SDCommissionAmount + orderCost.SDOrderAmount + orderCost.DeliveryExpressFreight + orderCost.PlatformCommissionAmount + orderCost.AfterTotalCost) * -1;
         }
     }
 }

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -144,6 +144,7 @@ namespace BBWY.Server.Business
                 PurchaseAmount = oct.PurchaseAmount,
                 IsManualEdited = oct.IsManualEdited,
                 SDCommissionAmount = oct.SDCommissionAmount,
+                SDOrderAmount = oct.SDOrderAmount,
                 RefundAmount = oct.RefundAmount,
                 RefundPurchaseAmount = oct.RefundPurchaseAmount,
                 AfterTotalCost = oct.AfterTotalCost
@@ -276,7 +277,7 @@ namespace BBWY.Server.Business
                 DeliveryExpressFreight = oct.DeliveryExpressFreight,
                 PlatformCommissionAmount = oct.PlatformCommissionAmount,
                 Profit = oct.Profit,
-                TotalCost = oct.SDCommissionAmount + oct.PlatformCommissionAmount + oct.PurchaseAmount + oct.DeliveryExpressFreight,
+                TotalCost = oct.SDCommissionAmount + oct.SDOrderAmount + oct.PlatformCommissionAmount + oct.PurchaseAmount + oct.DeliveryExpressFreight,
                 //PurchaseOrderIds = ods.PurchaseOrderId,
                 OrderState = o.OrderState.Value,
                 VenderRemark = o.VenderRemark,
@@ -706,7 +707,8 @@ namespace BBWY.Server.Business
                     DeliveryExpressFreight = sdCalculationCostRequest.DeliveryExpressFreight,
                     CreateTime = DateTime.Now,
                     IsManualEdited = true,
-                    SDCommissionAmount = sdCalculationCostRequest.SDCommissionAmount
+                    SDCommissionAmount = sdCalculationCostRequest.SDCommissionAmount,
+                    SDOrderAmount = sdCalculationCostRequest.SDOrderAmount
                 };
                 //orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;
                 //orderCost.Profit = (orderCost.SDCommissionAmount + orderCost.DeliveryExpressFreight + orderCost.PlatformCommissionAmount) * -1;
@@ -716,6 +718,7 @@ namespace BBWY.Server.Business
             else
             {
                 orderCost.SDCommissionAmount = sdCalculationCostRequest.SDCommissionAmount;
+                orderCost.SDOrderAmount = sdCalculationCostRequest.SDOrderAmount;
                 orderCost.DeliveryExpressFreight = sdCalculationCostRequest.DeliveryExpressFreight;
                 //orderCost.Profit = (orderCost.SDCommissionAmount + orderCost.DeliveryExpressFreight + orderCost.PlatformCommissionAmount) * -1;
                 orderCost.CalculationSDOrderProfitAndCost(dbOrder, dbAfterSaleOrderList);
@@ -856,6 +859,7 @@ namespace BBWY.Server.Business
                     {
                         oc.CreateTime,
                         oc.SDCommissionAmount,
+                        oc.SDOrderAmount,
                         oc.PlatformCommissionAmount,
                         oc.PlatformCommissionRatio
                     });
@@ -871,6 +875,7 @@ namespace BBWY.Server.Business
                         DeliveryExpressFreight = totalDeliveryFreight,
                         PlatformCommissionRatio = relationPurchaseOrderRequestV2.PlatformCommissionRatio,
                         SDCommissionAmount = 0,
+                        SDOrderAmount = 0,
                         PurchaseAmount = totalPurchaseAmount,
                         PlatformCommissionAmount = dbOrder.OrderSellerPrice * relationPurchaseOrderRequestV2.PlatformCommissionRatio,
                         PreferentialAmount = preferentialAmount,

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -267,6 +267,7 @@ namespace BBWY.Server.Business
                 PlatformCommissionRatio = createOnlinePurchaseOrderRequest.PlatformCommissionRatio,
                 PreferentialAmount = dbOrder.PreferentialAmount,
                 SDCommissionAmount = 0,
+                SDOrderAmount = 0,
                 PurchaseAmount = purchaseOrderSimpleInfo.TotalAmount
             };
             orderCost.PlatformCommissionAmount = dbOrder.OrderSellerPrice * orderCost.PlatformCommissionRatio;

BBWY.Server.Business/Sync/OrderSyncBusiness.cs

@@ -443,7 +443,8 @@ namespace BBWY.Server.Business
                                 DeliveryExpressFreight = sDCalculationCostRequest.DeliveryExpressFreight,
                                 CreateTime = DateTime.Now,
                                 IsManualEdited = true,
-                                SDCommissionAmount = sDCalculationCostRequest.SDCommissionAmount
+                                SDCommissionAmount = sDCalculationCostRequest.SDCommissionAmount,
+                                SDOrderAmount = sDCalculationCostRequest.SDOrderAmount
                             };
                             orderCost.CalculationSDOrderProfitAndCost(dbOrder, null);
                             insertOrderCostList.Add(orderCost);

BBWY.Server.Model/Db/Order/Order.cs

@@ -210,6 +210,12 @@ namespace BBWY.Server.Model.Db
         [Column(IsIgnore = true)]
         public decimal? SDCommissionAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 刷单号费
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal? SDOrderAmount { get; set; } = 0.00M;
+
         /// <summary>
         /// 发货快递费
         /// </summary>

BBWY.Server.Model/Db/Order/OrderCost.cs

@@ -29,6 +29,12 @@ namespace BBWY.Server.Model.Db
         [Column(DbType = "decimal(20,2)")]
         public decimal SDCommissionAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 刷单号费
+        /// </summary>
+        [Column(DbType = "decimal(20,2)")]
+        public decimal SDOrderAmount { get; set; } = 0.00M;
+
         /// <summary>
         /// 优惠金额
         /// </summary>

BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs

@@ -37,6 +37,11 @@
         /// </summary>
         public decimal SDCommissionAmount { get; set; }
 
+        /// <summary>
+        /// 刷单号费
+        /// </summary>
+        public decimal SDOrderAmount { get; set; }
+
         /// <summary>
         /// 销售运费
         /// </summary>

BBWY.Server.Model/MappingProfiles.cs

@@ -53,6 +53,7 @@ namespace BBWY.Server.Model
                                              .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.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))
                                              .ForPath(t => t.OrderCost.RefundPurchaseAmount, opt => opt.MapFrom(f => f.RefundPurchaseAmount))
                                              .ForPath(t => t.OrderCost.AfterTotalCost, opt => opt.MapFrom(f => f.AfterTotalCost));