极狐0.1

2024-07-11 10:43:02 +08:00
parent 0eb250cf8b
commit b29e9bb51f
4 changed files with 48 additions and 21 deletions
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -89,6 +89,7 @@ namespace Home.Controllers
                //从user表获取用户信息
                var user_Info = await m_UserService.GetById(userInfo.UserId);
                var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount;
+                var mogu_jihu = user_Info.Sex;

                //判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完
                var test_flag = false;
@@ -120,7 +121,10 @@ namespace Home.Controllers
                            if(m.Price<m.MinPrice){
                                m.Price = m.MinPrice;
                            }
-                            if (ExpiredProductAccountCount == 0 && m.Id == 1012){
+                            if (ExpiredProductAccountCount == 0 && (m.Id == 1012)){
+                                m.Price = 0.1M;
+                            }
+                            if (mogu_jihu == 0 && (m.Id==1188 || m.Id==1194 || m.Id==1200)){
                                m.Price = 0.1M;
                            }
                            //判断测试卡是否收费
@@ -150,7 +154,11 @@ namespace Home.Controllers
                            {
                                m.Price = userPrice.UserPrice;
                            }
-                            if (ExpiredProductAccountCount == 0 && m.Id == 1012){
+                            if (ExpiredProductAccountCount == 0  && (m.Id == 1012)){
+                                m.Price = 0.1M;
+                            }
+
+                            if (mogu_jihu == 0  && ( m.Id==1188 || m.Id==1194 || m.Id==1200)){
                                m.Price = 0.1M;
                            }
                            //判断测试卡是否收费
@@ -174,7 +182,7 @@ namespace Home.Controllers
                        m.Title = "0";
                        
                        
-                    if (m.Id == 1012){
+                    if (m.Id == 1012 || m.Id==1188 || m.Id==1194 || m.Id==1200){
                        m.Price = 0.1M;
                    }
                    });
@@ -805,6 +813,7 @@ namespace Home.Controllers
            //从user表获取用户信息
            var user_Info = await m_UserService.GetById(userId);
            var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; 
+            var mogu_jihu = user_Info.Sex;

            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){
@@ -829,10 +838,15 @@ namespace Home.Controllers
                package.Price = package.MinPrice;
            }

-            if (ExpiredProductAccountCount == 0 &&package.Id == 1012){
+            if (ExpiredProductAccountCount == 0 &&(package.Id == 1012)){
                package.Price = 0.1M;
            }

+            if (mogu_jihu == 0 &&(package.Id == 1188 || package.Id == 1194 || package.Id == 1200)){
+                package.Price = 0.1M;
+            }
+
+
            return View("buy", new PackageInfoResponse()
            {

--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -195,15 +195,15 @@
                    </li>
                }else if(item.Product.Id == 26) {
                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" class="click_product" id="p26" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
+                        <a href="#@item.Product.Id" class="click_product" id="p26" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
                    </li>
                }else if(item.Product.Id == 27) {
                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" class="click_product" id="p27" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
+                        <a href="#@item.Product.Id" class="click_product" id="p27" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
                    </li>
                }else if(item.Product.Id == 6) {
                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" class="click_product" id="p6" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
+                        <a href="#@item.Product.Id" class="click_product" id="p6" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
                    </li>
                }
                else if(item.Product.Id == 22) {
@@ -225,12 +225,12 @@
                        <a style="color:#0098fb;border:1px solid #99CCFF"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></a>
                    </li>
                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" id="p28" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新</span></a>
+                        <a href="#@item.Product.Id" id="p28" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
                    </li>
                } else {
                    
                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" class="click_product" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name </a>
+                        <a href="#@item.Product.Id"  id="p@(item.Product.Id)" class="click_product" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name </a>
                    </li>
                }
            }
@@ -392,6 +392,7 @@
            </div>
            }

+
            
            <div id="app" class="qilinjingtai" style="display:none;">

@@ -1188,6 +1189,14 @@
        $(".qldt10").css('background-color','white');
        $(".qldt20").css('background-color','white');
    });
+
+    $("#p13").click(function () {
+        alert("本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月")
+    });
+
+    $("#p17").click(function () {
+        alert("本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月")
+    });
    $("#p6").click(function () {
        $(".type14").hide();
        $(".type26").hide();
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -495,8 +495,8 @@
                    @* @if(item.Product.Id == 18){
                        <p class="youhuiNew" style="color: #0066CC;margin:0;padding:0;">蘑菇IP双十一活动：周卡送3天，月卡送10天，双月卡送一个月，不限制账号个数。截止时间：11月20日。</p>
                    } *@
-                    @if(item.Product.Id == 17){
-                        <p class="youhuiNew" style="color: #0066CC;margin:0;padding:0;">本产品升级更新中，暂无法开通，请先开通其他产品使用。更新后产品为极狐IP，280个城市，网速超快，且有赠送活动，计划于6月23日晚上线。</p>
+                    @if(item.Product.Id == 17 || item.Product.Id == 13){
+                        <p class="youhuiNew" style="color: #0066CC;margin:0;padding:0;">本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月</p>
                    } 
                    
                        
@@ -1077,7 +1077,7 @@
    <div class="warning-jike">
        <div class="panel panel-default">
            <div class="panel-body text-center" style="font-size: 20px;">
-                因极客和西瓜产品完全一样，为方便管理，只保留西瓜IP，如需使用极客IP，可直接购买西瓜IP ^.^
+                本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月
            </div>
            <p class="text-center">
                <button type="button" class="btn btn-danger quxiao" onclick="$('.warning-jike').hide();$('#hidebg').hide();">我明白了</button>
@@ -1113,7 +1113,9 @@
                'product_id':1,//1静态 2固态 
            },
            game_list:[],
-            province_city:{},
+            province_city:{
+                province_surplus_outs:[],
+            },
            province:[],
            citys:[],
            package_list:[],
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -247,15 +247,10 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "产品不存在或者下架");
            }

-            if (packageEntity.ProductId == 13)
-            {
-                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "因极客和西瓜产品完全一样，为方便管理，只保留西瓜IP，如需使用极客IP，可直接购买西瓜IP。");
-            }

-
-            if (packageEntity.ProductId == 17)
+            if (packageEntity.ProductId == 17 || packageEntity.ProductId == 13)
            {
-                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "本产品升级更新中，暂无法开通，请先开通其他产品使用。更新后产品为极狐IP，280个城市，网速超快，且有赠送活动，计划于6月23日晚上线");
+                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月");
            }
            // if (productEntity.Status == 0)
            // {
@@ -275,6 +270,7 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,

            //天卡0.1元
            var ExpiredProductAccountCount = userEntity.ExpiredProductAccountCount;
+            var mogu_jihu = userEntity.Sex;

            var is_verify = userEntity.is_verify;   
            
@@ -334,11 +330,17 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                price = 1.00M;
            }

-            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){
+            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);
            }
+
+            if (( request.PackageId == 1188 || request.PackageId == 1194 || request.PackageId == 1200)&&mogu_jihu == 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.Sex = 1;
+                await m_UserService.Update(userEntity);
+            }
            var order = new ProductOrderEntity()
            {
                AccountCount = 1,