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-10-19 20:08:47 +08:00
parent 25e577ec82
commit 785af6ee95
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ namespace Hncore.Pass.Vpn.Controllers
} }
if (request.BTime.HasValue && request.ETime.HasValue) 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 ret = await m_ProductOrderService.PageDesc(request.PageIndex, request.PageSize, expr, true,m=>m.Id);
var data = ret.ToApiResult(); var data = ret.ToApiResult();
@@ -138,7 +138,7 @@ namespace Hncore.Pass.Vpn.Controllers
} }
if (request.BTime.HasValue && request.ETime.HasValue) 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 ret = await m_ProductOrderService.PageDesc(request.PageIndex, request.PageSize, expr, true,m=>m.Id);
var data = ret.ToApiResult(); var data = ret.ToApiResult();
@@ -163,7 +163,7 @@ namespace Hncore.Pass.Vpn.Controllers
if (request.BTime.HasValue && request.ETime.HasValue) 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 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) 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); 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) 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); 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) 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); 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) 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); 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) 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); var ret = await this.m_ProductOrderService.PageDesc(request.PageIndex,10000, expr, true, m => m.Id);

13
Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
View File

@@ -45,9 +45,13 @@ namespace Hncore.Pass.Vpn.Job
var wxUserService = scope.ServiceProvider.GetService<WxAppUserService>(); var wxUserService = scope.ServiceProvider.GetService<WxAppUserService>();
var userService = scope.ServiceProvider.GetService<UserService>(); var userService = scope.ServiceProvider.GetService<UserService>();
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; var ret = false;
if (userInfo != null && RegexPattern.IsMobile(userInfo.Phone)) 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); 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); ret = AliSmsService.Send("SMS_199222107", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
} else { } else {
ret = AliSmsService.Send("SMS_202820825", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone); ret = AliSmsService.Send("SMS_202820825", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);

4
Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
View File

@@ -111,9 +111,9 @@ namespace Hncore.Pass.Vpn.Service
} }
//主要是用来定时执行的 //主要是用来定时执行的
public async Task<List<ProductAccountEntity>> GetExpireingAccountsTime() public async Task<List<ProductAccountEntity>> 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<ProductAccountEntity>(sql); return this.m_DbContext.SqlQuery<ProductAccountEntity>(sql);
} }

2
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -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) "; string where = $" (OrderState=20 or OrderState=90 or OrderState=40 or OrderState=50 or OrderState=30) ";
if (bTime.HasValue && eTime.HasValue) 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")}'";
} }