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

1

updatebug
shanji 2 years ago
parent
c3d9a2368e
commit
1db96ce73b
4 changed files with 99 additions and 35 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
      BBWYB.Client/App.xaml.cs
  2. 37
      BBWYB.Client/Models/Order/Order.cs
  3. 40
      BBWYB.Client/ViewModels/Order/OrderViewModel.cs
  4. 51
      BBWYB.Client/Views/Order/OrderList.xaml

6
BBWYB.Client/App.xaml.cs
View File

@ -79,17 +79,17 @@ namespace BBWYB.Client
private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
{
throw new NotImplementedException();
}
private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
throw new NotImplementedException();
}
private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{
throw new NotImplementedException();
}
public (bool isOk, string content) ReadMMF()

37
BBWYB.Client/Models/Order/Order.cs
View File

@ -113,6 +113,30 @@ namespace BBWYB.Client.Models
public string VenderRemark { get => venderRemark; set { SetProperty(ref venderRemark, value); } }
/// <summary>
/// 快递公司名称
/// </summary>
public string ExpressName { get; set; }
/// <summary>
/// 来源Sku
/// </summary>
public string SourceSku { get; set; }
/// <summary>
/// 来源店铺名
/// </summary>
public string SourceShopName { get; set; }
/// <summary>
/// 业务端订单号
/// </summary>
public string ClientOrderId { get; set; }
/// <summary>
/// 是否采购
/// </summary>
public bool IsPurchased { get; set; }
/// <summary>
/// 收货人信息
@ -136,8 +160,19 @@ namespace BBWYB.Client.Models
/// </summary>
public IList<OrderCostDetailGroup> OrderCostDetailGroupList { get; set; }
/// <summary>
/// 是否为异常订单
/// </summary>
public bool IsCostException
{
get
{
var totalCost = OrderCost?.TotalCost ?? 0M;
return OrderState != OrderState.已取消 &&
totalCost > ActualAmount;
}
}
public void LocalConvert()
{
ConvertOrderCostDetailToGroup();

40
BBWYB.Client/ViewModels/Order/OrderViewModel.cs
View File

@ -72,11 +72,13 @@ namespace BBWYB.Client.ViewModels
{
Task.Factory.StartNew(() => LoadOrder(p.PageIndex));
});
PageIndex = 1;
PageSize = 10;
EndDate = DateTime.Now;
StartDate = DateTime.Now.Date;
this.globalContext = globalContext;
this.orderService = orderService;
Task.Factory.StartNew(() => LoadOrder(1));
}
private void LoadOrder(int pageIndex)
@ -94,9 +96,41 @@ namespace BBWYB.Client.ViewModels
});
}
IsLoading = false;
OrderCount = response.Data.Count;
if (response.Data.Items == null || response.Data.Items.Count() == 0)
return;
//OrderCount = response.Data.Count;
//if (response.Data.Items == null || response.Data.Items.Count() == 0)
// return;
response.Data.Items = new List<OrderResponse>()
{
new OrderResponse()
{
Id = "3213213121",
StartTime = DateTime.Now,
OrderState = Models.OrderState.等待采购,
OrderSellerPrice=100,
OrderCost = new OrderCostResponse(){
DeliveryExpressFreight=50,
Profit=100,
TotalCost=120,
PurchaseAmount=150
},
BuyerRemark="12312fffff",
Consignee = new ConsigneeResponse(){
Mobile="18996038927",
Province="重庆",
ContactName="山鸡"
},
ItemList = new List<OrderSkuResponse>(){
new OrderSkuResponse(){
ItemTotal=2,
Logo="https://img13.360buyimg.com/n9/s80x80_jfs/t1/87954/9/35896/95921/6431716fFa3d09cae/e1f687d25af0ddf1.jpg",
Price=15,
ProductId="10023985258330",
SkuId="10072665703169", Title="特大绿色托盘熊50CM"
}
}
}
};
var list = response.Data.Items.Map<IList<Order>>();
App.Current.Dispatcher.Invoke(() =>

51
BBWYB.Client/Views/Order/OrderList.xaml
View File

@ -438,9 +438,9 @@
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="SKU:"/>
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding Id}"
CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/>
</StackPanel>
</StackPanel>
@ -454,15 +454,15 @@
</ListBox.ItemTemplate>
</ListBox>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="1" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="4" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="5" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="6" HorizontalAlignment="Right"/>
<Border x:Name="bd_costbg" Background="#FCECEE" Grid.Column="3"
Visibility="{Binding IsCostException,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}" Margin="0,0,1,0"/>
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,10">
<Border x:Name="bd_costbg" Background="#FCECEE" Grid.Column="2" Margin="0,0,1,0"
Visibility="{Binding IsCostException,ConverterParameter=true:Visible:Collapsed}"/>
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,10">
<StackPanel Orientation="Horizontal">
<TextBlock>
<Run Text="实收金额"/>
@ -704,19 +704,18 @@
<Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
</TextBlock>
</StackPanel>
<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" VerticalAlignment="Bottom" Margin="0,0,0,23"
<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="2" VerticalAlignment="Bottom" Margin="0,0,0,23"
Visibility="{Binding Visibility,ElementName=btn_editCost}"/>
<c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="3" VerticalAlignment="Bottom"
Foreground="{StaticResource Text.Color}"
HorizontalAlignment="Stretch"
Background="White"
Margin="0,0,1,0"
Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }"
Visibility="{Binding StorageType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
Height="23"/>
<StackPanel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="2" VerticalAlignment="Bottom"
Foreground="{StaticResource Text.Color}"
HorizontalAlignment="Stretch"
Background="White"
Margin="0,0,1,0"
Command="{Binding DataContext.EditCostCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }"
Height="23"/>
<StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock>
<Run Text="毛利"/>
<Run Text="{Binding OrderCost.Profit}"/>
@ -734,23 +733,19 @@
</TextBlock>
<TextBlock>
<Run Text="成本毛利率"/>
<Run Text="{Binding OrderCost.ProfitRatio,StringFormat=\{0\}%}"/>
<Run Text="{Binding OrderCost.ProfitRatio,Mode=OneWay,StringFormat=\{0\}%}"/>
</TextBlock>
</StackPanel>
<Border Background="{StaticResource Border.Background}" Margin="0,0,1,0"
Grid.Column="4"
Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
<Grid x:Name="sp_store" Grid.Column="5">
<Grid x:Name="sp_store" Grid.Column="4">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock x:Name="txt_storeName"
Text="{Binding StoreName}"
Text="{Binding ExpressName}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
Visibility="{Binding StoreName,Converter={StaticResource objConverter},ConverterParameter=#null|0:Collapsed:Visible}"/>
Visibility="{Binding ExpressName,Converter={StaticResource objConverter},ConverterParameter=#null|0:Collapsed:Visible}"/>
<StackPanel x:Name="sp_waybill" Orientation="Horizontal">
<TextBlock Text="{Binding WaybillNo,Converter={StaticResource waybillConverter}}"/>
<TextBlock Text="{Binding WaybillNo}"/>
<c:BButton x:Name="btn_waybillCopy" Style="{StaticResource LinkButton}"
Content="复制"
Command="{Binding DataContext.CopyOrderWaybillCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
@ -770,7 +765,7 @@
Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
</Grid>
<StackPanel Orientation="Vertical" Grid.Column="6" Margin="5,5,5,0">
<StackPanel Orientation="Vertical" Grid.Column="5" Margin="5,5,5,0">
<StackPanel x:Name="sp_buyerRemark">
<StackPanel Orientation="Horizontal">
<TextBlock Text="买家备注"/>

Write Preview
Loading…
Cancel
Save