From 785af6ee957b6d5df33831454a9af0c7d7015155 Mon Sep 17 00:00:00 2001 From: wanyongkang <937888580@qq.com> Date: Mon, 19 Oct 2020 20:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=92=8C=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ProductOrderController.cs | 16 ++++++++-------- Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs | 13 ++++++++----- .../Service/ProductAccountService.cs | 4 ++-- .../Service/ProductOrderService.cs | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs index 4f8d088..4ea3d5e 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs @@ -82,7 +82,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + 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(); @@ -138,7 +138,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + 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(); @@ -163,7 +163,7 @@ namespace Hncore.Pass.Vpn.Controllers if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime > request.BTime && m.CreateTime < request.ETime); + 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); @@ -333,7 +333,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + expr = expr.And(m => m.UpdateTime >= request.BTime && m.UpdateTime <= request.ETime); } var ret = await m_ProductOrderService.PageDesc(request.PageIndex, 10000, expr, true,m=>m.Id); @@ -388,7 +388,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + expr = expr.And(m => m.UpdateTime >= request.BTime && m.UpdateTime <= request.ETime); } var ret = await m_ProductOrderService.Page(request.PageIndex, 10000, expr, true); @@ -458,7 +458,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + expr = expr.And(m => m.UpdateTime >= request.BTime && m.UpdateTime <= request.ETime); } var ret = await m_ProductOrderService.Page(request.PageIndex, 10000, expr, true); @@ -577,7 +577,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + expr = expr.And(m => m.UpdateTime >= request.BTime && m.UpdateTime <= request.ETime); } var ret = await this.m_ProductOrderService.PageDesc(request.PageIndex, request.PageSize, expr, true, m => m.Id); @@ -611,7 +611,7 @@ namespace Hncore.Pass.Vpn.Controllers } if (request.BTime.HasValue && request.ETime.HasValue) { - expr = expr.And(m => m.CreateTime >= request.BTime && m.CreateTime <= request.ETime); + expr = expr.And(m => m.UpdateTime >= request.BTime && m.UpdateTime <= request.ETime); } var ret = await this.m_ProductOrderService.PageDesc(request.PageIndex,10000, expr, true, m => m.Id); diff --git a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs index 56b6496..8d5dd7a 100644 --- a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs +++ b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs @@ -45,9 +45,13 @@ namespace Hncore.Pass.Vpn.Job var wxUserService = scope.ServiceProvider.GetService(); var userService = scope.ServiceProvider.GetService(); - var expireAccounts = await accountService.GetExpireingAccountsTime(); + var expireAccounts1 = await accountService.GetExpireingAccountsTime(1); + var expireAccounts0 = await accountService.GetExpireingAccountsTime(0); + var expireAccounts_1 = await accountService.GetExpireingAccountsTime(-1); - await Tip(expireAccounts, wxUserService, userService, "即将过期或已过期"); + await Tip(expireAccounts1, wxUserService, userService, "还有一天过期"); + await Tip(expireAccounts0, wxUserService, userService, "今天过期"); + await Tip(expireAccounts_1, wxUserService, userService, "已经过期一天"); } } @@ -98,13 +102,12 @@ namespace Hncore.Pass.Vpn.Job } } - var timeType = (account.EndTime - DateTime.Now).Value.ToString("dd"); var ret = false; if (userInfo != null && RegexPattern.IsMobile(userInfo.Phone)) { - if(timeType=="00"){ + if(tip=="今天过期"){ ret = AliSmsService.Send("SMS_199202299", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone); - } else if(timeType=="01"){ + } else if(tip=="还有一天过期"){ ret = AliSmsService.Send("SMS_199222107", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone); } else { ret = AliSmsService.Send("SMS_202820825", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone); diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs index 849c3d7..3f4a8f8 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs @@ -111,9 +111,9 @@ namespace Hncore.Pass.Vpn.Service } //主要是用来定时执行的 - public async Task> GetExpireingAccountsTime() + public async Task> GetExpireingAccountsTime(int day) { - var sql = $"select * from product_account where DATEDIFF(EndTime,now())=-1 OR DATEDIFF(EndTime,now())=0 OR DATEDIFF(EndTime,now())=1 GROUP BY UserId"; + var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} GROUP BY UserId"; return this.m_DbContext.SqlQuery(sql); } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index aaa4c14..8192626 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -105,7 +105,7 @@ FROM product_order where OrderState=20 or OrderState=90 or OrderState=40 or Orde string where = $" (OrderState=20 or OrderState=90 or OrderState=40 or OrderState=50 or OrderState=30) "; if (bTime.HasValue && eTime.HasValue) { - where += $"and CreateTime>'{bTime.Value.ToString("yyyy-MM-dd")}' and CreateTime<'{eTime.Value.ToString("yyyy-MM-dd")}'"; + where += $"and UpdateTime>'{bTime.Value.ToString("yyyy-MM-dd")}' and UpdateTime<'{eTime.Value.ToString("yyyy-MM-dd")}'"; }