From 93dc25f8e3c76df486aa9fa0388e27730b269c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Fri, 21 Jul 2023 17:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Views/Product/Index.cshtml | 155 +++--------------- Host/Views/Product/ReBuyIndex.cshtml | 129 ++------------- Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs | 24 ++- .../Service/ProductAccountService.cs | 2 +- .../Hncore.Pass.Vpn/Service/ProductService.cs | 2 +- Services/Hncore.Pass.Vpn/Startup.cs | 2 +- 6 files changed, 52 insertions(+), 262 deletions(-) diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index a3468b4..d5d1f28 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -242,7 +242,7 @@ @*新布局*@

-
+
动态独享IP
@@ -334,10 +334,27 @@

@item.Product.Name

@(string.Join("|",item.Packages.Select(m=>m.Name)))

-
+
+ @{var i = 1;} @foreach (var str in item.Product.ContentLine) { + if ( @item.Product.Id == 22 || @item.Product.Id == 23) { + if (i == @item.Product.ContentLine.Count()-1) { + break; + } + } else { + if (i == @item.Product.ContentLine.Count()) { + break; + } + }

@str

+ i=i+1; + } + @if ( @item.Product.Id == 22 || @item.Product.Id == 23) { +

@item.Product.ContentLine[@item.Product.ContentLine.Count()-2]

+

@item.Product.ContentLine[@item.Product.ContentLine.Count()-1]

+ } else { +

@item.Product.ContentLine[@item.Product.ContentLine.Count()-1]

}
@if (user == null) @@ -355,141 +372,7 @@
- @*

一毛钱活动：不分新老用户都可参加！

*@ - @* @if(item.Product.Id == 5){ -
- } *@ - @if(item.Product.Id == 13||item.Product.Id == 17){ -

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

- @*
购买须知：本产品以下地区屏蔽微信和QQ：上海,深圳,重庆...查看详细地区 -
*@ - } - @if(item.Product.Id == 18){ -

周卡送1天，月卡送5天
（新开和续费都可参加，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）
新产品上线，全新IP池！

-

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

- @*
购买须知：本产品以下地区屏蔽微信和QQ：南京,海口...查看详细地区 -
*@ - } - @if(item.Product.Id == 8||item.Product.Id == 7){ -

因业务调整，本产品停止新开及续费，未到期账号可正常使用

- } - @if(item.Product.Id == 14){ -

购买须知：本产品解除屏蔽QQ微信需联系在线客服
购买需选择左侧天天产品类型

- } - @if(item.Product.Id == 1 || item.Product.Id == 25){ -

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

- @*
购买须知：本产品域名出现问题，点击查看服务器ip地址查看详细地区 -
*@ - } - - @if(item.Product.Id == 2){ -

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

- @*
购买须知：本产品域名出现问题，点击查看服务器ip地址查看详细地区 -
*@ - } - @if(item.Product.Id == 22 ||item.Product.Id == 23 ){ -

购买须知：本产品目前所有地区QQ微信仅限于登录游戏账号 云南以及非大陆地区禁用

- } - @if(item.Product.Id == 5){ -

购买须知：本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

- } - @if(item.Product.Id == 19){ -

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

-

本产品为独享，每个账号对应一个宽带拨号，永不超载，保证了网速及稳定性。
使用时只需设置这个唯一的服务器：1.hhip.vip，在账号列表中点击切换地区即可任意组合自己需要的地区
切记一定要指定一下地区，不然会没有网络 -

- @*
购买须知：本产品以下地区屏蔽微信和QQ：北京,上海,广州,深圳,重庆，浙江全省，安徽全省...查看详细地区 -
*@ - } - @if(item.Product.Id == 6){ -
点击查看屏蔽微信QQ的地区 -
- } diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml index 8e8500b..10ef4f8 100644 --- a/Host/Views/Product/ReBuyIndex.cshtml +++ b/Host/Views/Product/ReBuyIndex.cshtml @@ -439,124 +439,21 @@ border-bottom-color: transparent; } - @if(package.Id == 88||package.Id == 101||package.Id == 103){ - -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - - else if(package.Id == 1018){ - -
- - -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - @* else if(package.Id == 34){ - -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } *@ - else if(package.Id==105){ - -
- - -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - @* else if(package.Id == 19) { -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- - } *@ - @* else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) { -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- - } *@ - else if(package.Id == 1||package.Id == 1002||package.Id == 1003||package.Id == 4||package.Id == 7||package.Id == 12||package.Id == 17||package.Id == 22||package.Id == 27||package.Id == 32||package.Id == 37||package.Id == 42||package.Id == 62||package.Id == 69||package.Id == 73||package.Id == 80) { -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- - } else if(package.Id != 88) { +
-
- - @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ -

60.00元

- } else { -

@package.Price元

- } -

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- + @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +

60.00元

+ } else { +

@package.Price元

+ } +

原价：@package.LinePrice元

+

@(Math.Round(package.Price/package.DayCount,2))元/天

+
+

@package.Name

+

@package.Profile

- } + +
@*

