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

10045

qianyi
shanji 3 years ago
parent
21fc51c012
commit
707a39674f
8 changed files with 62 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/APIServices/OrderService.cs
  2. 7
      BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
  3. 4
      BBWY.Client/Models/Order/OrderCost.cs
  4. 6
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  5. 2
      BBWY.Client/Views/MainWindow.xaml
  6. 11
      BBWY.Client/Views/Order/OrderListControl.xaml
  7. 32
      BBWY.Client/Views/Order/SD.xaml
  8. 23
      BBWY.Client/Views/Order/SD.xaml.cs

2
BBWY.Client/APIServices/OrderService.cs
View File

@ -148,6 +148,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<object> SDCalculationCost(string orderId, public ApiResponse<object> SDCalculationCost(string orderId,
bool isSetStorageType, bool isSetStorageType,
decimal sdCommissionAmount, decimal sdCommissionAmount,
decimal sdOrderAmount,
decimal deliveryExpressFreight, decimal deliveryExpressFreight,
SDType sdType, SDType sdType,
string sdKey, string sdKey,
@ -166,6 +167,7 @@ namespace BBWY.Client.APIServices
venderRemark, venderRemark,
sdType, sdType,
sdCommissionAmount, sdCommissionAmount,
sdOrderAmount,
deliveryExpressFreight, deliveryExpressFreight,
platformCommissionRatio = shop.PlatformCommissionRatio ?? 0.05M, platformCommissionRatio = shop.PlatformCommissionRatio ?? 0.05M,
sdKey, sdKey,

7
BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
View File

@ -58,6 +58,11 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public decimal SDCommissionAmount { get; set; } = 0.00M; public decimal SDCommissionAmount { get; set; } = 0.00M;
/// <summary>
/// 刷单号费
/// </summary>
public decimal SDOrderAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 退款金额 /// 退款金额
/// </summary> /// </summary>
@ -91,7 +96,7 @@ namespace BBWY.Client.Models
{ {
get get
{ {
return SDCommissionAmount + return SDCommissionAmount + SDOrderAmount +
PlatformCommissionAmount + (PurchaseAmount - RefundPurchaseAmount) + PlatformCommissionAmount + (PurchaseAmount - RefundPurchaseAmount) +
DeliveryExpressFreight + DeliveryExpressFreight +
AfterTotalCost; AfterTotalCost;

4
BBWY.Client/Models/Order/OrderCost.cs
View File

@ -24,6 +24,10 @@
/// </summary> /// </summary>
public decimal SDCommissionAmount { get; set; } public decimal SDCommissionAmount { get; set; }
/// <summary>
/// 刷单号费
/// </summary>
public decimal SDOrderAmount { get; set; }
/// <summary> /// <summary>
/// 利润 /// 利润
/// </summary> /// </summary>

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

@ -504,7 +504,7 @@ namespace BBWY.Client.ViewModels
} }
else if (storageType == StorageType.SD) else if (storageType == StorageType.SD)
{ {
var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, globalContext.User.Name, 0M, 0M); var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, globalContext.User.Name, 0M, 0M, 0M);
sd.Closed += Sd_Closed; sd.Closed += Sd_Closed;
sd.ShowDialog(); sd.ShowDialog();
} }
@ -586,6 +586,7 @@ namespace BBWY.Client.ViewModels
var orderId = sd.OrderId; var orderId = sd.OrderId;
var isSetStorageType = sd.IsSetStorageType; var isSetStorageType = sd.IsSetStorageType;
var sdCommissionAmount = sd.SDCommissionAmount; var sdCommissionAmount = sd.SDCommissionAmount;
var sdOrderAmount = sd.SDOrderAmount;
var deliveryExpressFreight = sd.DeliveryExpressFreight; var deliveryExpressFreight = sd.DeliveryExpressFreight;
var sdType = sd.SDType; var sdType = sd.SDType;
var flag = sd.Flag; var flag = sd.Flag;
@ -602,6 +603,7 @@ namespace BBWY.Client.ViewModels
Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId, Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId,
isSetStorageType, isSetStorageType,
sdCommissionAmount, sdCommissionAmount,
sdOrderAmount,
deliveryExpressFreight, deliveryExpressFreight,
sdType.Value, sdType.Value,
sdKey, sdKey,
@ -660,7 +662,7 @@ namespace BBWY.Client.ViewModels
} }
else if (order.StorageType == StorageType.SD) else if (order.StorageType == StorageType.SD)
{ {
var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.DeliveryExpressFreight, order.SDType ?? SDType.自刷); var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.SDOrderAmount, order.OrderCost.DeliveryExpressFreight, order.SDType ?? SDType.自刷);
sd.Closed += Sd_Closed; sd.Closed += Sd_Closed;
sd.ShowDialog(); sd.ShowDialog();
} }

2
BBWY.Client/Views/MainWindow.xaml
View File

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10044" Margin="5,0,0,0"/> <TextBlock Text="v10045" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

