修改订单SKU导出规则

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1241,7 +1241,7 @@ namespace BBWY.Server.Business
             var select = fsql.Select<OrderSku, Order, OrderCostDetail, PurchaseOrder, Product>()
                               .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 &&
+                                                              osku.Price > 0)
-                                                              ocd.IsEnabled == true)
                               .OrderByDescending((osku, o, ocd, po, p) => o.StartTime);
             return select;
         }