售后管理

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

@@ -58,6 +58,26 @@ namespace BBWY.Client.Models
         /// </summary>
         public decimal SDCommissionAmount { get; set; } = 0.00M;
 
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        public decimal RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        public decimal ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 售后补偿成本
+        /// </summary>
+        public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
+
         /// <summary>
         /// 成本总计
         /// </summary>
@@ -65,7 +85,7 @@ namespace BBWY.Client.Models
         {
             get
             {
-                return SDCommissionAmount + PlatformCommissionAmount + PurchaseAmount + DeliveryExpressFreight;
+                return SDCommissionAmount + PlatformCommissionAmount + PurchaseAmount + DeliveryExpressFreight + ReissueFreight + ReissueProductAmount + ReissueAfterSaleAmount;
             }
         }
     }

BBWY.Client/Models/Order/OrderCost.cs

@@ -49,6 +49,26 @@
 		/// </summary>
         public bool IsManualEdited { get; set; }
 
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        public decimal RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        public decimal ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 售后补偿成本
+        /// </summary>
+        public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
+
         /// <summary>
         /// 成本总计
         /// </summary>

BBWY.Client/Views/Order/OrderList.xaml

@@ -11,7 +11,7 @@
       xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
       DataContext="{Binding OrderList,Source={StaticResource Locator}}"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="450" d:DesignWidth="2048"
       Title="OrderList">
     <Page.Resources>
         <ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -277,7 +277,8 @@
                     <TextBlock Text="采购信息" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="成本信息" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="利润信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock x:Name="txtshouhou" Text="售后信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="订单状态" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="备注信息" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
 
@@ -710,23 +711,25 @@
                                     </TextBlock>
                                 </StackPanel>
 
-                                <StackPanel Grid.Column="5" 
+
+                                <Grid Grid.Column="5">
+                                    <StackPanel 
                                             VerticalAlignment="Center"
                                             HorizontalAlignment="Center">
-                                    <TextBlock x:Name="txt_storeName" 
+                                        <TextBlock x:Name="txt_storeName" 
                                                Text="{Binding StoreName}" 
                                                TextWrapping="Wrap"
                                                HorizontalAlignment="Center"
                                                Visibility="{Binding StoreName,Converter={StaticResource objConverter},ConverterParameter=#null|0:Collapsed:Visible}"/>
-                                    <StackPanel x:Name="sp_waybill" Orientation="Horizontal">
-                                        <TextBlock Text="{Binding WaybillNo,Converter={StaticResource waybillConverter}}"/>
-                                        <c:BButton x:Name="btn_waybillCopy" Style="{StaticResource LinkButton}" 
+                                        <StackPanel x:Name="sp_waybill" Orientation="Horizontal">
+                                            <TextBlock Text="{Binding WaybillNo,Converter={StaticResource waybillConverter}}"/>
+                                            <c:BButton x:Name="btn_waybillCopy" Style="{StaticResource LinkButton}" 
                                                    Content="复制" 
                                                    Command="{Binding DataContext.CopyOrderWaybillCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" 
                                                    CommandParameter="{Binding }" Margin="5,0,0,0"/>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                                <c:BButton x:Name="btn_outStore" Content="出库" Grid.Column="5" VerticalAlignment="Bottom"
+                                    <c:BButton x:Name="btn_outStore" Content="出库" VerticalAlignment="Bottom"
                                            Foreground="{StaticResource Text.Color}"
                                            HorizontalAlignment="Stretch"
                                            Background="White"
@@ -735,8 +738,9 @@
                                            Visibility="Collapsed"
                                            Command="{Binding DataContext.OutStockCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
                                            CommandParameter="{Binding }"/>
-                                <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="5" VerticalAlignment="Bottom" Margin="0,0,0,25"
+                                    <Border Height="1" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom" Margin="0,0,0,25"
                                         Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
+                                </Grid>
 
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -148,6 +148,10 @@ namespace BBWY.Server.Business
                 PurchaseAmount = oct.PurchaseAmount,
                 IsManualEdited = oct.IsManualEdited,
                 SDCommissionAmount = oct.SDCommissionAmount,
+                RefundAmount = oct.RefundAmount,
+                ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount,
+                ReissueFreight = oct.ReissueFreight,
+                ReissueProductAmount = oct.ReissueProductAmount
 
                 //BuyerAccount = ods.BuyerAccount,
                 //DeliveryFreight = ods.DeliveryFreight,
@@ -355,7 +359,11 @@ namespace BBWY.Server.Business
                                                                            Profit = oct.Profit,
                                                                            PurchaseAmount = oct.PurchaseAmount,
                                                                            IsManualEdited = oct.IsManualEdited,
-                                                                           SDCommissionAmount = oct.SDCommissionAmount
+                                                                           SDCommissionAmount = oct.SDCommissionAmount,
+                                                                           RefundAmount = oct.RefundAmount,
+                                                                           ReissueAfterSaleAmount = oct.ReissueAfterSaleAmount,
+                                                                           ReissueFreight = oct.ReissueFreight,
+                                                                           ReissueProductAmount = oct.ReissueProductAmount
                                                                        });
             if (order == null)
                 throw new BusinessException("订单不存在");

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

@@ -215,6 +215,30 @@ namespace BBWY.Server.Model.Db
 		/// </summary>
 		[Column(IsIgnore = true)]
         public bool IsManualEdited { get; set; } = false;
+
+        /// <summary>
+        /// 退款金额
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal RefundAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发快递费
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal ReissueFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 补发货款成本
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal ReissueProductAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 售后补偿成本
+        /// </summary>
+        [Column(IsIgnore = true)]
+        public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
         #endregion
 
         #region 收货人信息

BBWY.Server.Model/MappingProfiles.cs

@@ -52,7 +52,11 @@ 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.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount));
+                                             .ForPath(t => t.OrderCost.SDCommissionAmount, opt => opt.MapFrom(f => f.SDCommissionAmount))
+                                             .ForPath(t => t.OrderCost.RefundAmount, opt => opt.MapFrom(f => f.RefundAmount))
+                                             .ForPath(t => t.OrderCost.ReissueAfterSaleAmount, opt => opt.MapFrom(f => f.ReissueAfterSaleAmount))
+                                             .ForPath(t => t.OrderCost.ReissueFreight, opt => opt.MapFrom(f => f.ReissueFreight))
+                                             .ForPath(t => t.OrderCost.ReissueProductAmount, opt => opt.MapFrom(f => f.ReissueProductAmount));
             //.ForPath(t => t.OrderDropShipping.PurchaseAmount, opt => opt.MapFrom(f => f.PurchaseAmount))
             //.ForPath(t => t.OrderDropShipping.PurchaseOrderId, opt => opt.MapFrom(f => f.PurchaseOrderId))
             //.ForPath(t => t.OrderDropShipping.OrderId, opt => opt.MapFrom(f => f.Id))