From d44de8169aaa342640141dbd140c0ede17a012e7 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 15 Jan 2024 20:06:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95SKU?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A7=84=E5=88=99?= 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, 2 insertions(+), 3 deletions(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 709230e1..4b753c32 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -1241,7 +1241,7 @@ namespace BBWY.Server.Business var select = fsql.Select() .InnerJoin((osku, o, ocd, po, p) => osku.OrderId == o.Id) .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) => ocd.PurchaseOrderPKId == po.Id && ocd.IsEnabled == true) .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) @@ -1249,8 +1249,7 @@ namespace BBWY.Server.Business o.StartTime <= request.EndTime && o.OrderState != Enums.OrderState.已取消 && o.IsGift == false && - osku.Price > 0 && - ocd.IsEnabled == true) + osku.Price > 0) .OrderByDescending((osku, o, ocd, po, p) => o.StartTime); return select; }