diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index d35eee1..4024e92 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -739,7 +739,7 @@ namespace Home.Controllers { var product = new ProductEntity(); var package = new ProductPackageEntity(); - if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097||id==60||id==1114){ + if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097||id==60||id==1114||id==1115||id==1121||id==1127||id==1133){ package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); } else { @@ -927,6 +927,41 @@ namespace Home.Controllers return View(model); } } + //0 无状态 1:1m 5m 3:10m 4:20m + var pro_type_flag_qilindongtai = 0; + var pro_type_temp_qilindongtai = 0; + if (productId == 27) { + + accountList.ForEach(m => { + + + if (m.PackageId<1121) { + pro_type_flag_qilindongtai = 1; + } + if (m.PackageId>1121&&m.PackageId<1127) { + pro_type_flag_qilindongtai = 2; + } + if (m.PackageId>1127&&m.PackageId<1133) { + pro_type_flag_qilindongtai = 3; + } + if (m.PackageId>1133&&m.PackageId<1139) { + pro_type_flag_qilindongtai = 4; + } + + + if (pro_type_temp_qilindongtai==0){ + pro_type_temp_qilindongtai = pro_type_flag_qilindongtai; + } + if (pro_type_temp_qilindongtai!=pro_type_flag_qilindongtai){ + ViewBag.errorTip = "麒麟不同类型不能同时续费"; + } + + }); + + if (ViewBag.errorTip == "麒麟不同类型不能同时续费"){ + return View(model); + } + } //0 无状态 1:尊享 2:高级 3:普通 var pro_type_flag_xianfeng = 0; @@ -1035,6 +1070,19 @@ namespace Home.Controllers if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { package_temp.Add(m); } + }else if(m.ProductId == 27){ + if (pro_type_temp_qilindongtai ==1 && m.Id<1121) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==2 && m.Id>1121&&m.Id<1127) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==3 && m.Id>1127&&m.Id<1133) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==4 && m.Id>1133&&m.Id<1139) { + package_temp.Add(m); + } }else if(m.ProductId == 6){ if (pro_type_temp_xianfeng ==1 && m.Id<61) { package_temp.Add(m); @@ -1094,6 +1142,19 @@ namespace Home.Controllers if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { package_temp.Add(m); } + }else if(m.ProductId == 27){ + if (pro_type_temp_qilindongtai ==1 && m.Id<1121) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==2 && m.Id>1121&&m.Id<1127) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==3 && m.Id>1127&&m.Id<1133) { + package_temp.Add(m); + } + if (pro_type_temp_qilindongtai ==4 && m.Id>1133&&m.Id<1139) { + package_temp.Add(m); + } }else if(m.ProductId == 6){ if (pro_type_temp_xianfeng ==1 && m.Id<61) { package_temp.Add(m); diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index edf1589..26ad25a 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -175,6 +175,10 @@ + }else if(item.Product.Id == 27) { + }else if(item.Product.Id == 6) {