1

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -172,7 +172,7 @@ namespace BBWY.Client.ViewModels
             OrderList = new ObservableCollection<Order>();
             AfterSaleOrderList = new ObservableCollection<AfterSaleOrder>();
             EndDate = DateTime.Now;
-            StartDate = DateTime.Now.Date.AddDays(-6);
+            StartDate = DateTime.Now.Date;
             ToDayOrderAchievement = new ToDayOrderAchievement();
             InitSearchParam();
 
@@ -235,7 +235,7 @@ namespace BBWY.Client.ViewModels
             if (isInitDate)
             {
                 EndDate = DateTime.Now;
-                StartDate = DateTime.Now.Date.AddDays(-6);
+                StartDate = DateTime.Now.Date;
             }
             PageIndex = 1;
             IncludeAfterOrder = null;

BBWY.Client/Views/Order/OrderList.xaml

@@ -134,7 +134,7 @@
             </Grid>
 
             <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal">
-                <c:BButton Content="近一周订单" Width="100"
+                <c:BButton Content="全部订单" Width="100"
                            Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}"
                            Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
                     <c:BButton.Background>

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -322,7 +322,13 @@ namespace BBWY.Server.Business
                 order.InStorageAmount = statistics?.InStorageAmount ?? 0M;
                 order.OutStorageAmount = statistics?.OutStorageAmount ?? 0M;
                 if (order.StorageType == Enums.StorageType.代发)
-                    order.PurchaseOrderIds = string.Join("|", orderDropShippingList.Where(ods => ods.OrderId == order.OrderId).Select(ods => ods.PurchaseOrderId));
+                {
+                    var pids = orderDropShippingList.Where(ods => ods.OrderId == order.OrderId).Select(ods => ods.PurchaseOrderId).ToList();
+                    if (pids.Count() > 1)
+                        order.PurchaseOrderIds = string.Join("|", pids);
+                    else if (pids.Count() == 1)
+                        order.PurchaseOrderIds = $"'{pids[0]}";
+                }
             }
             return orderSourceList;