1

BBWY.Client/APIServices/OrderService.cs

@@ -20,6 +20,7 @@ namespace BBWY.Client.APIServices
                                                            DateTime endDate,
                                                            OrderState? orderState,
                                                            string sku,
+                                                           string productId,
                                                            string productNo,
                                                            string waybill,
                                                            string contactName,
@@ -41,6 +42,7 @@ namespace BBWY.Client.APIServices
                 pageSize,
                 shopId,
                 sku,
+                productId,
                 productNo,
                 waybill,
                 contactName,

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -35,6 +35,7 @@ namespace BBWY.Client.ViewModels
         private int orderCount;
         private OrderState? orderState;
         private string searchSku;
+        private string searchProductId;
         private string searchProductNo;
         private string searchContactName;
         private string searchWaybill;
@@ -64,6 +65,7 @@ namespace BBWY.Client.ViewModels
         public OrderState? OrderState { get => orderState; private set { Set(ref orderState, value); } }
 
         public string SearchSku { get => searchSku; set { Set(ref searchSku, value); } }
+        public string SearchProductId { get => searchProductId; set { Set(ref searchProductId, value); } }
         public string SearchProductNo { get => searchProductNo; set { Set(ref searchProductNo, value); } }
         public string SearchContactName { get => searchContactName; set { Set(ref searchContactName, value); } }
         public string SearchWaybill { get => searchWaybill; set { Set(ref searchWaybill, value); } }
@@ -169,11 +171,12 @@ namespace BBWY.Client.ViewModels
         private void InitSearchParam()
         {
             this.OrderState = null;
-            SearchOrderId = String.Empty;
+            SearchOrderId = string.Empty;
-            SearchContactName = String.Empty;
+            SearchContactName = string.Empty;
-            SearchProductNo = String.Empty;
+            SearchProductNo = string.Empty;
-            SearchSku = String.Empty;
+            SearchSku = string.Empty;
-            SearchWaybill = String.Empty;
+            SearchProductId = string.Empty;
+            SearchWaybill = string.Empty;
             EndDate = DateTime.Now;
             StartDate = DateTime.Now.Date.AddDays(-6);
             PageIndex = 1;
@@ -252,6 +255,7 @@ namespace BBWY.Client.ViewModels
                                                      EndDate,
                                                      OrderState,
                                                      SearchSku,
+                                                     SearchProductId,
                                                      SearchProductNo,
                                                      SearchWaybill,
                                                      SearchContactName,

BBWY.Client/Views/Order/OrderList.xaml

@@ -152,8 +152,8 @@
                     <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
                                Command="{Binding SetSearchDateCommand}"
                                CommandParameter="{StaticResource d30}"/>
-                    <TextBlock Text="采购单" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="false" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
                     <TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0"/>
                     <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配"/>
                     <TextBlock Text="客户姓名" VerticalAlignment="Center" Margin="5,0,0,0"/>

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -76,11 +76,12 @@ namespace BBWY.Server.Business
             }
             else
             {
-                if (!string.IsNullOrEmpty(searchOrderRequest.Sku) || !string.IsNullOrEmpty(searchOrderRequest.ProductNo))
+                if (!string.IsNullOrEmpty(searchOrderRequest.Sku) || !string.IsNullOrEmpty(searchOrderRequest.ProductNo) || !string.IsNullOrEmpty(searchOrderRequest.ProductId))
                 {
                     var childSelect = fsql.Select<OrderSku>().As("osku")
-                                          .WhereIf(string.IsNullOrEmpty(searchOrderRequest.Sku) == false, osku => osku.SkuId == searchOrderRequest.Sku)
+                                          .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.Sku), osku => osku.SkuId == searchOrderRequest.Sku)
-                                          .WhereIf(string.IsNullOrEmpty(searchOrderRequest.ProductNo) == false, osku => osku.ProductNo == searchOrderRequest.ProductNo);
+                                          .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.ProductId), osku => osku.ProductId == searchOrderRequest.ProductId)
+                                          .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.ProductNo), osku => osku.ProductNo == searchOrderRequest.ProductNo);
                     select = select.Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any());
                 }
 
@@ -1051,6 +1052,8 @@ namespace BBWY.Server.Business
             //退款之后平台扣点
             dbOrderCost.PlatformCommissionAmount = (dbOrder.OrderSellerPrice - dbOrderCost.RefundAmount) * (dbOrderCost?.PlatformCommissionRatio ?? 0.05M);
 
+
+
             //订单利润
             dbOrderCost.Profit = dbOrder.OrderSellerPrice + dbOrder.FreightPrice - dbOrderCost.RefundAmount -
                                  (dbOrderCost.PurchaseAmount - dbOrderCost.RefundPurchaseAmount) -

BBWY.Server.Business/Statistics/StatisticsBusiness.cs

@@ -26,7 +26,7 @@ namespace BBWY.Server.Business
             var response = fsql.Select<Order, OrderCost>().LeftJoin((o, oc) => o.Id == oc.OrderId)
                                                           .Where((o, oc) => o.ShopId == request.ShopId &&
                                                                             o.OrderState != null &&
-                                                                            !invalidOrderStateList.Contains(o.OrderState.Value) &&
+                                                                            !invalidOrderStateList.Contains(o.OrderState.Value) &&  //排除待付款和取消
                                                                             o.StartTime >= request.StartTime &&
                                                                             o.StartTime <= request.EndTime)
                                                          .ToAggregate((o, oc) => new OrderAchievementResponse()

BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs

@@ -26,6 +26,11 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public string Waybill { get; set; }
 
+        /// <summary>
+        /// SPU
+        /// </summary>
+        public string ProductId { get; set; }
+
         public string Sku { get; set; }
 
         /// <summary>