订单sku查询条件调整

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1112,7 +1112,7 @@ namespace BBWY.Server.Business
         {
             var select = fsql.Select<OrderSku, Order, OrderCostDetail, PurchaseOrder, Product>()
                               .InnerJoin((osku, o, ocd, po, p) => osku.OrderId == o.Id)
-                              .InnerJoin((osku, o, ocd, po, p) => osku.OrderId == ocd.OrderId && osku.SkuId == ocd.SkuId)
+                              .LeftJoin((osku, o, ocd, po, p) => osku.OrderId == ocd.OrderId && osku.SkuId == ocd.SkuId)
                               .LeftJoin((osku, o, ocd, po, p) => ocd.PurchaseOrderPKId == po.Id)
                               .LeftJoin((osku, o, ocd, po, p) => osku.ProductId == p.Id)
                               .WhereIf(request.ShopIds != null && request.ShopIds.Count() > 0, (osku, o, ocd, po, p) => request.ShopIds.Contains(o.ShopId))
@@ -1120,7 +1120,8 @@ namespace BBWY.Server.Business
                               .Where((osku, o, ocd, po, p) => o.StartTime >= request.StartTime &&
                                                               o.StartTime <= request.EndTime &&
                                                               o.OrderState != Enums.OrderState.已取消 &&
-                                                              o.IsGift == false)
+                                                              o.IsGift == false &&
+                                                              osku.Price > 0)
                               .OrderByDescending((osku, o, ocd, po, p) => o.StartTime);
             return select;
         }