wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公共退款界面

Browse Source
This commit is contained in:
wanyongkang
2020-12-03 16:59:01 +08:00
parent 04dc3d687a
commit 9dc850f9e4
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
View File

@@ -142,14 +142,14 @@ namespace Hncore.Pass.Vpn.Controllers
[HttpGet,AllowAnonymous]
public async Task<ApiResult> OpenPage([FromQuery]PageRequestBase request)
{
Expression<Func<ProductEntity, bool>> 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<Func<ProductEntity, bool>> 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]

38
Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
View File

@@ -148,27 +148,27 @@ namespace Hncore.Pass.Vpn.Controllers
[HttpGet,AllowAnonymous]
public async Task<ApiResult> OpenRefundOrders([FromQuery]RefundOrderQueryRequest request)
{
Expression<Func<ProductOrderEntity, bool>> 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<Func<ProductOrderEntity, bool>> 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;
}