From 657128f444203ce870deb8befcbc56a9223545e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 2 Sep 2021 15:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=98=91=E8=8F=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml                  | 2 +-
 Host/Views.Mobile/Product/ReBuyIndex.cshtml             | 2 +-
 Host/Views/Product/Index.cshtml                         | 2 +-
 Host/Views/Product/ReBuyIndex.cshtml                    | 2 +-
 Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs | 3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 3a66e52..63b6735 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -128,7 +128,7 @@
                     开通后有任何问题可无理由退款，并支持自助提现
                 </p>
                 
-                @foreach (var package in item.Packages.Where(m => m.Status == 1&&(m.TenantId==1157||m.TenantId==9999||m.TenantId==10000)).OrderBy(m => m.TenantId))
+                @foreach (var package in item.Packages.Where(m => m.Status == 1&&(m.TenantId==1157||m.TenantId==9999||m.TenantId==10000)&&(m.Id!=1012&&m.Id!=1013&&m.Id!=1014&&m.Id!=1019)).OrderBy(m => m.TenantId))
                 {
                     if (package.IsTest == 1)
                     {
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
index b567bd6..8a82fba 100644
--- a/Host/Views.Mobile/Product/ReBuyIndex.cshtml
+++ b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
@@ -55,7 +55,7 @@
                     <p>·带宽6-10兆</p>
                     <p>·断开再链接换ip</p>
                 </ul>
-                @foreach (var package in Model.Packages.Where(m=>m.IsTest==0&&m.Status==1&& m.Id != 1019&& m.Id != 1020&& m.Id != 1021).OrderBy(m => m.TenantId))
+                @foreach (var package in Model.Packages.Where(m=>m.IsTest==0&&m.Status==1&&(m.Id!=1030&&m.Id!=1031&&m.Id!=1032&&m.Id!=1033)).OrderBy(m => m.TenantId))
                 {
                     @if(package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
                         <a asp-action="rebuy" asp-controller="Product" asp-route-packageId="@package.Id" asp-route-accounts=@ViewBag.accounts>
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index fa0b527..812271c 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -689,7 +689,7 @@
                             </div>
                         }
 
-                        @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId))
+                        @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1 &&(m.Id!=1012&&m.Id!=1013&&m.Id!=1014&&m.Id!=1019)).OrderBy(m => m.TenantId))
                         {
 
                             <style>
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 83a98a9..ad5a223 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -448,7 +448,7 @@
                     
     <div class="card">
         <div style="display: flex;margin: 0 auto;">
-        @foreach (var package in Model.Packages.Where(m => m.IsTest == 0 && m.Status == 1&& m.Id != 1019).OrderBy(m => m.TenantId))
+        @foreach (var package in Model.Packages.Where(m => m.IsTest == 0 && m.Status == 1&&(m.Id!=1030&&m.Id!=1031&&m.Id!=1032&&m.Id!=1033)).OrderBy(m => m.TenantId))
         {
             <style>
                 .packageitem-@package.Id{
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index d2c56c2..a8ee0f7 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -358,6 +358,9 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
 
             if (request.OrderType == OrderType.AgainBuys)
             {
+                if (request.PackageId >1029 && request.PackageId <1034) {
+                    return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "不允许续费此套餐");
+                }
                 int count = request.Account.Split(",").Length;
                 order.AccountCount = count;
                 order.OrderAmount = price * request.ConnectCount * count;