pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

客户端显示SD退货

qianyi
shanji 3 years ago
parent
ba2b651a84
commit
e672971652
8 changed files with 143 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      BBWY.Client/APIServices/AfterOrderService.cs
  2. 5
      BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
  3. 6
      BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
  4. 3
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  5. 108
      BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml
  6. 57
      BBWY.Client/Views/Order/OrderList.xaml
  7. 4
      BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
  8. 2
      BBWY.Server.Model/Db/Order/AfterSaleOrder.cs

6
BBWY.Client/APIServices/AfterOrderService.cs
View File

@ -51,7 +51,8 @@ namespace BBWY.Client.APIServices
ProductHealth productHealth,
decimal reissueAfterSaleAmount,
decimal reissueFreight,
decimal reissueProductAmount)
decimal reissueProductAmount,
decimal sdRefundFreight)
{
return SendRequest<object>(globalContext.BBYWApiHost, "Api/AfterSaleOrder/EditAfterSaleOrder", new
{
@ -62,7 +63,8 @@ namespace BBWY.Client.APIServices
productHealth,
reissueAfterSaleAmount,
reissueFreight,
reissueProductAmount
reissueProductAmount,
sdRefundFreight
}, null, HttpMethod.Post);
}

5
BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
View File

@ -151,5 +151,10 @@ namespace BBWY.Client.Models
/// 采购单主键
/// </summary>
public long? PurchaseOrderPKId { get; set; }
/// <summary>
/// 刷单退货运费
/// </summary>
public decimal SDRefundFreight { get; set; } = 0.00M;
}
}

6
BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs
View File