@package.Price元

diff --git a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs index 81cf80b..b51f44c 100644 --- a/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs +++ b/Services/Hncore.Pass.Vpn/Job/ExpireTipJob.cs @@ -23,7 +23,6 @@ namespace Hncore.Pass.Vpn.Job { Task.Run(async () => { await Execute(serviceProvider); }); } - private static async Task Execute(IServiceProvider serviceProvider) { var doing = false; @@ -35,7 +34,6 @@ namespace Hncore.Pass.Vpn.Job { break; } - LogHelper.Trace("开始过期提醒"); doing = true; try { @@ -86,18 +84,30 @@ namespace Hncore.Pass.Vpn.Job var userInfo = userInfos.FirstOrDefault(m => m.Id == account.UserId); if (wxUsers != null && wxUsers.Count > 0) { + var remark = "请及时续费，以免影响您使用。"; + if(tip=="已经过期一天"){ + remark = "续费价更优，请登录官网juip.com，联系客服咨询更低价格，现有十几款IP产品，总有一款适合您。"; + } + var title_remark = "请登录juip.com查看具体的到期账号！"; + if(tip=="今天过期"){ + title_remark = "您有IP账号将于今天到期，请点击查看详情"; + } else if(tip=="还有一天过期"){ + title_remark = "您有IP账号将于明天到期，请点击查看详情"; + } else { + title_remark = "您有IP账号已到期1天，请点击查看详情"; + } var wxUser = wxUsers.FirstOrDefault(m => m.UserId == account.UserId); if (wxUser != null && wxUser.Openid.Has()) { var msg = new TemplateMPModel(); msg.first = new TemplateDataItem($"尊敬的用户您好，你的账户{tip}！"); - msg.Url = "www.juip.com"; + msg.Url = "http://www.juip.com/user/myaccounts"; msg.template_id = "ltm4OfRDoxgdRG4EC8NMzX-NrkfHUz8aGz33TXSbP44"; - msg.Items.Add(new TemplateDataItem("请登录juip.com查看具体的到期账号！")); + msg.Items.Add(new TemplateDataItem(title_remark)); msg.Items.Add(new TemplateDataItem(userInfo.Phone)); - msg.Items.Add(new TemplateDataItem("动态IP账号服务")); + msg.Items.Add(new TemplateDataItem("IP账号服务")); msg.Items.Add(new TemplateDataItem(account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss"))); - msg.remark = new TemplateDataItem("请登录官网juip.com，点击个人中心，查看需要续费的动态ip账号"); + msg.remark = new TemplateDataItem(remark); await TemplateApi.SendTemplateMessageAsync(wxUser.Appid, wxUser.Openid, Wx.Open.Enums.ChannelType.MP, msg); } } @@ -110,7 +120,7 @@ namespace Hncore.Pass.Vpn.Job } 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_462015488", new { date = account.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss") }, "聚IP商城", userInfo.Phone); + ret = AliSmsService.Send("SMS_461965526", 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); } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs index ed494eb..db3af2a 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs @@ -124,7 +124,7 @@ namespace Hncore.Pass.Vpn.Service //主要是用来定时执行的 public async Task> GetExpireingAccountsTime(int day) { - var sql = $"select * from product_account WHERE DATEDIFF(EndTime,now())=1 AND `PackageName` NOT LIKE '天卡' AND `PackageName` NOT LIKE '测试卡' GROUP BY UserId"; + var sql = $"select * from product_account WHERE DATEDIFF(EndTime,now())={day} AND `PackageName` NOT LIKE '天卡' AND `PackageName` NOT LIKE '测试卡' GROUP BY UserId"; // var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} AND PackageName!='测试卡' AND PackageName!='天卡' GROUP BY UserId"; return this.m_DbContext.SqlQuery(sql); } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductService.cs b/Services/Hncore.Pass.Vpn/Service/ProductService.cs index 57b8b68..19ccfd7 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductService.cs @@ -56,7 +56,7 @@ namespace Hncore.Pass.Vpn.Service { var resp = new ProductWithPackageResponse(); resp.Product = p.MapTo(); - resp.Packages = packages.Where(m => m.ProductId == p.Id && m.Status == 1).ToList(); + resp.Packages = packages.Where(m => m.ProductId == p.Id).ToList(); respList.Add(resp); }); return respList; diff --git a/Services/Hncore.Pass.Vpn/Startup.cs b/Services/Hncore.Pass.Vpn/Startup.cs index d7115d9..345f27b 100644 --- a/Services/Hncore.Pass.Vpn/Startup.cs +++ b/Services/Hncore.Pass.Vpn/Startup.cs @@ -63,7 +63,7 @@ namespace Hncore.Pass.Vpn applicationLifetime.ApplicationStarted.Register(() => { // OrderAccountJob.Start(_IServiceProvider); - RefrushStatusJob.Start(_IServiceProvider); + //RefrushStatusJob.Start(_IServiceProvider); // ChargeTryJob.Start(_IServiceProvider); ExpireTipJob.Start(_IServiceProvider); });