From d8031b41e33ac4c7be7b8217ed042390d6d8bbe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Thu, 1 Feb 2024 17:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=BB=B4=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ProductController.cs | 14 +- Host/Controllers/UserController.cs | 16 +- Host/Views.Mobile/LineList/Index.cshtml | 13 + Host/Views.Mobile/Product/Index.cshtml | 698 +++++++++++- Host/Views.Mobile/Product/Routeros.cshtml | 2 +- Host/Views.Mobile/Product/buy.cshtml | 6 +- Host/Views.Mobile/User/IndexInfo.cshtml | 2 +- Host/Views.Mobile/User/MyAccounts.cshtml | 240 +++- Host/Views/LineList/Index.cshtml | 26 + Host/Views/Product/Http.cshtml | 2 +- Host/Views/Product/Index.cshtml | 1012 ++++++++++++++--- Host/Views/Product/Routeros.cshtml | 2 +- Host/Views/Product/Soft.cshtml | 2 +- Host/Views/Product/buy.cshtml | 43 +- Host/Views/User/Index.cshtml | 2 +- Host/Views/User/MyAccounts.cshtml | 231 +++- .../Service/AgentClient13Service.cs | 123 +- .../Service/AgentClient4Service.cs | 2 +- .../Service/ProductAccountService.cs | 14 + 19 files changed, 2215 insertions(+), 235 deletions(-) diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 4024e92..3cdd102 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -852,6 +852,8 @@ namespace Home.Controllers if (productId > 0) accountList = accountList.Where(m => m.ProductId == productId).ToList(); var productIds = accountList.Select(m => m.ProductId); + //获取套餐名称 + var package_names = accountList.Select(m => m.PackageName); var connectCountList = accountList.Select(m => m.ConnectCount); if (productIds.Distinct().Count() != 1 || connectCountList.Distinct().Count() != 1) { @@ -860,6 +862,7 @@ namespace Home.Controllers } ViewBag.accounts = accounts; var id = productIds.First().Value; + var package_name = package_names.First(); //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag = 0; @@ -993,7 +996,6 @@ namespace Home.Controllers return View(model); } } - @@ -1010,6 +1012,16 @@ namespace Home.Controllers if (userInfo != null) { + if (productId == 28) { + var package_type = ""; + if(package_name.Contains("-")){ + string[] arrStr = package_name.Split('-'); + package_type = arrStr[0] + "-" + arrStr[1] + "-" + arrStr[2]; + } + respList.Packages = respList.Packages.Where(m => m.OriginName.Contains(package_type)).ToList(); + + } + //从user表获取用户信息 var user_Info = await m_UserService.GetById(userInfo.UserId); diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index 5956499..35f06ed 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -657,19 +657,19 @@ namespace Home.Controllers Func> process = async (data) => { var notifyOrder = data.FromJsonTo(); - LogHelper.Info("TaoBao process"); - if(notifyOrder.Payment == "10.00" && (notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"){ - return "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中"; - } + + // if(notifyOrder.Payment == "10.00" && (notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"){ + // return "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中"; + // } if (notifyOrder == null || notifyOrder.Tid.NotHas()) return ""; if (m_ScoreService.ExistTaoBaoScore(notifyOrder.Tid)) return ""; - // var phone = notifyOrder.ReceiverMobile.NotHas() ? notifyOrder.ReceiverPhone : notifyOrder.ReceiverMobile; + var phone = notifyOrder.ReceiverMobile.NotHas() ? notifyOrder.Tid : notifyOrder.ReceiverMobile; // if (phone.NotHas()) return false; var userEntity = await m_UserService.Query(m => m.TaoBao == notifyOrder.BuyerNick).FirstOrDefaultAsync(); - var phone = notifyOrder.BuyerNick; + // var phone = notifyOrder.BuyerNick; string pas_result = ""; Random rd = new Random(Guid.NewGuid().GetHashCode()); @@ -705,7 +705,7 @@ namespace Home.Controllers userEntity.TaoBao= notifyOrder.BuyerNick; await m_UserService.Update(userEntity); } - msg = "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中,会员号为："+userEntity.LoginCode+"，打开网址：juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; + msg = "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中,会员号为："+userEntity.LoginCode+"，打开网址：www.juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; } @@ -758,9 +758,11 @@ namespace Home.Controllers return true; }; + long aopic = long.Parse(this.Request.Query["aopic"]); string datainfo = this.Request.Form["json"]; var refundInfos = datainfo.FromJsonTo(); + LogHelper.Info("淘宝参数回调", $"json={datainfo.ToJson()}"); var info = ""; if (aopic == 2){ info = await m_TaoBaoService.ReceivedMsg(this.Request, process); diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml index 9d20f33..98833e7 100644 --- a/Host/Views.Mobile/LineList/Index.cshtml +++ b/Host/Views.Mobile/LineList/Index.cshtml @@ -384,6 +384,16 @@ this.search_field = '强子静态IP'; this.sstp = '4430'; break; + case 27: + this.l2tp = '123'; + this.search_field = '麒麟IP'; + this.sstp = '4432'; + break; + case 28: + this.l2tp = '123'; + this.search_field = '水滴静态IP'; + this.sstp = '4432'; + break; } $.ajax({ type: 'GET', @@ -491,6 +501,9 @@ case 26: self.location.href='http://php-api.juip.com/script/linedata/data/download/liebao.csv'; break; + case 27: + self.location.href='http://php-api.juip.com/script/linedata/data/download/qilin.csv'; + break; } }, detail(r){ diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 26ad25a..ca0a838 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -2,14 +2,19 @@ @using Microsoft.Extensions.Configuration @using Hncore.Pass.BaseInfo.Response @using Hncore.Infrastructure.Serializer; +@using Hncore.Pass.BaseInfo.Service @inject IConfiguration m_Configuration @model List +@inject UserService m_UserService +@inject Hncore.Pass.Vpn.Service.ProductAccountService m_AccountService @{ ViewData["Title"] = "购买产品"; UserLoginModel user = null; + Hncore.Pass.BaseInfo.Models.User userEntity = new Hncore.Pass.BaseInfo.Models.User(); if (this.Context.Request.Cookies.TryGetValue("userInfo", out string userCookie)) { user = userCookie.FromJsonTo(); + userEntity = await m_UserService.GetById(user.Id); } var pid = this.Context.Request.Query.ContainsKey("id") ? this.Context.Request.Query["id"].ToString() : ""; var defaultProduct = Model.Select(m => m.Product).FirstOrDefault(); @@ -21,6 +26,16 @@ { defaultProduct = Model.Select(m => m.Product).FirstOrDefault(m => m.Id.ToString() == pid); } + + //设置获取余额 + var restAmout = Convert.ToDecimal(0.00); + var resttime = 0; + var userid = 0; + if (user != null){ + resttime = await m_AccountService.GetRestTestCount(user.Id); + restAmout = userEntity.RestAmount; + userid = userEntity.Id; + } var defaultPackage = Model.Where(m => m.Product.Id == defaultProduct.Id).Select(m => m.Packages.FirstOrDefault()).FirstOrDefault(); var baseUrl = m_Configuration["BaseInfoUrl"]; Func P = (path) => $"{baseUrl}{path}"; @@ -165,23 +180,23 @@ { if(item.Product.Id == 18) { } else if(item.Product.Id == 14) { }else if(item.Product.Id == 26) { }else if(item.Product.Id == 27) { }else if(item.Product.Id == 6) { } else if(item.Product.Id == 22) { @@ -190,7 +205,7 @@ } else if(item.Product.Id == 21) { @@ -199,12 +214,16 @@ 单窗口单IP + } else if(item.Product.Id == 28) { + } else { } } @@ -245,7 +264,7 @@ } @if (item.Product.Id == 27){
- +

@@ -281,7 +300,7 @@
} - + @if(item.Product.Id != 28){ @foreach (var package in item.Packages.Where(m => m.Status == 1&&(m.TenantId==1157||m.TenantId==9999||m.TenantId==10000)).OrderBy(m => m.TenantId)) { if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040&&package.Id != 1094&&package.Id != 1097&&package.Id != 60&&package.Id != 1114) @@ -351,20 +370,679 @@ } } } + } } + + + + + + - + + +
@*
@@ -105,6 +112,7 @@ @item.Account @@ -251,6 +261,14 @@ 密码： {{currentAccount.Pwd}} + + ip地址: + {{currentAccount.Remark}}切换 + + + 服务器： + {{currentAccount.Raw}} + 连接数： {{currentAccount.ConnectCount}} @@ -273,6 +291,68 @@
+ + + } +
+ +
@@ -678,6 +1035,341 @@ @section Scripts{ + + + + - @**@ -} \ No newline at end of file +} diff --git a/Host/Views/Product/Routeros.cshtml b/Host/Views/Product/Routeros.cshtml index 23d1093..1469279 100644 --- a/Host/Views/Product/Routeros.cshtml +++ b/Host/Views/Product/Routeros.cshtml @@ -204,7 +204,7 @@ - + + +