11
BBWY.Client/Views/Order/OrderListControl.xaml
View File

@ -83,7 +83,7 @@
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}" <c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding Id}" Margin="5,0,0,0"/> CommandParameter="{Binding Id}" Margin="5,0,0,0"/>
<c:BButton Content="{Binding OrderState}" Margin="5,0,0,0" Height="25" Padding="5,0" Background="{StaticResource Text.Link.Color}"/> <c:BButton x:Name="btn_orderState" Content="{Binding OrderState}" Margin="5,0,0,0" Height="25" Padding="5,0" Background="{StaticResource Text.Link.Color}"/>
<Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/> <Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
<c:BButton x:Name="btn_decodeCommand" Content="解密收货信息" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <c:BButton x:Name="btn_decodeCommand" Content="解密收货信息" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding DataContext.DecodeConsigneeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.DecodeConsigneeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
@ -773,7 +773,7 @@
</TextBlock> </TextBlock>
<TextBlock x:Name="txt_sdCommissionAmount"> <TextBlock x:Name="txt_sdCommissionAmount">
<Run Text="{Binding SDType,Converter={StaticResource objConverter},ConverterParameter=自刷:空单号/刷单号:SD佣金}"/> <Run Text="SD佣金"/>
<Run Text="{Binding OrderCost.SDCommissionAmount}"/> <Run Text="{Binding OrderCost.SDCommissionAmount}"/>
</TextBlock> </TextBlock>
@ -907,12 +907,15 @@
<DataTrigger Binding="{Binding OrderCost.SDCommissionAmount}" Value="0"> <DataTrigger Binding="{Binding OrderCost.SDCommissionAmount}" Value="0">
<Setter TargetName="txt_sdCommissionAmount" Property="Visibility" Value="Collapsed"/> <Setter TargetName="txt_sdCommissionAmount" Property="Visibility" Value="Collapsed"/>
</DataTrigger> </DataTrigger>
<!--<DataTrigger Binding="{Binding StorageType}" Value="SD"> <DataTrigger Binding="{Binding StorageType}" Value="SD">
<Setter TargetName="sp_purchaseAmount" Property="Visibility" Value="Collapsed"/> <Setter TargetName="sp_purchaseAmount" Property="Visibility" Value="Collapsed"/>
</DataTrigger>--> </DataTrigger>
<DataTrigger Binding="{Binding StorageType}" Value="代发"> <DataTrigger Binding="{Binding StorageType}" Value="代发">
<Setter TargetName="listbox_df" Property="Visibility" Value="Visible"/> <Setter TargetName="listbox_df" Property="Visibility" Value="Visible"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding OrderState}" Value="已取消">
<Setter TargetName="btn_orderState" Property="Background" Value="#EC808D"/>
</DataTrigger>
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding StorageType}" Value="代发"/> <Condition Binding="{Binding StorageType}" Value="代发"/>

32
BBWY.Client/Views/Order/SD.xaml
View File

@ -47,6 +47,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -61,26 +62,29 @@
<TextBlock Text="关键词" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/> <TextBlock Text="关键词" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/>
<c:BTextBox x:Name="txt_SDKey" Grid.Column="1" Grid.Row="1" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/> <c:BTextBox x:Name="txt_SDKey" Grid.Column="1" Grid.Row="1" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
<TextBlock x:Name="lblSDCommissionAmount" Text="佣金" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/> <TextBlock x:Name="lblSDOrderAmount" Text="刷单号费" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="2"/>
<c:BTextBox x:Name="txtSDCommissionAmount" Grid.Column="1" Grid.Row="2" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/> <c:BTextBox x:Name="txtSDOrderAmount" Grid.Column="1" Grid.Row="2" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
<TextBlock x:Name="lblSDCommissionAmount" Text="佣金" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="3"/>
<c:BTextBox x:Name="txtSDCommissionAmount" Grid.Column="1" Grid.Row="3" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
<TextBlock Text="邮费" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="3"/> <TextBlock Text="邮费" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="4"/>
<c:BTextBox x:Name="txtDeliveryExpressFreight" Grid.Column="1" Grid.Row="3" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/> <c:BTextBox x:Name="txtDeliveryExpressFreight" Grid.Column="1" Grid.Row="4" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
<TextBlock Text="付款渠道" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="4"/> <TextBlock Text="付款渠道" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="5"/>
<ComboBox x:Name="cbx_SDPayChannel" Grid.Column="1" Grid.Row="4" ItemsSource="{Binding Source={StaticResource PayBillTypeProvider}}" <ComboBox x:Name="cbx_SDPayChannel" Grid.Column="1" Grid.Row="5" ItemsSource="{Binding Source={StaticResource PayBillTypeProvider}}"
Height="25" Width="100" Height="25" Width="100"
SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/> SelectedIndex="0" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
<TextBlock Text="交易账单号" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="5"/> <TextBlock Text="交易账单号" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="6"/>
<c:BTextBox x:Name="txt_SDPayBillNo" Grid.Column="1" Grid.Row="5" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/> <c:BTextBox x:Name="txt_SDPayBillNo" Grid.Column="1" Grid.Row="6" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
<TextBlock Text="刷单人" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="6"/> <TextBlock Text="刷单人" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="7"/>
<c:BTextBox x:Name="txt_SDOperator" Grid.Column="1" Grid.Row="6" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0" <c:BTextBox x:Name="txt_SDOperator" Grid.Column="1" Grid.Row="7" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"
IsEnabled="False" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/> IsEnabled="False" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
<TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="7"/> <TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="8"/>
<ComboBox x:Name="cbx_flag" Grid.Column="1" Grid.Row="7" Height="25" Width="100" <ComboBox x:Name="cbx_flag" Grid.Column="1" Grid.Row="8" Height="25" Width="100"
HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"
SelectedIndex="0" FocusVisualStyle="{x:Null}"> SelectedIndex="0" FocusVisualStyle="{x:Null}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
@ -92,8 +96,8 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock Text="商家备注" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="8"/> <TextBlock Text="商家备注" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="9"/>
<c:BTextBox x:Name="txtVenderRemark" Grid.Column="1" Grid.Row="8" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/> <c:BTextBox x:Name="txtVenderRemark" Grid.Column="1" Grid.Row="9" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
</Grid> </Grid>
<c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0" <c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0"

