|
|
@ -1113,13 +1113,14 @@ 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) |
|
|
|
.InnerJoin((osku, o, ocd, po, p) => ocd.PurchaseOrderPKId == po.Id) |
|
|
|
.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)) |
|
|
|
.WhereIf(request.PurchasePlatform != null, (osku, o, ocd, po, p) => po.PurchasePlatform == request.PurchasePlatform) |
|
|
|
.Where((osku, o, ocd, po, p) => o.StartTime >= request.StartTime && |
|
|
|
o.StartTime <= request.EndTime && |
|
|
|
o.OrderState != Enums.OrderState.已取消) |
|
|
|
o.OrderState != Enums.OrderState.已取消 && |
|
|
|
o.IsGift == false) |
|
|
|
.OrderByDescending((osku, o, ocd, po, p) => o.StartTime); |
|
|
|
return select; |
|
|
|
} |
|
|
|