From 8e460681b311c2e54c97523fa6a1d537b2c8146b Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 2 Aug 2023 19:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sku=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Order/OrderBusiness.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 1f6cb950..0a3a5e04 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -1113,13 +1113,14 @@ namespace BBWY.Server.Business var select = fsql.Select() .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; }