23
BBWY.Client/Views/Order/SD.xaml.cs
View File

@ -18,6 +18,8 @@ namespace BBWY.Client.Views.Order
public decimal SDCommissionAmount { get; private set; } public decimal SDCommissionAmount { get; private set; }
public decimal SDOrderAmount { get; private set; }
public decimal DeliveryExpressFreight { get; private set; } public decimal DeliveryExpressFreight { get; private set; }
public SDType? SDType { get; private set; } public SDType? SDType { get; private set; }
@ -34,7 +36,18 @@ namespace BBWY.Client.Views.Order
public string SdOperator { get; set; } public string SdOperator { get; set; }
public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator, decimal sdCommissionAmount, decimal deliveryExpressFreight, SDType sDType = Models.SDType.自刷) public SD(string orderId,
bool isSetStorageType,
string venderRemark,
string flag,
string sdKey,
PayBillType? payChannel,
string sdPayBillNo,
string sdOperator,
decimal sdCommissionAmount,
decimal sdOrderAmount,
decimal deliveryExpressFreight,
SDType sDType = Models.SDType.自刷)
{ {
InitializeComponent(); InitializeComponent();
this.OrderId = orderId; this.OrderId = orderId;
@ -46,6 +59,7 @@ namespace BBWY.Client.Views.Order
this.SdPayBillNo = sdPayBillNo; this.SdPayBillNo = sdPayBillNo;
this.SdOperator = sdOperator; this.SdOperator = sdOperator;
this.SDCommissionAmount = sdCommissionAmount; this.SDCommissionAmount = sdCommissionAmount;
this.SDOrderAmount = sdOrderAmount;
this.DeliveryExpressFreight = deliveryExpressFreight; this.DeliveryExpressFreight = deliveryExpressFreight;
this.SDType = sDType; this.SDType = sDType;
} }
@ -73,6 +87,7 @@ namespace BBWY.Client.Views.Order
this.txt_SDOperator.Text = SdOperator; this.txt_SDOperator.Text = SdOperator;
this.txtDeliveryExpressFreight.Text = DeliveryExpressFreight.ToString(); this.txtDeliveryExpressFreight.Text = DeliveryExpressFreight.ToString();
this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString(); this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString();
this.txtSDOrderAmount.Text = SDOrderAmount.ToString();
//lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金"; //lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
} }
@ -84,9 +99,11 @@ namespace BBWY.Client.Views.Order
MessageBox.Show("商家备注必填", "提示"); MessageBox.Show("商家备注必填", "提示");
return; return;
} }
decimal.TryParse(txtSDCommissionAmount.Text, out decimal sdCommissionAmountd); decimal.TryParse(txtSDCommissionAmount.Text, out decimal sdCommissionAmount);
decimal.TryParse(txtDeliveryExpressFreight.Text, out decimal deliveryExpressFreight); decimal.TryParse(txtDeliveryExpressFreight.Text, out decimal deliveryExpressFreight);
SDCommissionAmount = sdCommissionAmountd; decimal.TryParse(txtSDOrderAmount.Text, out decimal sdOrderAmount);
SDCommissionAmount = sdCommissionAmount;
SDOrderAmount = sdOrderAmount;
DeliveryExpressFreight = deliveryExpressFreight; DeliveryExpressFreight = deliveryExpressFreight;
Flag = (cbx_flag.SelectedItem as KVModel).Value; Flag = (cbx_flag.SelectedItem as KVModel).Value;
SDType = (SDType)cbx_sdType.SelectedItem; SDType = (SDType)cbx_sdType.SelectedItem;

Write Preview
Loading…
Cancel
Save