From 5d8bbcc67b7adacd68171719f2c748595f8ca2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Tue, 2 Jan 2024 14:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=8E=E8=B1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ProductController.cs | 61 +- Host/Views.Mobile/LineList/Index.cshtml | 3 + Host/Views.Mobile/Product/Index.cshtml | 79 ++- Host/Views/LineList/Index.cshtml | 13 + Host/Views/Product/Index.cshtml | 79 ++- .../Controllers/ProductAccountController.cs | 19 +- .../Service/AgentClient20Service.cs | 536 ++++++++++++++++++ .../Hncore.Pass.Vpn/Service/AgentService.cs | 2 + .../Service/ProductOrderService.cs | 10 + 9 files changed, 791 insertions(+), 11 deletions(-) create mode 100644 Services/Hncore.Pass.Vpn/Service/AgentClient20Service.cs diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 3f75304..d06ca80 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -739,7 +739,7 @@ namespace Home.Controllers { var product = new ProductEntity(); var package = new ProductPackageEntity(); - if (id==1034||id==1040||id==89){ + if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097){ package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); } else { @@ -894,6 +894,39 @@ namespace Home.Controllers return View(model); } } + //0 无状态 1：尊享 2：高级 3：普通 + var pro_type_flag_liebao = 0; + var pro_type_temp_liebao = 0; + if (productId == 26) { + + + + accountList.ForEach(m => { + + + if (m.PackageId<1097) { + pro_type_flag_liebao = 1; + } + if (m.PackageId>1096&&m.PackageId<1103) { + pro_type_flag_liebao = 2; + } + if (m.PackageId>1103&&m.PackageId<1109) { + pro_type_flag_liebao = 3; + } + + if (pro_type_temp_liebao==0){ + pro_type_temp_liebao = pro_type_flag_liebao; + } + if (pro_type_temp_liebao!=pro_type_flag_liebao){ + ViewBag.errorTip = "猎豹不同类型不能同时续费"; + } + + }); + + if (ViewBag.errorTip == "猎豹不同类型不能同时续费"){ + return View(model); + } + } @@ -943,7 +976,7 @@ namespace Home.Controllers if (m.ProductId == 6||m.ProductId == 5){ m.Title = "9"; } - if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 26||m.ProductId == 17){ m.Title = "8"; } } @@ -961,7 +994,17 @@ namespace Home.Controllers if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) { package_temp.Add(m); } - }else { + }else if(m.ProductId == 26){ + if (pro_type_temp_liebao ==1 && m.Id<1097) { + package_temp.Add(m); + } + if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) { + package_temp.Add(m); + } + if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { + package_temp.Add(m); + } + } else { package_temp.Add(m); } @@ -1003,7 +1046,17 @@ namespace Home.Controllers if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) { package_temp.Add(m); } - }else { + }else if(m.ProductId == 26){ + if (pro_type_temp_liebao ==1 && m.Id<1097) { + package_temp.Add(m); + } + if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) { + package_temp.Add(m); + } + if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { + package_temp.Add(m); + } + } else { package_temp.Add(m); } }); diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml index 966ae44..28dd311 100644 --- a/Host/Views.Mobile/LineList/Index.cshtml +++ b/Host/Views.Mobile/LineList/Index.cshtml @@ -483,6 +483,9 @@ case 25: self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv'; break; + case 26: + self.location.href='http://php-api.juip.com/script/linedata/data/download/liebao.csv'; + break; } }, detail(r){ diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index fa5be2d..ae96039 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -171,6 +171,10 @@ + }else if(item.Product.Id == 26) { + } else if(item.Product.Id == 22) {
  • @@ -216,11 +220,21 @@

    需求五个以上、可联系右侧客服设置优惠价

    + + @if (item.Product.Id == 14){

    + } + @if (item.Product.Id == 26){ +
    + +
    + +
    + } @if (item.Product.Id == 20) {
    @@ -247,7 +261,7 @@ @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) + if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040&&package.Id != 1094&&package.Id != 1097&&package.Id != 1103) {
    @@ -279,7 +293,7 @@
    - } else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){ + } else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1094||package.Id == 1097||package.Id == 1103)&&package.IsTest==1){
    @@ -332,6 +346,7 @@ $(".p_type").hide(); $("#p14").click(function () { $(".type14").show(); + $(".type26").hide(); $("#package-89").show(); $("#package-69").show(); $("#package-70").show(); @@ -341,6 +356,24 @@ for (var i=1034;i<1046;i++){ $("#package-"+i).hide(); } + $(".ttzx").css('background-color','#FF9900'); + $(".ttgj").css('background-color','white'); + $(".ttpt").css('background-color','white'); + + }); + $("#p26").click(function () { + $(".type14").hide(); + $(".type26").show(); + + for (var i=1090;i<1097;i++){ + $("#package-"+i).show(); + } + for (var i=1097;i<1109;i++){ + $("#package-"+i).hide(); + } + $(".lbzx").css('background-color','#FF9900'); + $(".lbgj").css('background-color','white'); + $(".lbpt").css('background-color','white'); }); function ttzhizun() { $("#package-89").show(); @@ -357,6 +390,18 @@ $(".ttgj").css('background-color','white'); $(".ttpt").css('background-color','white'); } + function lbzhizun() { + for (var i=1090;i<1097;i++){ + $("#package-"+i).show(); + } + for (var i=1097;i<1109;i++){ + $("#package-"+i).hide(); + } + + $(".lbzx").css('background-color','#FF9900'); + $(".lbgj").css('background-color','white'); + $(".lbpt").css('background-color','white'); + } function ttgaoji() { $(".ttgj").css('background-color','#FF9900'); $(".ttzx").css('background-color','white'); @@ -374,6 +419,21 @@ $("#package-"+i).show(); } } + function lbgaoji() { + $(".lbgj").css('background-color','#FF9900'); + $(".lbzx").css('background-color','white'); + $(".lbpt").css('background-color','white'); + + for (var i=1090;i<1097;i++){ + $("#package-"+i).hide(); + } + for (var i=1103;i<1109;i++){ + $("#package-"+i).hide(); + } + for (var i=1097;i<1103;i++){ + $("#package-"+i).show(); + } + } function ttputong() { $(".ttpt").css('background-color','#FF9900'); $(".ttzx").css('background-color','white'); @@ -391,6 +451,21 @@ $("#package-"+i).hide(); } } + function lbputong() { + $(".lbpt").css('background-color','#FF9900'); + $(".lbzx").css('background-color','white'); + $(".lbgj").css('background-color','white'); + + for (var i=1090;i<1097;i++){ + $("#package-"+i).hide(); + } + for (var i=1103;i<1109;i++){ + $("#package-"+i).show(); + } + for (var i=1097;i<1103;i++){ + $("#package-"+i).hide(); + } + } var wjdxtype = 1; function wjdxphone() { diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml index 3efaf96..288d5e6 100644 --- a/Host/Views/LineList/Index.cshtml +++ b/Host/Views/LineList/Index.cshtml @@ -284,6 +284,11 @@ 1234 4430 + + 猎豹 + 1234 + 4430 + 强子 888888 @@ -396,6 +401,11 @@ this.search_field = '天天IP'; this.sstp = '4430'; break; + case 26: + this.l2tp = '1234'; + this.search_field = '猎豹IP'; + this.sstp = '4430'; + break; case 15: this.l2tp = '66'; this.search_field = '共享IP'; @@ -562,6 +572,9 @@ case 25: self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv'; break; + case 26: + self.location.href='http://php-api.juip.com/script/linedata/data/download/liebao.csv'; + break; } } } diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 18174f2..4cf4c69 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -259,6 +259,12 @@
    } + else if(item.Product.Id == 26) { +
    +
    新 @item.Product.Name
    + +
    + } else if(item.Product.Id == 22) {
    静态IP
    @item.Product.Name
    @@ -359,6 +365,21 @@
    } + @if(item.Product.Id == 26) { //不限速 +
    + +
    + } @* @if(item.Product.Id == 18){ @@ -444,7 +465,7 @@
    - @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14){ + @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26){

    免费

    @restStatus

    @@ -457,7 +478,7 @@
    } - @foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) ).OrderBy(m => m.TenantId)) + @foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) || (m.ProductId==26 && m.Status == 1) ).OrderBy(m => m.TenantId)) { @if(package.Title != "0"){