From 318c9a24a78b0ef9c9e7d8ce2998cab2ac827334 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Tue, 1 Dec 2020 19:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=9C=88=E5=8D=A1=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B4=BB=E5=8A=A8=E5=8D=A1=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views/Product/Index.cshtml               | 20 ++++++++-------
 .../Service/ProductOrderService.cs            | 25 +++++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 297c205..abcf176 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -361,16 +361,18 @@
                     @*<p class="text-center nameSmall">—<span>@item.Product.Name</span>—</p>*@
                     <div class="card" style="margin-top:30px;">
 
-                         <div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id">
-                            <p><span class="price">免费</span></p>
-                            <p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p>
-                            <p>@restTimes</p>
-                            <div class="pkgNameCard">
-                                <p class="tianka" style="font-size:17px;">测试卡</p>
-                                <p class="qixian">使用期限:1小时</p>
+                        @if(item.Product.Id != 5){
+                            <div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id">
+                                <p><span class="price">免费</span></p>
+                                <p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p>
+                                <p>@restTimes</p>
+                                <div class="pkgNameCard">
+                                    <p class="tianka" style="font-size:17px;">测试卡</p>
+                                    <p class="qixian">使用期限:1小时</p>
+                                </div>
+                                <img src="~/img/check.png" class="cardCheck">
                             </div>
-                            <img src="~/img/check.png" class="cardCheck">
-                        </div>
+                        }
 
                         @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId))
                         {
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 4b204f4..4da6f4a 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -250,10 +250,12 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             {
                 order.OrderAmount = price * request.ConnectCount;
                 order.Accounts = request.Account;
-                var isExit = await m_ProductAccountService.CheckMonthAccountExist(request.Account);
-                if(isExit){
-                    return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, request.Account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
-                }
+                
+                //双月卡活动
+                // var isExit = await m_ProductAccountService.CheckMonthAccountExist(request.Account);
+                // if(isExit){
+                //     return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, request.Account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
+                // }
             }
 
             if (request.OrderType == OrderType.News)
@@ -271,13 +273,14 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                 order.OrderAmount = price * request.ConnectCount * count;
                 order.Accounts = request.Account;
             }
-            foreach (var account in order.Accounts.Split(",").ToList())
-            {
-                var isExit = await m_ProductAccountService.CheckMonthAccountExist(account);
-                if(isExit){
-                    return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
-                }
-            }
+            //双月卡活动
+            // foreach (var account in order.Accounts.Split(",").ToList())
+            // {
+            //     var isExit = await m_ProductAccountService.CheckMonthAccountExist(account);
+            //     if(isExit){
+            //         return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
+            //     }
+            // }
 
             await CheckRequest(order);