From f22ef6578fa0895445b039caaae81b23438c4817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Sun, 16 Jul 2023 14:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8D=A1=E8=B6=85=E5=85=8D?= =?UTF-8?q?=E8=B4=B91=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ProductController.cs | 32 ++++- Host/Views.Mobile/Product/Index.cshtml | 124 ------------------ Host/Views.Mobile/Product/buy.cshtml | 91 +++++++------ Host/Views/Product/Index.cshtml | 38 ++++-- Host/Views/Product/buy.cshtml | 20 ++- .../Service/ProductOrderService.cs | 26 ++-- 6 files changed, 145 insertions(+), 186 deletions(-) diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 4a8b15a..b5118bc 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -81,7 +81,7 @@ namespace Home.Controllers public async Task Index() { var respList = await m_ProductService.ProductWithPackage(1); - + var userInfo = this.Request.GetUserInfo(); if (userInfo != null) { @@ -90,6 +90,13 @@ namespace Home.Controllers var user_Info = await m_UserService.GetById(userInfo.UserId); var ProductAccountCount = user_Info.ProductAccountCount; + //判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完 + var test_flag = false; + if ((user_Info.TestCountLimit!=0 && user_Info.TestCountLimit<=user_Info.UseTestCount) || (user_Info.TestCountLimit ==0 && user_Info.UseTestCount>2)) { + test_flag = true; + } + + if((user_Info.agent_id == 0||(user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0){ //根据折扣设置价格 @@ -97,6 +104,7 @@ namespace Home.Controllers var dis_price = 1000000.0M; foreach(var product in respList) { + product.Product.Content = "0"; product.Packages.ForEach(m => { if (discount != null) @@ -115,7 +123,17 @@ namespace Home.Controllers // 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 (test_flag && (m.IsTest == 1)) { + m.Price = 1.0M; + m.IsTest =0; + } }); + + //判断测试卡是否收费 + if (test_flag) { + product.Product.Content = "1"; + } } } else { //根据会员价 @@ -123,6 +141,7 @@ namespace Home.Controllers foreach(var product in respList) { + product.Product.Content = "0"; product.Packages.ForEach(m => { m.Title = "0"; @@ -134,12 +153,23 @@ namespace Home.Controllers // 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 (test_flag && (m.IsTest == 1)) { + m.Price = 1.0M; + m.IsTest =0; + } }); + + //判断测试卡是否收费 + if (test_flag) { + product.Product.Content = "1"; + } } } } else { foreach(var product in respList) { + product.Product.Content = "0"; product.Packages.ForEach(m => { m.Title = "0"; diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 0013c18..28362d2 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -402,130 +402,6 @@ } - else if (package.Id==1034||package.Id==1040) - { - -
-
-

@package.Name

-

@(package.DayPrice)元/天

-

@package.Profile

-
-
-

¥0.00

-

原价：@package.LinePrice 元

-
-
- - } - else if(package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103 && package.Id<1000)||package.Id==1019){ - -
-
-

@package.Name 送1月

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

- -
-
- - } - else if(package.Id==1020){ - -
-
-

@package.Name

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

- -
-
- - } - @* else if(package.Id == 19) { - - -
-
-

@package.Name 送10天

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

-
-
- - - - } *@ - @* else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) { - - -
-
-

@package.Name 八折

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

-
-
- - - - } *@ - @* else if(package.Id == 71||package.Id == 102||package.Id == 100) { - - -
-
-

@package.Name 送7天

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

-
-
- - - - } *@ - else if(package.Id == 1||package.Id == 1002||package.Id == 4||package.Id == 7||package.Id == 12||package.Id == 17||package.Id == 22||package.Id == 27||package.Id == 32||package.Id == 37||package.Id == 42||package.Id == 62||package.Id == 69||package.Id == 73||package.Id == 80) { - - -
-
- @if(package.Title != ""){ -

@package.Name @package.Title 折

- } else { -

@package.Name 9 折

- } -

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Profile

-
-
-

¥@package.Price

-

原价：@package.LinePrice 元

-
-
- - - - } else {
diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml index 09fdde6..b01b854 100644 --- a/Host/Views.Mobile/Product/buy.cshtml +++ b/Host/Views.Mobile/Product/buy.cshtml @@ -97,7 +97,11 @@ @if(Model.Package.Price < 60 && (Model.Package.Id == 64||Model.Package.Id == 1004)){ 60.00 } else { - @Model.Package.Price + @if (Model.Package.IsTest == 0) { + @Model.Package.Price + } else { + 1.0 + } }
@@ -116,18 +120,20 @@ -
-
- 单个注册 + @if (Model.Package.IsTest == 0) { +
+
+ 单个注册 +
+
+ 批量注册 +
-
- 批量注册 -
-
+ }
- IP账号前缀： + IP账号：
@@ -141,39 +147,42 @@
-
-
- 连接数： -
-
-
-
- - -
-
- - @*{{OneBuyModel.ConnectCount}}*@ -
-
- + + @if (Model.Package.IsTest == 0) { +
+
+ 连接数： +
+
+
+
+ - +
+
+ + @*{{OneBuyModel.ConnectCount}}*@ +
+
+ + +
+
+ 1 +
-
- 1 +
+
+ 选择优惠券： +
+
+ +
-
-
-
- 选择优惠券： -
-
- -
-
+ + }
代理下会员号： @@ -468,6 +477,9 @@ if((@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004) && @(Model.Package.Price)<60){ total = this.OneBuyModel.ConnectCount * 60.00 } + if (@(Model.Package.IsTest) == 1) { + total = 1.00; + } return total.toFixed(2); }, OnePayAmount: function () { @@ -484,6 +496,9 @@ total = min_cost; } + if (@(Model.Package.IsTest) == 1) { + total = 1.00; + } return total.toFixed(2); }, MoreTotalAmount: function () { diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 3b0e72a..a3468b4 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -390,7 +390,7 @@

因业务调整，本产品停止新开及续费，未到期账号可正常使用

} @if(item.Product.Id == 14){ -

天天IP于8.6日已恢复，全新IP池，欢迎选购！
购买须知：本产品新开账号屏蔽QQ微信
购买需选择左侧天天产品类型

+

购买须知：本产品解除屏蔽QQ微信需联系在线客服
购买需选择左侧天天产品类型

} @if(item.Product.Id == 1 || item.Product.Id == 25){

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

@@ -548,7 +548,7 @@
- @if(item.Product.TenantId == 1157){ + @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14){

免费

@restStatus

@@ -561,8 +561,7 @@
} - - @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.ProductId==14 && m.Status == 1) ).OrderBy(m => m.TenantId)) { @if(package.Title != "0"){