From 7142d2aee7250e2e15c5f1eecd5875232cf4f9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 11 Aug 2023 17:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=98=91=E8=8F=871=E6=AF=9B=E9=92=B1=E5=A4=A9?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/ProductController.cs         | 29 ++++++++++---------
 .../Service/ProductOrderService.cs            | 12 ++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index b5821be..0e26253 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -88,7 +88,7 @@ namespace Home.Controllers
                 
                 //从user表获取用户信息
                 var user_Info = await m_UserService.GetById(userInfo.UserId);
-                var ProductAccountCount = user_Info.ProductAccountCount;
+                var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount;
 
                 //判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完
                 var test_flag = false;
@@ -120,9 +120,9 @@ namespace Home.Controllers
                             if(m.Price<m.MinPrice){
                                 m.Price = m.MinPrice;
                             }
-                            // if (ProductAccountCount == 0 && (m.DayCount == 1||m.DayCount == 2) && m.Id != 1034&&m.Id != 1040&&m.Id != 1079&&m.Id != 1073){
-                            //     m.Price = 0.1M;
-                            // }
+                            if (ExpiredProductAccountCount == 0 && m.Id == 1012){
+                                m.Price = 0.1M;
+                            }
                             //判断测试卡是否收费
                             if (test_flag && (m.IsTest == 1)) {
                                 m.Price = 1.0M;
@@ -150,9 +150,9 @@ namespace Home.Controllers
                             {
                                 m.Price = userPrice.UserPrice;
                             }
-                            // if (ProductAccountCount == 0 && (m.DayCount == 1||m.DayCount == 2) && m.Id != 1034&&m.Id != 1040&&m.Id != 1079&&m.Id != 1073){
-                            //     m.Price = 0.1M;
-                            // }
+                            if (ExpiredProductAccountCount == 0 && m.Id == 1012){
+                                m.Price = 0.1M;
+                            }
                             //判断测试卡是否收费
                             if (test_flag && (m.IsTest == 1)) {
                                 m.Price = 1.0M;
@@ -173,9 +173,10 @@ namespace Home.Controllers
                     product.Packages.ForEach(m => {
                         m.Title = "0";
                         
-                        // if ((m.DayCount == 1||m.DayCount == 2) && m.Id != 1034&&m.Id != 1040 &&m.Id != 1079&&m.Id != 1073){
-                        //     m.Price = 0.1M;
-                        // }
+                        
+                    if (m.Id == 1012){
+                        m.Price = 0.1M;
+                    }
                     });
                 }  
             }
@@ -787,7 +788,7 @@ namespace Home.Controllers
 
             //从user表获取用户信息
             var user_Info = await m_UserService.GetById(userId);
-            var ProductAccountCount = user_Info.ProductAccountCount; 
+            var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; 
 
             var dis_price = 1000000M;
             if((user_Info.agent_id == 0||(user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0){
@@ -812,9 +813,9 @@ namespace Home.Controllers
                 package.Price = package.MinPrice;
             }
 
-            // if (ProductAccountCount == 0 && (package.DayCount == 1 ||package.DayCount == 2)&&package.Id != 1079&&package.Id != 1073){
-            //     package.Price = 0.1M;
-            // }
+            if (ExpiredProductAccountCount == 0 &&package.Id == 1012){
+                package.Price = 0.1M;
+            }
 
             return View("buy", new PackageInfoResponse()
             {
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 32dd512..7b280b6 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -260,7 +260,7 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             var userEntity = await m_UserService.GetById(userId);
 
             //天卡0.1元
-            var ProductAccountCount = userEntity.ProductAccountCount;
+            var ExpiredProductAccountCount = userEntity.ExpiredProductAccountCount;
 
             var is_verify = userEntity.is_verify;   
             
@@ -320,11 +320,11 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                 price = 1.00M;
             }
 
-            // if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){
-            //     // price = 0.1M;
-            //     userEntity.ProductAccountCount = 1;
-            //     await m_UserService.Update(userEntity);
-            // }
+            if (request.PackageId == 1012&&ExpiredProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){
+                price = 0.1M;
+                userEntity.ExpiredProductAccountCount = 1;
+                await m_UserService.Update(userEntity);
+            }
             var order = new ProductOrderEntity()
             {
                 AccountCount = 1,