From 282a24f3a5b5eb19bad6f172bb761c2905c867c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Fri, 22 Jan 2021 09:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ProductOrderController.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs index b41ff6b..9394e76 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs @@ -326,14 +326,23 @@ namespace Hncore.Pass.Vpn.Controllers [HttpGet] public async Task Export([FromQuery]OrderQueryRequest request) { - Expression> expr = m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete) && m.OrderType != OrderType.Refund; + Expression> expr = m =>( m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete) && m.OrderType != OrderType.Refund; if (request.KeyWord.Has()) - { + { expr = expr.And(m => - m.OrderName.Contains(request.KeyWord) - || m.OrderNo.Contains(request.KeyWord) - || m.UserName.Contains(request.KeyWord) - || m.PackageName.Contains(request.KeyWord)); + m.ProductName.Contains(request.KeyWord) + ||m.Accounts.Contains(request.KeyWord) + ||m.OrderNo.Contains(request.KeyWord) + ||m.UserName.Contains(request.KeyWord) + ||m.PackageName.Contains(request.KeyWord)); + } + if (request.ProductIds != null && request.ProductIds.Count > 0) + { + expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId)); + } + if (request.PackageNames != null && request.PackageNames.Count > 0) + { + expr = expr.And(m =>request.PackageNames.Contains((string)m.PackageName)); } if (request.OrderTypes != null && request.OrderTypes.Count > 0) { @@ -369,6 +378,7 @@ namespace Hncore.Pass.Vpn.Controllers new ExcelTitle { Property = "PaymentAmount", Title = "实付" }, new ExcelTitle { Property = "PayType", Title = "付款方式" , Format=(val)=>((PayType)val).GetEnumDisplayName() }, new ExcelTitle { Property = "TradeNo", Title = "支付流水号" }, + new ExcelTitle { Property = "Remark", Title = "备注" }, }; var fileBytes = ExcelHelper.ExportListToExcel(data, title);