From a3c6952804e28f91eb988eca9a1308aff4b005b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Thu, 21 Oct 2021 14:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E4=BA=A7=E5=93=81=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ProductController.cs | 108 +++++++++++++-- Host/Views.Mobile/Product/Index.cshtml | 93 +++++++++++-- Host/Views.Mobile/Product/ReBuyIndex.cshtml | 2 +- Host/Views/Product/Index.cshtml | 131 +++++++++++++++--- Host/Views/Product/ReBuyIndex.cshtml | 47 +------ .../Controllers/ProductAccountController.cs | 25 +++- .../Service/AgentClient7Service.cs | 8 +- .../Service/ProductOrderService.cs | 119 +--------------- 8 files changed, 331 insertions(+), 202 deletions(-) diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 414401e..996251c 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -121,7 +121,7 @@ namespace Home.Controllers if(m.Price TestIndex(int id) { var userId = this.Request.GetUserInfo().UserId; - var product = await m_ProductService.GetById(id); - var package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); + var product = new ProductEntity(); + var package = new ProductPackageEntity(); + if (id==1034||id==1040){ + package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); + product = await m_ProductService.GetById(package.ProductId); + } else { + product = await m_ProductService.GetById(id); + package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); + } var restTimes = await m_ProductAccountService.GetRestTestCount(userId); return View("Test", new PackageInfoResponse() @@ -720,8 +727,15 @@ namespace Home.Controllers [HttpGet, UserAuth] public async Task Test(int id) { - var product = await m_ProductService.GetById(id); - var package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); + var product = new ProductEntity(); + var package = new ProductPackageEntity(); + if (id==1034||id==1040){ + package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); + product = await m_ProductService.GetById(package.ProductId); + } else { + product = await m_ProductService.GetById(id); + package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); + } var restTimes = 0; var userInfo = this.Request.GetUserInfo(); if (userInfo != null) @@ -825,8 +839,53 @@ namespace Home.Controllers } ViewBag.accounts = accounts; var id = productIds.First().Value; + + //0 无状态 1：尊享 2：高级 3：普通 + var pro_type_flag = 0; + var pro_type_temp = 0; + if (productId == 14) { + + + + accountList.ForEach(m => { + + + if (m.PackageId<1034) { + pro_type_flag = 1; + } + if (m.PackageId>1034&&m.PackageId<1040) { + pro_type_flag = 2; + } + if (m.PackageId>1040&&m.PackageId<1046) { + pro_type_flag = 3; + } + + if (pro_type_temp==0){ + pro_type_temp = pro_type_flag; + } + if (pro_type_temp!=pro_type_flag){ + ViewBag.errorTip = "天天不同类型不能同时续费"; + } + + }); + + if (ViewBag.errorTip == "天天不同类型不能同时续费"){ + return View(model); + } + } + + + + var respList = await m_ProductService.GetOneProductWithPackage(id); + var resp = new ProductWithPackageResponse(); + + var return_list = new ProductWithPackageResponse(); + return_list.Product = respList.Product; + + var package_temp = new List(); + var userInfo = this.Request.GetUserInfo(); if (userInfo != null) { @@ -843,6 +902,8 @@ namespace Home.Controllers respList.Packages.ForEach(m => { + + if (discount != null) { dis_price = m.LinePrice * discount.discount / 100; @@ -865,6 +926,20 @@ namespace Home.Controllers if(m.Price1034&&m.Id<1040) { + package_temp.Add(m); + } + if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) { + package_temp.Add(m); + } + }else { + package_temp.Add(m); + } }); @@ -873,6 +948,8 @@ namespace Home.Controllers var userPrices = await m_ProductUserPriceService.GetProductUserPrice(id, userInfo.UserId); respList.Packages.ForEach(m => { + + m.Title = "9.5"; if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){ m.Title = "8"; @@ -888,12 +965,27 @@ namespace Home.Controllers { m.Price = userPrice.UserPrice; } + + if (m.ProductId == 14){ + if (pro_type_temp ==1 && m.Id<1034) { + package_temp.Add(m); + } + if (pro_type_temp ==2 && m.Id>1034&&m.Id<1040) { + package_temp.Add(m); + } + if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) { + package_temp.Add(m); + } + }else { + package_temp.Add(m); + } }); } } - return View(respList); + return_list.Packages = package_temp; + return View(return_list); } [HttpGet,UserAuth] diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 7fc9b7f..e3a776d 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -59,7 +59,7 @@ 新@item.Product.Name7折 } - else if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 13||item.Product.Id == 14||item.Product.Id == 17||item.Product.Id == 19) { + else if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 13||item.Product.Id == 17||item.Product.Id == 19) { @@ -69,6 +69,11 @@ @item.Product.Name9折 } + else if(item.Product.Id == 14) { + + } else{