From 598f4d38b476353f37185a65adfc2f250cc6074f Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Sat, 17 Oct 2020 17:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=8F=91=E9=80=81=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs  | 23 +++++++++++--------
 .../Service/ProductAccountService.cs          |  7 ++++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
index 0953469..56b6496 100644
--- a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
+++ b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs
@@ -31,7 +31,7 @@ namespace Hncore.Pass.Vpn.Job
             {
                 while (true)
                 {                 
-                    if (doing||!(DateTime.Now.Hour == 15 && DateTime.Now.Minute < 5))
+                    if (doing||!(DateTime.Now.Hour == 8 && DateTime.Now.Minute < 5))
                     {
                         break;
                     }
@@ -45,15 +45,9 @@ namespace Hncore.Pass.Vpn.Job
                             var wxUserService = scope.ServiceProvider.GetService<WxAppUserService>();
                             var userService = scope.ServiceProvider.GetService<UserService>();
 
-                            var expireAccounts_1 = await accountService.GetExpireingAccounts(-1);
+                            var expireAccounts = await accountService.GetExpireingAccountsTime();
 
-                            var expireAccounts0 = await accountService.GetExpireingAccounts(0);
-
-                            var expireAccounts1 = await accountService.GetExpireingAccounts(1);
-
-                            await Tip(expireAccounts_1, wxUserService, userService, "已过期1天");
-                            await Tip(expireAccounts0, wxUserService, userService, "今天过期");
-                            await Tip(expireAccounts1, wxUserService, userService, "明天过期");
+                            await Tip(expireAccounts, wxUserService, userService, "即将过期或已过期");
 
                         }
                     }
@@ -104,9 +98,18 @@ namespace Hncore.Pass.Vpn.Job
                     }
                 }
 
+                var timeType = (account.EndTime - DateTime.Now).Value.ToString("dd");
+                var ret = false;
                 if (userInfo != null && RegexPattern.IsMobile(userInfo.Phone))
                 {
-                    var ret = AliSmsService.Send("SMS_193505090", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
+                    if(timeType=="00"){
+                        ret = AliSmsService.Send("SMS_199202299", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
+                    } else if(timeType=="01"){
+                        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);
+                    }
+                    // var ret = AliSmsService.Send("SMS_193505090", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone);
                 }
                 tipUsers[account.UserId.Value] = true;
             }
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
index 2cc9c86..849c3d7 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
@@ -110,6 +110,13 @@ namespace Hncore.Pass.Vpn.Service
             return this.m_DbContext.SqlQuery<ProductAccountEntity>(sql);
         }
 
+        //主要是用来定时执行的
+        public async Task<List<ProductAccountEntity>> GetExpireingAccountsTime()
+        {
+            var sql = $"select * from product_account where DATEDIFF(EndTime,now())=-1 OR DATEDIFF(EndTime,now())=0 OR DATEDIFF(EndTime,now())=1 GROUP BY UserId";
+            return this.m_DbContext.SqlQuery<ProductAccountEntity>(sql);
+        }
+
         public async Task<ApiResult> UpdateAccountPwd(UpdateAccountPwdRequest request)
         {
             var entity = await this.GetById(request.Id);