From 9dc850f9e4234216143b0216fe5a5b61a44b66d1 Mon Sep 17 00:00:00 2001 From: wanyongkang <937888580@qq.com> Date: Thu, 3 Dec 2020 16:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=80=80=E6=AC=BE=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ProductController.cs | 16 ++++---- .../Controllers/ProductOrderController.cs | 38 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs index ea12b0a..12f66ef 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs @@ -142,14 +142,14 @@ namespace Hncore.Pass.Vpn.Controllers [HttpGet,AllowAnonymous] public async Task OpenPage([FromQuery]PageRequestBase request) { - Expression> expr = m => 1 == 1; - if (request.KeyWord.Has()) - { - expr = expr.And(m => m.Name.Contains(request.KeyWord)); - } - var ret = await m_ProductService.PageAsc(request.PageIndex, request.PageSize, expr, true,m=>m.Sort); - var data = ret.ToApiResult(); - return data; + // Expression> expr = m => 1 == 1; + // if (request.KeyWord.Has()) + // { + // expr = expr.And(m => m.Name.Contains(request.KeyWord)); + // } + // var ret = await m_ProductService.PageAsc(request.PageIndex, request.PageSize, expr, true,m=>m.Sort); + // var data = ret.ToApiResult(); + return null; } [HttpGet, AllowAnonymous] diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs index 1378b9f..ba31906 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs @@ -148,27 +148,27 @@ namespace Hncore.Pass.Vpn.Controllers [HttpGet,AllowAnonymous] public async Task OpenRefundOrders([FromQuery]RefundOrderQueryRequest request) { - Expression> expr = m => m.OrderType == OrderType.Refund; - if (request.KeyWord.Has()) - { - expr = expr.And(m => 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(m.ProductId)); - } + // Expression> expr = m => m.OrderType == OrderType.Refund; + // if (request.KeyWord.Has()) + // { + // expr = expr.And(m => 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(m.ProductId)); + // } - if (request.BTime.HasValue && request.ETime.HasValue) - { - expr = expr.And(m => m.UpdateTime > request.BTime && m.UpdateTime < request.ETime); - } + // if (request.BTime.HasValue && request.ETime.HasValue) + // { + // expr = expr.And(m => m.UpdateTime > request.BTime && m.UpdateTime < request.ETime); + // } - var ret = await m_ProductOrderService.PageDesc(request.PageIndex, request.PageSize, expr, true, m => m.Id); - var data = ret.ToApiResult(); - return data; + // var ret = await m_ProductOrderService.PageDesc(request.PageIndex, request.PageSize, expr, true, m => m.Id); + // var data = ret.ToApiResult(); + return null; }