diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs
index 8e0fa244..f8c1c229 100644
--- a/BBWY.Client/APIServices/OrderService.cs
+++ b/BBWY.Client/APIServices/OrderService.cs
@@ -261,5 +261,18 @@ namespace BBWY.Client.APIServices
excludeCanceled
}, null, HttpMethod.Post);
}
+
+ public ApiResponse<OrderResponse> SDGroupPullOrder(string orderId, Shop shop)
+ {
+ return SendRequest<OrderResponse>(globalContext.BBYWApiHost, "Api/Order/SDGroupPullOrder", new
+ {
+ orderId,
+ shop.ShopId,
+ shop.Platform,
+ shop.AppKey,
+ shop.AppSecret,
+ shop.AppToken
+ }, null, HttpMethod.Post);
+ }
}
}
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index 52faa95f..c1b419d7 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -218,7 +218,7 @@ namespace BBWY.Client.Models
return OrderState != OrderState.已取消 && StorageType != Models.StorageType.SD &&
((StorageType != null && beforeTotalCost == 0M) ||
(beforeTotalCost > OrderSellerPrice + FreightPrice) ||
- (StorageType == null && OrderState != OrderState.等待采购));
+ (StorageType == null && OrderState != OrderState.等待采购 && OrderState != OrderState.待付款));
}
}
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
index 5a10a6b3..4da49774 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
@@ -1,7 +1,9 @@
using BBWY.Client.Models;
using BBWY.Client.Views.SelectShop;
+using BBWY.Common.Extensions;
using GalaSoft.MvvmLight.Command;
-using System;
+using System.Threading.Tasks;
+using System.Windows;
using System.Windows.Input;
namespace BBWY.Client.ViewModels
@@ -16,6 +18,8 @@ namespace BBWY.Client.ViewModels
public ICommand SetSDButtinIndexCommand { get; set; }
public ICommand SDGroupSelectedShopChangedCommand { get; set; }
+ public ICommand SDGroupPullCommand { get; set; }
+
public Shop SdGroupSelectedShop { get => sdGroupSelectedShop; set { Set(ref sdGroupSelectedShop, value); } }
@@ -23,6 +27,7 @@ namespace BBWY.Client.ViewModels
{
SetSDButtinIndexCommand = new RelayCommand<int>(SetSDButtinIndex);
SDGroupSelectedShopChangedCommand = new RelayCommand<OnShopChangedEventArgs>(SDGroupSelectedShopChanged);
+ SDGroupPullCommand = new RelayCommand(SDGroupPull);
}
private void SetSDButtinIndex(int index)
@@ -35,6 +40,32 @@ namespace BBWY.Client.ViewModels
this.SdGroupSelectedShop = args.SelectedShop;
}
-
+ private void SDGroupPull()
+ {
+ if (string.IsNullOrEmpty(SearchOrderId) || this.SdGroupSelectedShop == null)
+ {
+ MessageBox.Show("拉取条件不齐全", "提示");
+ return;
+ }
+ IsLoading = true;
+ Task.Factory.StartNew(() => orderService.SDGroupPullOrder(SearchOrderId, SdGroupSelectedShop)).ContinueWith(t =>
+ {
+ IsLoading = false;
+ var response = t.Result;
+ if (!response.Success)
+ {
+ App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "拉取订单"));
+ return;
+ }
+ PageIndex = 1;
+ OrderCount = 1;
+ var order = response.Data.Map<Order>();
+ App.Current.Dispatcher.Invoke(() =>
+ {
+ OrderList.Clear();
+ OrderList.Add(order);
+ });
+ });
+ }
}
}
diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml
index 14e27b59..f22a564c 100644
--- a/BBWY.Client/Views/Order/OrderListControl.xaml
+++ b/BBWY.Client/Views/Order/OrderListControl.xaml
@@ -38,7 +38,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
- <ColumnDefinition/>
+ <!--<ColumnDefinition/>-->
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
@@ -47,8 +47,8 @@
<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 Text="订单状态" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
- <TextBlock Text="备注信息" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+ <!--<TextBlock Text="订单状态" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>-->
+ <TextBlock Text="备注信息" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@@ -56,7 +56,7 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
- <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+ <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>-->
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
</Grid>
</Border>
@@ -83,6 +83,7 @@
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
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}"/>
<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"
Command="{Binding DataContext.DecodeConsigneeCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
@@ -106,7 +107,7 @@
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
- <ColumnDefinition/>
+ <!--<ColumnDefinition/>-->
<ColumnDefinition/>
</Grid.ColumnDefinitions>
@@ -289,6 +290,9 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
+ <Border Background="{StaticResource Border.Background}"
+ Grid.Column="2"
+ Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed}"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" HorizontalAlignment="Right"/>
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right"/>
@@ -800,7 +804,10 @@
<Run Text="{Binding OrderCost.ProfitRatio,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}"/>
<Grid x:Name="sp_store" Grid.Column="5">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
@@ -832,11 +839,11 @@
- <TextBlock Text="{Binding OrderState}" Grid.Column="6"
+ <!--<TextBlock Text="{Binding OrderState}" Grid.Column="6"
HorizontalAlignment="Center"
- VerticalAlignment="Center"/>
+ VerticalAlignment="Center"/>-->
- <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
+ <StackPanel Orientation="Vertical" Grid.Column="6" Margin="5,5,5,0">
<StackPanel x:Name="sp_buyerRemark">
<StackPanel Orientation="Horizontal">
<TextBlock Text="买家备注"/>
diff --git a/BBWY.Client/Views/Order/SDGroup.xaml b/BBWY.Client/Views/Order/SDGroup.xaml
index cd53353b..4a6e4a1b 100644
--- a/BBWY.Client/Views/Order/SDGroup.xaml
+++ b/BBWY.Client/Views/Order/SDGroup.xaml
@@ -131,6 +131,19 @@
</Grid>
<local:OrderListControl Grid.Row="4"/>
+
+ <c:PageControl PageIndex="{Binding PageIndex}"
+ PageSize="{Binding PageSize}"
+ RecordCount="{Binding OrderCount}"
+ Grid.Row="5"
+ HorizontalAlignment="Left">
+ <b:Interaction.Triggers>
+ <b:EventTrigger EventName="OnPageIndexChanged">
+ <b:InvokeCommandAction Command="{Binding OrderPageIndexChangedCommand}" PassEventArgsToCommand="True"/>
+ </b:EventTrigger>
+ </b:Interaction.Triggers>
+ </c:PageControl>
+
</Grid>
</Grid>
</Page>