|
|
@ -134,7 +134,8 @@ namespace BBWYB.Server.Business |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 最近采购的店铺商品
|
|
|
|
var recent30d = DateTime.Now.AddDays(-90); |
|
|
|
var recentStartDay = DateTime.Now.Date.AddDays(-90); |
|
|
|
var recentEndDay = DateTime.Now.Date; |
|
|
|
var bePurchasedProductSkuList = fsql.Select<OrderPurchaseInfo, OrderPurchaseRelationInfo, Order, ProductSku>() |
|
|
|
.InnerJoin((opi, opri, o, ps) => opi.OrderId == o.Id) |
|
|
|
.InnerJoin((opi, opri, o, ps) => opri.PurchaseOrderId == opi.PurchaseOrderId) |
|
|
@ -142,7 +143,8 @@ namespace BBWYB.Server.Business |
|
|
|
.WhereIf(request.ShopId != null && request.ShopId > 0, (opi, opri, o, ps) => o.ShopId == request.ShopId) |
|
|
|
.Where((opi, opri, o, ps) => o.OrderState != Enums.OrderState.已取消 && |
|
|
|
opi.IsEnabled == true && |
|
|
|
opi.CreateTime >= recent30d && |
|
|
|
opi.CreateTime >= recentStartDay && |
|
|
|
opi.CreateTime < recentEndDay && |
|
|
|
purchaserIdList.Contains(opi.PurchaserId)) |
|
|
|
.GroupBy((opi, opri, o, ps) => new |
|
|
|
{ |
|
|
|