@ -11,6 +11,7 @@ namespace BBWY.Client.Models
private decimal reissueAfterSaleAmount;
private decimal reissueFreight;
private decimal reissueProductAmount;
private decimal sdRefundFreight;
public long Id { get; set; }
@ -138,6 +139,11 @@ namespace BBWY.Client.Models
/// </summary>
public long? PurchaseOrderPKId { get; set; }
/// <summary>
/// SD退货运费
/// </summary>
public decimal SDRefundFreight { get => sdRefundFreight; set { Set(ref sdRefundFreight, value); } }
public object Clone()
{
return this.MemberwiseClone();

3
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -867,7 +867,8 @@ namespace BBWY.Client.ViewModels
afterSaleOrder.ProductHealth.Value,
afterSaleOrder.ReissueAfterSaleAmount,
afterSaleOrder.ReissueFreight,
afterSaleOrder.ReissueProductAmount)).ContinueWith(t =>
afterSaleOrder.ReissueProductAmount,
afterSaleOrder.SDRefundFreight)).ContinueWith(t =>
{
var response = t.Result;
if (!response.Success)

108
BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml
View File

@ -41,67 +41,95 @@
<TextBlock Text="{Binding SaleOrder.ServiceId,StringFormat=\{0\} 售后信息}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<Grid Grid.Row="1">
<StackPanel Grid.Row="1">
<Grid Margin="0,5,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="5"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="处理结果" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/>
<ComboBox Grid.Column="1" Grid.Row="1"
<TextBlock Text="处理结果" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Source={StaticResource ServiceResultProvider}}"
SelectedItem="{Binding SaleOrder.ServiceResult}"
SelectedIndex="0" Height="25" Width="100"
SelectedIndex="0" Height="25"
HorizontalAlignment="Left" VerticalAlignment="Center"
VerticalContentAlignment="Center" Margin="5,0,0,0"/>
<TextBlock Text="退款金额" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/>
<c:BTextBox Grid.Column="1" Grid.Row="2" Height="25" Margin="5,0" IsEnabled="False" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"
</Grid>
<Grid Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="退款金额" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<c:BTextBox Grid.Column="1" Height="25" Margin="5,0" IsEnabled="False" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"
Text="{Binding SaleOrder.RefundAmount}"/>
<TextBlock Text="商品处理" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="3"/>
<ComboBox Grid.Column="1" Grid.Row="3"
</Grid>
<Grid Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品处理" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Source={StaticResource ProductResultProvider}}"
SelectedItem="{Binding SaleOrder.ProductResult}"
SelectedIndex="0" Height="25" Width="100"
SelectedIndex="0" Height="25"
HorizontalAlignment="Left" VerticalAlignment="Center"
VerticalContentAlignment="Center" Margin="5,0,0,0"/>
<TextBlock Text="商品情况" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="4"/>
<ComboBox Grid.Column="1" Grid.Row="4"
</Grid>
<Grid Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品情况" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Source={StaticResource ProductHealthProvider}}"
SelectedItem="{Binding SaleOrder.ProductHealth}"
SelectedIndex="0" Height="25" Width="100"
SelectedIndex="0" Height="25"
HorizontalAlignment="Left" VerticalAlignment="Center"
VerticalContentAlignment="Center" Margin="5,0,0,0"/>
<TextBlock Text="售后补偿" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="5"/>
<c:BTextBox Grid.Column="1" Grid.Row="5" Height="25" Margin="5,0"
</Grid>
<Grid Margin="0,0,0,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="售后补偿" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<c:BTextBox Grid.Column="1" Height="25" Margin="5,0"
Text="{Binding SaleOrder.ReissueAfterSaleAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<TextBlock x:Name="txt_ReissueProductAmount" Text="补发货款" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="6"
Visibility="{Binding SaleOrder.ServiceResult,ConverterParameter=维修|商品补发|线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
<c:BTextBox Grid.Column="1" Grid.Row="6" Height="25" Margin="5,0"
Text="{Binding SaleOrder.ReissueProductAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Visibility,ElementName=txt_ReissueProductAmount}"/>
<TextBlock x:Name="txt_ReissueFreight" Text="补发快递" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="7"
Visibility="{Binding Visibility,ElementName=txt_ReissueProductAmount}"/>
<c:BTextBox Grid.Column="1" Grid.Row="7" Height="25" Margin="5,0"
Text="{Binding SaleOrder.ReissueFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding Visibility,ElementName=txt_ReissueProductAmount}"/>
</Grid>
<Grid x:Name="grid_s1" Margin="0,0,0,5"
Visibility="{Binding SaleOrder.ServiceResult,ConverterParameter=维修|商品补发|线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="补发货款" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<c:BTextBox Grid.Column="1" Height="25" Margin="5,0"
Text="{Binding SaleOrder.ReissueProductAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
<Grid Margin="0,0,0,5" Visibility="{Binding Visibility,ElementName=grid_s1}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock x:Name="txt_ReissueFreight" Text="补发快递" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<c:BTextBox Grid.Column="1" Height="25" Margin="5,0"
Text="{Binding SaleOrder.ReissueFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
<Grid Margin="0,0,0,5" Visibility="{Binding SaleOrder.ServiceResult,Mode=OneWay,UpdateSourceTrigger=PropertyChanged,ConverterParameter=SD退货:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock x:Name="txt_SDRefundFreight" Text="SD退货运费" HorizontalAlignment="Right" VerticalAlignment="Center"/>
<c:BTextBox Grid.Column="1" Height="25" Margin="5,0"
Text="{Binding SaleOrder.SDRefundFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Grid>
</StackPanel>
<c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0"
Click="btn_Save_Click"/>

57
BBWY.Client/Views/Order/OrderList.xaml
View File

@ -843,7 +843,7 @@
<Path Style="{StaticResource path_question}"
Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0"
ToolTipService.ShowDuration="20000">
ToolTipService.ShowDuration="10000">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<Grid>
@ -880,6 +880,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
@ -895,7 +896,7 @@
<Grid Background="{StaticResource Border.Background}" Grid.Column="3" Grid.ColumnSpan="6">
<TextBlock Text="期间成本" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="9" Grid.ColumnSpan="2">
<Grid Background="{StaticResource Border.Background}" Grid.Column="9" Grid.ColumnSpan="3">
<TextBlock Text="售后耗损" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="1" Grid.Row="1">
@ -929,14 +930,17 @@
<Grid Background="{StaticResource Border.Background}" Grid.Column="10" Grid.Row="1">
<TextBlock Text="售后补偿" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="11" Grid.RowSpan="2">
<TextBlock Text="售后小计" Style="{StaticResource middleTextBlock}"/>
<Grid Background="{StaticResource Border.Background}" Grid.Column="11" Grid.Row="1">
<TextBlock Text="SD退货" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="12" Grid.RowSpan="2">
<TextBlock Text="售后小计" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Grid Background="{StaticResource Border.Background}" Grid.Column="13" Grid.RowSpan="2">
<TextBlock Text="退款到账" Style="{StaticResource middleTextBlock}"/>
</Grid>
<Border Grid.RowSpan="2" Grid.ColumnSpan="13" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"/>
<Border Grid.RowSpan="2" Grid.ColumnSpan="14" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"/>
<Border Width="1" HorizontalAlignment="Right" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="1" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="2" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
@ -947,9 +951,10 @@
<Border Width="1" HorizontalAlignment="Right" Grid.Column="7" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="8" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="9" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="10" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="10" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="11" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="10" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Grid.Column="12" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="11" Background="{StaticResource Border.Brush}"/>
</Grid>
<ListBox Grid.Row="2"
BorderBrush="{StaticResource Border.Brush}"
@ -973,6 +978,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
@ -997,8 +1003,11 @@
Visibility="{Binding RefundInStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding ReissueAfterSaleAmount}" Grid.Column="10" Style="{StaticResource middleTextBlock}"
Visibility="{Binding ReissueAfterSaleAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding AfterTotalCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding RefundPurchaseAmount}" Grid.Column="12" Style="{StaticResource middleTextBlock}"
<TextBlock Text="{Binding SDRefundFreight}" Grid.Column="11" Style="{StaticResource middleTextBlock}"
Visibility="{Binding SDRefundFreight,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Text="{Binding AfterTotalCost}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding RefundPurchaseAmount}" Grid.Column="13" Style="{StaticResource middleTextBlock}"
Visibility="{Binding RefundPurchaseAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -1013,7 +1022,8 @@
<Border Grid.Column="9" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,-1,0"/>
<Border Grid.Column="10" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,-1,0"/>
<Border Grid.Column="11" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,-1,0"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="13" Background="{StaticResource Border.Brush}"/>
<Border Grid.Column="12" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Margin="0,0,-1,0"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="14" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
@ -1324,7 +1334,8 @@
<Run Text="售后成本"/>
<Run Text="{Binding AfterTotalCost}"/>
</TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<Grid Width="770" Height="120">
@ -1351,6 +1362,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
@ -1366,10 +1378,13 @@
<Grid Grid.Column="2" Grid.ColumnSpan="6" Background="{StaticResource Border.Background}">
<TextBlock Text="期间成本"/>
</Grid>
<Grid Grid.Column="8" Grid.ColumnSpan="2" Background="{StaticResource Border.Background}">
<Grid Grid.Column="8" Grid.ColumnSpan="3" Background="{StaticResource Border.Background}">
<TextBlock Text="售后损耗"/>
</Grid>
<Grid Grid.Column="10" Grid.RowSpan="2" Background="{StaticResource Border.Background}">
<Grid Grid.Column="10" Grid.Row="1" Background="{StaticResource Border.Background}">
<TextBlock Text="SD退货"/>
</Grid>
<Grid Grid.Column="11" Grid.RowSpan="2" Background="{StaticResource Border.Background}">
<TextBlock Text="退款采购成本"/>
</Grid>
@ -1390,10 +1405,10 @@
<TextBlock Text="快递费"/>
</Grid>
<Grid Grid.Row="1" Grid.Column="5" Background="{StaticResource Border.Background}">
<TextBlock Text="入库操作费"/>
<TextBlock Text="入库操作"/>
</Grid>
<Grid Grid.Row="1" Grid.Column="6" Background="{StaticResource Border.Background}">
<TextBlock Text="出库操作费"/>
<TextBlock Text="出库操作"/>
</Grid>
<Grid Grid.Row="1" Grid.Column="7" Background="{StaticResource Border.Background}">
<TextBlock Text="仓储费"/>
@ -1426,14 +1441,18 @@
Visibility="{Binding RefundInStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Grid.Row="2" Grid.Column="9" Text="{Binding ReissueAfterSaleAmount}"
Visibility="{Binding ReissueAfterSaleAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Grid.Row="2" Grid.Column="10" Text="{Binding RefundPurchaseAmount}"
<TextBlock Grid.Row="2" Grid.Column="10"
Text="{Binding SDRefundFreight}"
Visibility="{Binding SDRefundFreight,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<TextBlock Grid.Row="2" Grid.Column="11" Text="{Binding RefundPurchaseAmount}"
Visibility="{Binding RefundPurchaseAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
<!--Line-->
<Border Width="1" Grid.Column="1" Grid.RowSpan="3" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="7" Grid.RowSpan="3" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="9" Grid.RowSpan="3" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="9" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="10" Grid.RowSpan="3" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -1444,8 +1463,8 @@
<Border Width="1" Grid.Column="8" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="9" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="10" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.Row="1" Grid.ColumnSpan="11" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.ColumnSpan="11" Background="{StaticResource Border.Brush}"/>
<Border Height="1" VerticalAlignment="Bottom" Grid.Row="1" Grid.ColumnSpan="12" Background="{StaticResource Border.Brush}"/>
</Grid>
</Border>
<TextBlock Grid.Row="1" VerticalAlignment="Center" Margin="0,5">

4
BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
View File

@ -136,7 +136,7 @@ namespace BBWY.Server.Business
if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.SD退货)
{
dbAfterSaleOrder.SDRefundFreight = editAfterSaleOrderRequest.SDRefundFreight;
dbAfterSaleOrder.AfterTotalCost = editAfterSaleOrderRequest.SDRefundFreight;
dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.SDRefundFreight + dbAfterSaleOrder.ReissueAfterSaleAmount;
}
else
{
@ -192,7 +192,7 @@ namespace BBWY.Server.Business
dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id;
}
dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value +
dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount +
dbAfterSaleOrder.ConsumableAmount.Value +
dbAfterSaleOrder.DeliveryExpressFreight.Value +
dbAfterSaleOrder.FirstFreight.Value +

2
BBWY.Server.Model/Db/Order/AfterSaleOrder.cs
View File

@ -48,7 +48,7 @@ namespace BBWY.Server.Model.Db
/// 售后补发成本
/// </summary>
[Column(DbType = "decimal(20,2)")]
public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M;
public decimal ReissueAfterSaleAmount { get; set; } = 0.00M;
/// <summary>
/// 补发运费

Write Preview
Loading…
Cancel
Save