From aada71df8a82c932e2d67d144e5bcde7d97eb432 Mon Sep 17 00:00:00 2001 From: wmp <17516219072@163.com> Date: Sat, 18 Oct 2025 20:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: luorijun --- Host/Controllers/ProductController.cs | 815 ++++++++++++++++---------- Host/Controllers/UserController.cs | 275 +++++---- 2 files changed, 646 insertions(+), 444 deletions(-) diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 681b9c9..294f862 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -28,13 +28,13 @@ namespace Home.Controllers public class productController : MvcBaseController { - string Ali_APP_ID =""; - string Ali_APP_PRIVATE_KEY = ""; + string Ali_APP_ID = ""; + string Ali_APP_PRIVATE_KEY = ""; string ALIPAY_PUBLIC_KEY = ""; string Wx_AppId = ""; string Wx_MchId = ""; - string Wx_MchKey = ""; + string Wx_MchKey = ""; ProductService m_ProductService; ProductPackageService m_ProductPackageService; @@ -51,9 +51,9 @@ namespace Home.Controllers , ProductPriceSchemeService _ProductPriceSchemeService , ProductPackageService _ProductPackageService , WxPayClient _WxPayClient - ,ProductAccountService _ProductAccountService + , ProductAccountService _ProductAccountService , WxAppUserService _WxAppUserService - ,UserService _UserService + , UserService _UserService , ProductUserPriceService _ProductUserPriceService , IConfiguration _Configuration) { @@ -69,7 +69,7 @@ namespace Home.Controllers Wx_AppId = m_Configuration["WxApps:AppID"]; Wx_MchId = m_Configuration["WxApps:MchId"]; - Wx_MchKey = m_Configuration["WxApps:MchKey"]; + Wx_MchKey = m_Configuration["WxApps:MchKey"]; m_ProductAccountService = _ProductAccountService; m_WxAppUserService = _WxAppUserService; @@ -81,11 +81,11 @@ namespace Home.Controllers public async Task Index() { var respList = await m_ProductService.ProductWithPackage(1); - + var userInfo = this.Request.GetUserInfo(); if (userInfo != null) { - + //从user表获取用户信息 var user_Info = await m_UserService.GetById(userInfo.UserId); var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; @@ -94,63 +94,78 @@ namespace Home.Controllers //判断测试卡使用次数是否超过限定次数 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)) { + 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){ - //根据折扣设置价格 - var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); + if ((user_Info.agent_id == 0 || (user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0) + { + //根据折扣设置价格 + + var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); var dis_price = 1000000.0M; - foreach(var product in respList) + foreach (var product in respList) { product.Product.Content = "0"; - product.Packages.ForEach(m => { + product.Packages.ForEach(m => + { if (discount != null) { dis_price = m.LinePrice * discount.discount / 100; } - if(dis_price { + product.Packages.ForEach(m => + { m.Title = "0"; var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId); @@ -158,48 +173,57 @@ 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)){ + if (mogu_jihu == 0 && (m.Id == 1188 || m.Id == 1194 || m.Id == 1200)) + { m.Price = 0.1M; } - if (jgday == 0 && (m.Id==1215 || m.Id==1221 || m.Id==1227)){ + if (jgday == 0 && (m.Id == 1215 || m.Id == 1221 || m.Id == 1227)) + { m.Price = 0.1M; } //判断测试卡是否收费 - if (test_flag && (m.IsTest == 1)) { + if (test_flag && (m.IsTest == 1)) + { m.Price = 1.0M; - m.IsTest =0; + m.IsTest = 0; } }); - + //判断测试卡是否收费 - if (test_flag) { + if (test_flag) + { product.Product.Content = "1"; } - } + } } - } else { - foreach(var product in respList) + } + else + { + foreach (var product in respList) { product.Product.Content = "0"; - product.Packages.ForEach(m => { + product.Packages.ForEach(m => + { m.Title = "0"; - - - if (m.Id == 1012 || m.Id==1188 || m.Id==1194 || m.Id==1200 || m.Id==1215 || m.Id==1221 || m.Id==1227){ - m.Price = 0.1M; - } + + + if (m.Id == 1012 || m.Id == 1188 || m.Id == 1194 || m.Id == 1200 || m.Id == 1215 || m.Id == 1221 || m.Id == 1227) + { + m.Price = 0.1M; + } }); - } + } } return View(respList); } - [HttpPost,UserAuth] - public async Task CreateOrder([FromBody]CreateOrderRequest request) + [HttpPost, UserAuth] + public async Task CreateOrder([FromBody] CreateOrderRequest request) { var userId = this.Request.GetUserInfo().UserId; var ret = await m_ProductOrderService.CreateOrder(request, userId); @@ -216,7 +240,7 @@ namespace Home.Controllers var data = new OrderPayModel() { OrderInfo = ret.Data, - }; + }; if (ret.Data.PayType == PayType.Wechat) { var url = await CreateWxPayOrder(ret.Data); @@ -231,8 +255,8 @@ namespace Home.Controllers return new ApiResult(data); } - [HttpPost,AllowAnonymous] - public async Task ApiCreateOrder([FromBody]CreateOrderRequest request) + [HttpPost, AllowAnonymous] + public async Task ApiCreateOrder([FromBody] CreateOrderRequest request) { request.UseAccountAmount = 1; request.CouponId = 0; @@ -251,7 +275,7 @@ namespace Home.Controllers } if (ret.Data.OtherPayAmount == 0) { - await m_ProductOrderService.ApiProcessOrderAccount(ret.Data,"api开通"); + await m_ProductOrderService.ApiProcessOrderAccount(ret.Data, "api开通"); return new ApiResult("00"); } @@ -269,7 +293,7 @@ namespace Home.Controllers Key = Wx_MchKey }; var createOrderRes = ""; - var pName=request.Accounts.Split(",").FirstOrDefault(); + var pName = request.Accounts.Split(",").FirstOrDefault(); var oName = $"{request.ProductName}-{request.PackageName}"; if (pName.Has()) oName = $"{oName}-{pName}"; if (request.PayChannel == PayChannel.WxPc) @@ -285,7 +309,7 @@ namespace Home.Controllers TenantId = 1157, TotalFee = (int)(request.OtherPayAmount * 100), ProductId = request.ProductId.ToString(), - TimeExpire=DateTime.Now.AddMinutes(15).ToString("yyyyMMddHHmmss") + TimeExpire = DateTime.Now.AddMinutes(15).ToString("yyyyMMddHHmmss") }; createOrderRes = await m_WxPayClient.ScanPayCreateOrderAsync(payRequest, mchInfo); } @@ -361,13 +385,13 @@ namespace Home.Controllers string TransactionId = payData["transaction_id"]; - var order = await m_ProductOrderService.GetOrderByNo(orderId); - if(order.OrderState== OrderStatus.Complete|| order.OrderState == OrderStatus.PayOk) + var order = await m_ProductOrderService.GetOrderByNo(orderId); + if (order.OrderState == OrderStatus.Complete || order.OrderState == OrderStatus.PayOk) return SuccessXml(); var queryRet = await m_WxPayClient.OrderQuery(new WxJsPayOrderQueryRequest() { - AppId = Wx_AppId, + AppId = Wx_AppId, NonceStr = payData.GenerateNonceStr(), TransactionId = TransactionId }, new MchInfo() { MchId = Wx_MchId, Key = Wx_MchKey }); @@ -420,10 +444,10 @@ namespace Home.Controllers { Body = request.PackageName, Subject = oName, - TotalAmount = decimal.Round(decimal.Parse(request.OtherPayAmount.ToString()),2).ToString(), + TotalAmount = decimal.Round(decimal.Parse(request.OtherPayAmount.ToString()), 2).ToString(), OutTradeNo = request.OrderNo, ProductCode = "FAST_INSTANT_TRADE_PAY",//QUICK_WAP_PAY - TimeoutExpress="15m" + TimeoutExpress = "15m" }; AlipayTradePagePayRequest aliRequest = new AlipayTradePagePayRequest(); @@ -448,7 +472,7 @@ namespace Home.Controllers ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; callBackUrl = m_Configuration["Aliyun:PayH5:NotifyUrl"]; - ReturnUrl = m_Configuration["Aliyun:PayH5:ReturnUrl"]; + ReturnUrl = m_Configuration["Aliyun:PayH5:ReturnUrl"]; // 组装业务参数model AlipayTradeWapPayModel model = new AlipayTradeWapPayModel @@ -458,7 +482,7 @@ namespace Home.Controllers TotalAmount = request.OtherPayAmount.ToString(), OutTradeNo = request.OrderNo, ProductCode = "QUICK_WAP_PAY", - QuitUrl =this.Request.GetUrl(), + QuitUrl = this.Request.GetUrl(), TimeoutExpress = "15m" }; @@ -500,7 +524,7 @@ namespace Home.Controllers if (flag) { var ordereNo = sArray["out_trade_no"]; - // var order = await m_ProductOrderService.GetOrderByNo(ordereNo); + // var order = await m_ProductOrderService.GetOrderByNo(ordereNo); Console.WriteLine($"同步验证通过，订单号：{sArray["out_trade_no"]}"); ViewData["PayResult"] = "同步验证通过"; } @@ -523,11 +547,11 @@ namespace Home.Controllers 4、验证app_id是否为该商户本身。 */ Dictionary sArray = GetRequestPost(); - + LogHelper.Info("AliNotify", AlipaySignature.GetSignContent(sArray)); if (sArray.Count != 0) { - // bool flag = AlipaySignature.RSA2Check(sArray, ALIPAY_PUBLIC_KEY); + // bool flag = AlipaySignature.RSA2Check(sArray, ALIPAY_PUBLIC_KEY); bool flag = AlipaySignature.RSACheckV2(sArray, ALIPAY_PUBLIC_KEY, "utf-8", "RSA2", false); if (flag) { @@ -543,13 +567,14 @@ namespace Home.Controllers { var ordereNo = sArray["out_trade_no"]; var trade_status = sArray["trade_status"]; - if (trade_status == "TRADE_SUCCESS") { + if (trade_status == "TRADE_SUCCESS") + { var order = await m_ProductOrderService.GetOrderByNo(ordereNo); - if (order.OrderState == OrderStatus.Complete|| order.OrderState == OrderStatus.PayOk) + if (order.OrderState == OrderStatus.Complete || order.OrderState == OrderStatus.PayOk) { await Response.WriteAsync("success"); return; - } + } order.OrderState = OrderStatus.PayOk; order.TradeNo = sArray["trade_no"]; @@ -561,12 +586,13 @@ namespace Home.Controllers } await Response.WriteAsync("success"); - }catch(Exception ex) + } + catch (Exception ex) { LogHelper.Error("AliNotify.Exception", ex.Message); await Response.WriteAsync("fail"); } - + } else { @@ -588,7 +614,7 @@ namespace Home.Controllers 2、判断total_amount是否确实为该订单的实际金额（即商户订单创建时的金额）， 3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email） 4、验证app_id是否为该商户本身。 - */ + */ ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; @@ -642,14 +668,15 @@ namespace Home.Controllers { var ordereNo = sArray["out_trade_no"]; var trade_status = sArray["trade_status"]; - if (trade_status == "TRADE_SUCCESS") { + if (trade_status == "TRADE_SUCCESS") + { var order = await m_ProductOrderService.GetOrderByNo(ordereNo); if (order.OrderState == OrderStatus.Complete || order.OrderState == OrderStatus.PayOk) { await Response.WriteAsync("success"); return; } - + order.OrderState = OrderStatus.PayOk; order.TradeNo = sArray["trade_no"]; @@ -731,10 +758,13 @@ namespace Home.Controllers var userId = this.Request.GetUserInfo().UserId; var product = new ProductEntity(); var package = new ProductPackageEntity(); - if (id==1034||id==1040){ + if (id == 1034 || id == 1040) + { package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); - } else { + } + else + { product = await m_ProductService.GetById(id); package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); } @@ -754,10 +784,13 @@ 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||id==1115||id==1121||id==1127||id==1133||id==1187||id==1193||id==1199){ + 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 || id == 1187 || id == 1193 || id == 1199) + { package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); - } else { + } + else + { product = await m_ProductService.GetById(id); package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); } @@ -803,14 +836,14 @@ namespace Home.Controllers [HttpGet, AllowAnonymous] public async Task IsPay(string orderNo) { - var orderInfo=await m_ProductOrderService.GetOrderByNo(orderNo); + var orderInfo = await m_ProductOrderService.GetOrderByNo(orderNo); if (orderInfo.OrderState == OrderStatus.PayOk || orderInfo.OrderState == OrderStatus.Complete) return new ApiResult(1); else return new ApiResult(0); } - [HttpGet,UserAuth] + [HttpGet, UserAuth] public async Task Buy(int id) { var userId = this.Request.GetUserInfo().UserId; @@ -819,42 +852,50 @@ namespace Home.Controllers //从user表获取用户信息 var user_Info = await m_UserService.GetById(userId); - var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; + var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; var mogu_jihu = user_Info.Sex; var jgday = user_Info.jgday; 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){ - //根据折扣设置价格 - var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); + if ((user_Info.agent_id == 0 || (user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0) + { + //根据折扣设置价格 + var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); if (discount != null) { dis_price = package.LinePrice * discount.discount / 100; } - } else { - //根据会员价 + } + else + { + //根据会员价 var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(package.Id, userId); if (userPrice != null && userPrice.UserPrice > 0) { dis_price = userPrice.UserPrice; } } - if(dis_price ReBuyIndex(string accounts,int productId=0) + public async Task ReBuyIndex(string accounts, int productId = 0) { - + ViewBag.accounts = ""; ViewBag.errorTip = ""; @@ -880,14 +921,15 @@ namespace Home.Controllers ViewBag.errorTip = "请选择账号"; return View(model); } - + var accountList = await m_ProductAccountService.GetAccounts(accounts); var flag = true; - if (productId == 26 || productId == 14) { - flag =await m_ProductAccountService.CheckAccountagentExist(productId, accounts.Split(',').ToList()); + if (productId == 26 || productId == 14) + { + flag = await m_ProductAccountService.CheckAccountagentExist(productId, accounts.Split(',').ToList()); } - + if (productId > 0) accountList = accountList.Where(m => m.ProductId == productId).ToList(); @@ -907,66 +949,82 @@ namespace Home.Controllers //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag = 0; var pro_type_temp = 0; - if (productId == 14) { + if (productId == 14) + { - - - accountList.ForEach(m => { - - - if (m.PackageId<1034) { + + + accountList.ForEach(m => + { + + + if (m.PackageId < 1034) + { pro_type_flag = 1; } - if (m.PackageId>1034&&m.PackageId<1040) { + if (m.PackageId > 1034 && m.PackageId < 1040) + { pro_type_flag = 2; } - if (m.PackageId>1040&&m.PackageId<1046) { + if (m.PackageId > 1040 && m.PackageId < 1046) + { pro_type_flag = 3; } - - if (pro_type_temp==0){ + + if (pro_type_temp == 0) + { pro_type_temp = pro_type_flag; } - if (pro_type_temp!=pro_type_flag){ + if (pro_type_temp != pro_type_flag) + { ViewBag.errorTip = "天天不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "天天不同类型不能同时续费"){ + + if (ViewBag.errorTip == "天天不同类型不能同时续费") + { return View(model); } } //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag_liebao = 0; var pro_type_temp_liebao = 0; - if (productId == 26) { + if (productId == 26) + { - - - accountList.ForEach(m => { - - - if (m.PackageId<1097) { + + + accountList.ForEach(m => + { + + + if (m.PackageId < 1097) + { pro_type_flag_liebao = 1; } - if (m.PackageId>1096&&m.PackageId<1103) { + if (m.PackageId > 1096 && m.PackageId < 1103) + { pro_type_flag_liebao = 2; } - if (m.PackageId>1103&&m.PackageId<1109) { + if (m.PackageId > 1103 && m.PackageId < 1109) + { pro_type_flag_liebao = 3; } - - if (pro_type_temp_liebao==0){ + + if (pro_type_temp_liebao == 0) + { pro_type_temp_liebao = pro_type_flag_liebao; } - if (pro_type_temp_liebao!=pro_type_flag_liebao){ + if (pro_type_temp_liebao != pro_type_flag_liebao) + { ViewBag.errorTip = "猎豹不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "猎豹不同类型不能同时续费"){ + + if (ViewBag.errorTip == "猎豹不同类型不能同时续费") + { return View(model); } } @@ -974,33 +1032,41 @@ namespace Home.Controllers //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag_jihu = 0; var pro_type_temp_jihu = 0; - if (productId == 29) { + if (productId == 29) + { - - - accountList.ForEach(m => { - - - if (m.PackageId<1193 || m.PackageId>1204&&m.PackageId<1208) { + + + accountList.ForEach(m => + { + + + if (m.PackageId < 1193 || m.PackageId > 1204 && m.PackageId < 1208) + { pro_type_flag_jihu = 1; } - if (m.PackageId>1192&&m.PackageId<1199 || m.PackageId>1207&&m.PackageId<1211) { + if (m.PackageId > 1192 && m.PackageId < 1199 || m.PackageId > 1207 && m.PackageId < 1211) + { pro_type_flag_jihu = 2; } - if (m.PackageId>1199&&m.PackageId<1205 || m.PackageId>1210&&m.PackageId<1214) { + if (m.PackageId > 1199 && m.PackageId < 1205 || m.PackageId > 1210 && m.PackageId < 1214) + { pro_type_flag_jihu = 3; } - - if (pro_type_temp_jihu==0){ + + if (pro_type_temp_jihu == 0) + { pro_type_temp_jihu = pro_type_flag_jihu; } - if (pro_type_temp_jihu!=pro_type_flag_jihu){ + if (pro_type_temp_jihu != pro_type_flag_jihu) + { ViewBag.errorTip = "不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "不同类型不能同时续费"){ + + if (ViewBag.errorTip == "不同类型不能同时续费") + { return View(model); } } @@ -1008,68 +1074,85 @@ namespace Home.Controllers //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag_jiguang = 0; var pro_type_temp_jiguang = 0; - if (productId == 3) { + if (productId == 3) + { - - - accountList.ForEach(m => { - - - if (m.PackageId<1220 || m.PackageId>1232&&m.PackageId<1235) { + + + accountList.ForEach(m => + { + + + if (m.PackageId < 1220 || m.PackageId > 1232 && m.PackageId < 1235) + { pro_type_flag_jiguang = 1; } - if (m.PackageId>1219&&m.PackageId<1226 || m.PackageId>1234&&m.PackageId<1238) { + if (m.PackageId > 1219 && m.PackageId < 1226 || m.PackageId > 1234 && m.PackageId < 1238) + { pro_type_flag_jiguang = 2; } - if (m.PackageId>1225&&m.PackageId<1232 || m.PackageId>1237&&m.PackageId<1241) { + if (m.PackageId > 1225 && m.PackageId < 1232 || m.PackageId > 1237 && m.PackageId < 1241) + { pro_type_flag_jiguang = 3; } - - if (pro_type_temp_jiguang==0){ + + if (pro_type_temp_jiguang == 0) + { pro_type_temp_jiguang = pro_type_flag_jiguang; } - if (pro_type_temp_jiguang!=pro_type_flag_jiguang){ + if (pro_type_temp_jiguang != pro_type_flag_jiguang) + { ViewBag.errorTip = "不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "不同类型不能同时续费"){ + + if (ViewBag.errorTip == "不同类型不能同时续费") + { 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) { + if (productId == 27) + { - accountList.ForEach(m => { - - - if (m.PackageId<1121) { + accountList.ForEach(m => + { + + + if (m.PackageId < 1121) + { pro_type_flag_qilindongtai = 1; } - if (m.PackageId>1121&&m.PackageId<1127) { + if (m.PackageId > 1121 && m.PackageId < 1127) + { pro_type_flag_qilindongtai = 2; } - if (m.PackageId>1127&&m.PackageId<1133) { + if (m.PackageId > 1127 && m.PackageId < 1133) + { pro_type_flag_qilindongtai = 3; } - if (m.PackageId>1133&&m.PackageId<1139) { + if (m.PackageId > 1133 && m.PackageId < 1139) + { pro_type_flag_qilindongtai = 4; } - - - if (pro_type_temp_qilindongtai==0){ + + + if (pro_type_temp_qilindongtai == 0) + { pro_type_temp_qilindongtai = pro_type_flag_qilindongtai; } - if (pro_type_temp_qilindongtai!=pro_type_flag_qilindongtai){ + if (pro_type_temp_qilindongtai != pro_type_flag_qilindongtai) + { ViewBag.errorTip = "麒麟不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "麒麟不同类型不能同时续费"){ + + if (ViewBag.errorTip == "麒麟不同类型不能同时续费") + { return View(model); } } @@ -1077,41 +1160,48 @@ namespace Home.Controllers //0 无状态 1：尊享 2：高级 3：普通 var pro_type_flag_xianfeng = 0; var pro_type_temp_xianfeng = 0; - if (productId == 6) { + if (productId == 6) + { - - - accountList.ForEach(m => { - - - if (m.PackageId<61) { + + + accountList.ForEach(m => + { + + + if (m.PackageId < 61) + { pro_type_flag_xianfeng = 1; } - if (m.PackageId>1108&&m.PackageId<1115) { + if (m.PackageId > 1108 && m.PackageId < 1115) + { pro_type_flag_xianfeng = 2; } - - if (pro_type_temp_xianfeng==0){ + + if (pro_type_temp_xianfeng == 0) + { pro_type_temp_xianfeng = pro_type_flag_xianfeng; } - if (pro_type_temp_xianfeng!=pro_type_flag_xianfeng){ + if (pro_type_temp_xianfeng != pro_type_flag_xianfeng) + { ViewBag.errorTip = "先锋不同类型不能同时续费"; } }); - - if (ViewBag.errorTip == "先锋不同类型不能同时续费"){ + + if (ViewBag.errorTip == "先锋不同类型不能同时续费") + { return View(model); } } - + var respList = await m_ProductService.GetOneProductWithPackage(id); var resp = new ProductWithPackageResponse(); - var return_list = new ProductWithPackageResponse(); + var return_list = new ProductWithPackageResponse(); return_list.Product = respList.Product; var package_temp = new List(); @@ -1120,140 +1210,189 @@ namespace Home.Controllers if (userInfo != null) { - if (productId == 28) { + if (productId == 28) + { var package_type = ""; - if(package_name.Contains("-")){ + if (package_name.Contains("-")) + { string[] arrStr = package_name.Split('-'); package_type = arrStr[0] + "-" + arrStr[1] + "-" + arrStr[2]; } respList.Packages = respList.Packages.Where(m => m.OriginName.Contains(package_type)).ToList(); - + } - + //从user表获取用户信息 var user_Info = await m_UserService.GetById(userInfo.UserId); - if((user_Info.agent_id == 0||(user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0){ - //根据折扣设置价格 + if ((user_Info.agent_id == 0 || (user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0) + { + //根据折扣设置价格 - var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); + var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); var dis_price = 1000000.0M; - respList.Packages.ForEach(m => { + respList.Packages.ForEach(m => + { - - if (discount != null) + + if (discount != null) + { + dis_price = m.LinePrice * discount.discount / 100; + } + if (dis_price < m.Price) + { + m.Price = dis_price; + m.Title = discount.Remark; + } + else + { + m.Title = "9.5"; + if (m.ProductId == 1 || m.ProductId == 2) { - dis_price = m.LinePrice * discount.discount / 100; + m.Title = "7.5"; } - if(dis_price1034&&m.Id<1040) { - package_temp.Add(m); - } - if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) { - package_temp.Add(m); - } - }else if(m.ProductId == 26){ - if (pro_type_temp_liebao ==1 && m.Id<1097) { - package_temp.Add(m); - } - if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) { - package_temp.Add(m); - } - if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { - package_temp.Add(m); - } - }else if(m.ProductId == 29){ - if (pro_type_temp_jihu ==1 && (m.Id<1193 || m.Id>1204&&m.Id<1208)) { - package_temp.Add(m); - } - if (pro_type_temp_jihu ==2 && (m.Id>1192&&m.Id<1199 || m.Id>1207&&m.Id<1211)) { - package_temp.Add(m); - } - if (pro_type_temp_jihu ==3 && (m.Id>1199&&m.Id<1205 || m.Id>1210&&m.Id<1214)) { - package_temp.Add(m); - } - }else if(m.ProductId == 3){ - if (pro_type_temp_jiguang ==1 && (m.Id<1220 || m.Id>1232&&m.Id<1235)) { - package_temp.Add(m); - } - if (pro_type_temp_jiguang ==2 && (m.Id>1219&&m.Id<1226 || m.Id>1234&&m.Id<1238)) { - package_temp.Add(m); - } - if (pro_type_temp_jiguang ==3 && (m.Id>1225&&m.Id<1232 || m.Id>1237&&m.Id<1241)) { - 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); - } - if (pro_type_temp_xianfeng ==2 && m.Id>1108&&m.Id<1115) { - package_temp.Add(m); - } - } else { + 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 if (m.ProductId == 26) + { + if (pro_type_temp_liebao == 1 && m.Id < 1097) + { + package_temp.Add(m); + } + if (pro_type_temp_liebao == 2 && m.Id > 1097 && m.Id < 1103) + { + package_temp.Add(m); + } + if (pro_type_temp_liebao == 3 && m.Id > 1103 && m.Id < 1109) + { + package_temp.Add(m); + } + } + else if (m.ProductId == 29) + { + if (pro_type_temp_jihu == 1 && (m.Id < 1193 || m.Id > 1204 && m.Id < 1208)) + { + package_temp.Add(m); + } + if (pro_type_temp_jihu == 2 && (m.Id > 1192 && m.Id < 1199 || m.Id > 1207 && m.Id < 1211)) + { + package_temp.Add(m); + } + if (pro_type_temp_jihu == 3 && (m.Id > 1199 && m.Id < 1205 || m.Id > 1210 && m.Id < 1214)) + { + package_temp.Add(m); + } + } + else if (m.ProductId == 3) + { + if (pro_type_temp_jiguang == 1 && (m.Id < 1220 || m.Id > 1232 && m.Id < 1235)) + { + package_temp.Add(m); + } + if (pro_type_temp_jiguang == 2 && (m.Id > 1219 && m.Id < 1226 || m.Id > 1234 && m.Id < 1238)) + { + package_temp.Add(m); + } + if (pro_type_temp_jiguang == 3 && (m.Id > 1225 && m.Id < 1232 || m.Id > 1237 && m.Id < 1241)) + { + 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); + } + if (pro_type_temp_xianfeng == 2 && m.Id > 1108 && m.Id < 1115) + { + package_temp.Add(m); + } + } + else + { + package_temp.Add(m); + } - } else { - //根据会员价 + }); + + } + else + { + //根据会员价 var userPrices = await m_ProductUserPriceService.GetProductUserPrice(id, userInfo.UserId); respList.Packages.ForEach(m => { - + m.Title = "9.5"; - if (m.ProductId == 1||m.ProductId == 2){ + if (m.ProductId == 1 || m.ProductId == 2) + { m.Title = "7.5"; } - if (m.ProductId == 18){ + if (m.ProductId == 18) + { m.Title = "7.5"; } - if (m.ProductId == 6||m.ProductId == 5){ + if (m.ProductId == 6 || m.ProductId == 5) + { m.Title = "9"; } - if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + if (m.ProductId == 23 || m.ProductId == 13 || m.ProductId == 14 || m.ProductId == 17) + { m.Title = "8"; } var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id); @@ -1262,73 +1401,104 @@ namespace Home.Controllers m.Price = userPrice.UserPrice; } - if (m.ProductId == 14){ - if (pro_type_temp ==1 && m.Id<1034) { + 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) { + 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) { + if (pro_type_temp == 3 && m.Id > 1040 && m.Id < 1046) + { package_temp.Add(m); } - }else if(m.ProductId == 26){ - if (pro_type_temp_liebao ==1 && m.Id<1097) { + } + else if (m.ProductId == 26) + { + if (pro_type_temp_liebao == 1 && m.Id < 1097) + { package_temp.Add(m); } - if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) { + if (pro_type_temp_liebao == 2 && m.Id > 1097 && m.Id < 1103) + { package_temp.Add(m); } - if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { + if (pro_type_temp_liebao == 3 && m.Id > 1103 && m.Id < 1109) + { package_temp.Add(m); } - }else if(m.ProductId == 29){ - if (pro_type_temp_jihu ==1 && (m.Id<1193 || m.Id>1204&&m.Id<1208)) { + } + else if (m.ProductId == 29) + { + if (pro_type_temp_jihu == 1 && (m.Id < 1193 || m.Id > 1204 && m.Id < 1208)) + { package_temp.Add(m); } - if (pro_type_temp_jihu ==2 && (m.Id>1192&&m.Id<1199 || m.Id>1207&&m.Id<1211)) { + if (pro_type_temp_jihu == 2 && (m.Id > 1192 && m.Id < 1199 || m.Id > 1207 && m.Id < 1211)) + { package_temp.Add(m); } - if (pro_type_temp_jihu ==3 && (m.Id>1199&&m.Id<1205 || m.Id>1210&&m.Id<1214)) { + if (pro_type_temp_jihu == 3 && (m.Id > 1199 && m.Id < 1205 || m.Id > 1210 && m.Id < 1214)) + { package_temp.Add(m); } - }else if(m.ProductId == 3){ - if (pro_type_temp_jiguang ==1 && (m.Id<1220 || m.Id>1232&&m.Id<1235)) { + } + else if (m.ProductId == 3) + { + if (pro_type_temp_jiguang == 1 && (m.Id < 1220 || m.Id > 1232 && m.Id < 1235)) + { package_temp.Add(m); } - if (pro_type_temp_jiguang ==2 && (m.Id>1219&&m.Id<1226 || m.Id>1234&&m.Id<1238)) { + if (pro_type_temp_jiguang == 2 && (m.Id > 1219 && m.Id < 1226 || m.Id > 1234 && m.Id < 1238)) + { package_temp.Add(m); } - if (pro_type_temp_jiguang ==3 && (m.Id>1225&&m.Id<1232 || m.Id>1237&&m.Id<1241)) { + if (pro_type_temp_jiguang == 3 && (m.Id > 1225 && m.Id < 1232 || m.Id > 1237 && m.Id < 1241)) + { package_temp.Add(m); } - }else if(m.ProductId == 27){ - if (pro_type_temp_qilindongtai ==1 && m.Id<1121) { + } + 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) { + 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) { + 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) { + 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) { + } + else if (m.ProductId == 6) + { + if (pro_type_temp_xianfeng == 1 && m.Id < 61) + { package_temp.Add(m); } - if (pro_type_temp_xianfeng ==2 && m.Id>1108&&m.Id<1115) { + if (pro_type_temp_xianfeng == 2 && m.Id > 1108 && m.Id < 1115) + { package_temp.Add(m); } - } else { + } + else + { package_temp.Add(m); } }); } - + } return_list.Packages = package_temp; if (!flag) @@ -1339,7 +1509,7 @@ namespace Home.Controllers return View(return_list); } - [HttpGet,UserAuth] + [HttpGet, UserAuth] public async Task ReBuy(int packageId, string accounts) { var package = await m_ProductPackageService.GetById(packageId); @@ -1360,29 +1530,34 @@ namespace Home.Controllers var user_Info = await m_UserService.GetById(userId); 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){ - //根据折扣设置价格 - var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); + if ((user_Info.agent_id == 0 || (user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0) + { + //根据折扣设置价格 + var discount = await m_ProductPriceSchemeService.GetById(user_Info.discount_id); if (discount != null) { dis_price = package.LinePrice * discount.discount / 100; } - } else { - //根据会员价 + } + else + { + //根据会员价 var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(packageId, userId); if (userPrice != null && userPrice.UserPrice > 0) { dis_price = userPrice.UserPrice; } } - if(dis_price m.UserId == userId && m.DeleteTag==0); + var accountQuery = m_ProductAccountService.Query(m => m.UserId == userId && m.DeleteTag == 0); model.AccountModel.TotalCount = await accountQuery.CountAsync(); model.AccountModel.ExpriedCount = await accountQuery.Where(m => m.EndTime < DateTime.Now).CountAsync(); - var orderQuery= m_OrderService.Query(m => m.UserId == userId); + var orderQuery = m_OrderService.Query(m => m.UserId == userId); var todayOrderQuery = orderQuery.Where(m => (m.CreateTime - DateTime.Now).Days == 0); model.Statistic.TodayExpend = todayOrderQuery.Where(m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete)).Sum(m => m.PaymentAmount); - model.Statistic.TodayRefund = todayOrderQuery.Where(m =>(m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver)).Sum(m => m.RefundAmount); + model.Statistic.TodayRefund = todayOrderQuery.Where(m => (m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver)).Sum(m => m.RefundAmount); - var monthOrderQuery = orderQuery.Where(m =>m.CreateTime.Month== DateTime.Now.Month); + var monthOrderQuery = orderQuery.Where(m => m.CreateTime.Month == DateTime.Now.Month); model.Statistic.MonthExpend = monthOrderQuery.Where(m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete)).Sum(m => m.PaymentAmount); - model.Statistic.MonthRefund = monthOrderQuery.Where(m =>(m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver)).Sum(m => m.RefundAmount); + model.Statistic.MonthRefund = monthOrderQuery.Where(m => (m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver)).Sum(m => m.RefundAmount); var yearOrderQuery = orderQuery.Where(m => (m.CreateTime - DateTime.Now).Days == 0); - model.Statistic.YearExpend= yearOrderQuery.Where(m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete)).Sum(m => m.PaymentAmount); + model.Statistic.YearExpend = yearOrderQuery.Where(m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete)).Sum(m => m.PaymentAmount); var chargeQuery = m_UserScoreService.Query(m => m.UserId == userId); - model.Statistic.TodayCharege = chargeQuery.Where(m =>(m.ScoreType == ScoreType.ManagerAdd || m.ScoreType == ScoreType.TaoBaoAdd) && (m.CreateTime - DateTime.Now).Days == 0).Sum(m => m.ScoreValue); - model.Statistic.MonthCharege = chargeQuery.Where(m => (m.ScoreType == ScoreType.ManagerAdd || m.ScoreType == ScoreType.TaoBaoAdd) && m.CreateTime.Month==DateTime.Now.Year).Sum(m => m.ScoreValue); + model.Statistic.TodayCharege = chargeQuery.Where(m => (m.ScoreType == ScoreType.ManagerAdd || m.ScoreType == ScoreType.TaoBaoAdd) && (m.CreateTime - DateTime.Now).Days == 0).Sum(m => m.ScoreValue); + model.Statistic.MonthCharege = chargeQuery.Where(m => (m.ScoreType == ScoreType.ManagerAdd || m.ScoreType == ScoreType.TaoBaoAdd) && m.CreateTime.Month == DateTime.Now.Year).Sum(m => m.ScoreValue); model.TopNewsModel = await m_ArticleService.GetTop(6, Hncore.Pass.Vpn.Domain.ArticleCatalog.Top); @@ -269,9 +269,9 @@ namespace Home.Controllers LoginCode = request.Phone, Password = request.Pwd, Phone = request.Phone, - Wx=request.Wx, - QQ=request.QQ, - id_code="" + Wx = request.Wx, + QQ = request.QQ, + id_code = "" }; var ret = await m_UserService.Regist(userEntity); @@ -319,7 +319,7 @@ namespace Home.Controllers return new ApiResult(ResultCode.C_Access_Forbidden, "验证码不正确或者过期"); } var user = await m_UserService.GetByPhone(request.Phone); - if (user==null) return new ApiResult(ResultCode.C_Access_Forbidden, "手机号不存在"); + if (user == null) return new ApiResult(ResultCode.C_Access_Forbidden, "手机号不存在"); return await m_UserService.UpdatePwd(user, request.Pwd); } @@ -336,7 +336,7 @@ namespace Home.Controllers // return new ApiResult(ResultCode.C_SUCCESS, "验证码已发送到您的手机"); // } - + /// /// 发送手机验证码 @@ -344,11 +344,11 @@ namespace Home.Controllers /// /// [HttpPost, AllowAnonymous] - public async Task SendPhoneCodevefy(string phone,string key) + public async Task SendPhoneCodevefy(string phone, string key) { - key = $"{key}:{phone}"; - - if (key.StartsWith("User_Code:") &&m_UserService.Exist(m => m.LoginCode == phone || m.Phone == phone)) + key = $"{key}:{phone}"; + + if (key.StartsWith("User_Code:") && m_UserService.Exist(m => m.LoginCode == phone || m.Phone == phone)) { return new ApiResult(ResultCode.C_ALREADY_EXISTS_ERROR, "该手机号已经被注册了"); } @@ -361,7 +361,7 @@ namespace Home.Controllers } code = ValidateCodeHelper.MakeNumCode(4); await RedisHelper.SetAsync(key, code, 60); - var ret = AliSmsService.Send( "SMS_186355045", new { code }, "河南华连网络科技", phone); + var ret = AliSmsService.Send("SMS_186355045", new { code }, "河南华连网络科技", phone); if (ret) { return new ApiResult(ResultCode.C_SUCCESS, "验证码已发送到您的手机"); @@ -370,7 +370,7 @@ namespace Home.Controllers } [HttpPost, UserAuth] - public async Task OrginAccountAuth([FromBody]OriginAccountAuthRequest request) + public async Task OrginAccountAuth([FromBody] OriginAccountAuthRequest request) { var user = this.Request.GetUserInfo(); @@ -381,9 +381,9 @@ namespace Home.Controllers var end = request.StartNum + request.Count; for (var i = request.StartNum; i < end; i++) { - var account = $"{ request.Account}{i}"; - // if (!m_ProductAccountService.Exist(m => m.Account == account))//m.ProductId == request.ProductId && - accounts.Add(account); + var account = $"{request.Account}{i}"; + // if (!m_ProductAccountService.Exist(m => m.Account == account))//m.ProductId == request.ProductId && + accounts.Add(account); } } else @@ -397,12 +397,12 @@ namespace Home.Controllers List error = new List(); foreach (var accountItem in accounts) { - if (m_ProductAccountService.Exist(m =>m.ProductId== request.ProductId&& m.Account == accountItem)) + if (m_ProductAccountService.Exist(m => m.ProductId == request.ProductId && m.Account == accountItem)) { error.Add($"[{accountItem}]已存在"); continue; } - var originModel = await m_AgentService.GetOriginAccountInfo(request.ProductId, accountItem, request.Pwd); + var originModel = await m_AgentService.GetOriginAccountInfo(request.ProductId, accountItem, request.Pwd); if (originModel.Code != ResultCode.C_SUCCESS) { @@ -438,9 +438,9 @@ namespace Home.Controllers [HttpGet] [UserAuth] - public async Task MyOrders([FromQuery]OrderSearchModel request) + public async Task MyOrders([FromQuery] OrderSearchModel request) { - var userId = this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; var orderQuery = m_OrderService.Query(m => m.UserId == userId && m.DeleteTag == 0); orderQuery = orderQuery.Where(m => m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete); @@ -453,7 +453,7 @@ namespace Home.Controllers orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId); } - if (request.PackageId !="0") + if (request.PackageId != "0") { orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); } @@ -465,20 +465,20 @@ namespace Home.Controllers if (request.KeyWord.Has()) { - orderQuery = orderQuery.Where(m =>m.OrderNo.Contains(request.KeyWord)||m.Accounts.Contains(request.KeyWord)); + orderQuery = orderQuery.Where(m => m.OrderNo.Contains(request.KeyWord) || m.Accounts.Contains(request.KeyWord)); } - var data =await orderQuery.OrderByDescending(m => m.Id).ListPagerAsync(request.PageSize, request.PageIndex, true); + var data = await orderQuery.OrderByDescending(m => m.Id).ListPagerAsync(request.PageSize, request.PageIndex, true); return View(data); } [HttpGet] [UserAuth] - public async Task MyRefundOrders([FromQuery]OrderSearchModel request) + public async Task MyRefundOrders([FromQuery] OrderSearchModel request) { var userId = this.Request.GetUserInfo().UserId; var orderQuery = m_OrderService.Query(m => m.UserId == userId); - orderQuery = orderQuery.Where(m => m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver || m.OrderState == OrderStatus.RequestRefund); + orderQuery = orderQuery.Where(m => m.OrderState == OrderStatus.AutoRefundOver || m.OrderState == OrderStatus.UserRefundOver || m.OrderState == OrderStatus.RequestRefund); if (request.OrderType > 0) { orderQuery = orderQuery.Where(m => (int)m.OrderType == request.OrderType); @@ -509,7 +509,7 @@ namespace Home.Controllers [HttpGet] [UserAuth] - public async Task MyAccounts([FromQuery]AccountSearchModel request=null ) + public async Task MyAccounts([FromQuery] AccountSearchModel request = null) { request = request ?? new AccountSearchModel(); var userId = this.Request.GetUserInfo().UserId; @@ -528,15 +528,24 @@ namespace Home.Controllers if (request.ExpiredDay > -100) { - if (request.ExpiredDay > 0){ + if (request.ExpiredDay > 0) + { exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= request.ExpiredDay && m.EndTime > DateTime.Now); - } else if (request.ExpiredDay < 0 && request.ExpiredDay>-4) { + } + else if (request.ExpiredDay < 0 && request.ExpiredDay > -4) + { exp = exp.And(m => Math.Ceiling((DateTime.Now - m.EndTime).Value.TotalDays) <= Math.Abs(request.ExpiredDay) && m.EndTime < DateTime.Now); - } else if (request.ExpiredDay==-4) { + } + else if (request.ExpiredDay == -4) + { exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4); - } else if (request.ExpiredDay==-5) { + } + else if (request.ExpiredDay == -5) + { exp = exp.And(m => m.EndTime > DateTime.Now); - } else if (request.ExpiredDay==-6) { + } + else if (request.ExpiredDay == -6) + { exp = exp.And(m => m.EndTime < DateTime.Now); } exp = exp.And(m => m.PackageName != "测试卡"); @@ -553,14 +562,14 @@ namespace Home.Controllers } //var ret = await m_ProductAccountService.PageDesc(request.PageIndex,request.PageSize, exp,true,m=>m.Id); - var ret = await m_ProductAccountService.Query(exp, true).OrderByDescending(m=>m.Id).QueryPager(1000,1).ToListAsync(); + var ret = await m_ProductAccountService.Query(exp, true).OrderByDescending(m => m.Id).QueryPager(1000, 1).ToListAsync(); return View(ret); } [HttpGet] [UserAuth] - public async Task AssignAddress([FromQuery]AccountSearchModel request=null ) + public async Task AssignAddress([FromQuery] AccountSearchModel request = null) { - + return View(); } @@ -568,8 +577,8 @@ namespace Home.Controllers [UserAuth] public async Task MyCoupons() { - var userId =this.Request.GetUserInfo().UserId; - var model = await m_CouponService.GetUserCoupon(userId); + var userId = this.Request.GetUserInfo().UserId; + var model = await m_CouponService.GetUserCoupon(userId); return View(model); } @@ -577,16 +586,16 @@ namespace Home.Controllers [UserAuth] public IActionResult CashOut() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } - + [HttpGet] [UserAuth] public IActionResult RosOrder() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } @@ -594,21 +603,21 @@ namespace Home.Controllers [UserAuth] public IActionResult jinqiao() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult api() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult upload() - { + { return View(); } @@ -616,42 +625,42 @@ namespace Home.Controllers [UserAuth] public IActionResult MyMoney() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult HttpRecharge() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult HttpPackageList() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult HttpLongterm() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult HttpUseHistory() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } [HttpGet] [UserAuth] public IActionResult HttpWhiteIp() { - var userId =this.Request.GetUserInfo().UserId; + var userId = this.Request.GetUserInfo().UserId; return View(); } @@ -662,7 +671,7 @@ namespace Home.Controllers /// /// [HttpGet, AllowAnonymous] - public IActionResult WebLogin(string redirect="") + public IActionResult WebLogin(string redirect = "") { ViewBag.redirect = redirect; return View("Login"); @@ -680,9 +689,10 @@ namespace Home.Controllers { var notifyOrder = data.FromJsonTo(); var taobaoEntity = notifyOrder.MapTo(); - - if((notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp")||notifyOrder.SellerNick == "强子pptp动态"||notifyOrder.SellerNick == "可乐开发商"){ - + + if ((notifyOrder.SellerNick == "聚ip商城动态ip代理" || notifyOrder.SellerNick == "老鹰动态pptp") || notifyOrder.SellerNick == "强子pptp动态" || notifyOrder.SellerNick == "可乐开发商") + { + taobaoEntity.Phone = "none"; taobaoEntity.SkuPropertiesName = notifyOrder.Orders.FirstOrDefault()?.SkuPropertiesName; @@ -709,7 +719,7 @@ namespace Home.Controllers } // Console.WriteLine("=================================================================="); - + string msg = ""; if (userEntity == null) @@ -720,27 +730,30 @@ namespace Home.Controllers LoginCode = phone, Password = pas_result, Phone = phone, - TaoBao= notifyOrder.BuyerNick, - id_code="" + TaoBao = notifyOrder.BuyerNick, + id_code = "" }; var ret = await m_UserService.Regist(userEntity); - msg = "您好，打开网址：juip.com，登录会员名："+phone+"（"+notifyOrder.Payment+"元已充值到此账户），密码："+pas_result+"。这个会员名和密码不能直接使用，是用来登录官网的。登录后点击网站上方的-产品购买，即可完成开通或续费。在官网购买的账号密码可以直接使用。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; + msg = "您好，打开网址：juip.com，登录会员名：" + phone + "（" + notifyOrder.Payment + "元已充值到此账户），密码：" + pas_result + "。这个会员名和密码不能直接使用，是用来登录官网的。登录后点击网站上方的-产品购买，即可完成开通或续费。在官网购买的账号密码可以直接使用。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; if (ret.Code != ResultCode.C_SUCCESS) return msg; - - } else { + + } + else + { phone = userEntity.Phone; - - if(userEntity.TaoBao == null){ - userEntity.TaoBao= notifyOrder.BuyerNick; + + if (userEntity.TaoBao == null) + { + userEntity.TaoBao = notifyOrder.BuyerNick; await m_UserService.Update(userEntity); } - msg = "您好，"+notifyOrder.Payment+"元已充值到充值到您的会员中,会员号为："+userEntity.LoginCode+"，打开网址：www.juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; - + msg = "您好，" + notifyOrder.Payment + "元已充值到充值到您的会员中,会员号为：" + userEntity.LoginCode + "，打开网址：www.juip.com，登录后点击网站上方的-产品购买，即可完成开通或续费。恭喜您本次获得优惠券（满4元减1元，满20元减3元，满54元减5元，满130元减15元，满490元减30元），各一张。欢迎您多来淘宝下单(人工客服在线时间：上午八点到晚上十一点半)"; + } var amountInfo = new UpdateAmountRequest() { - OperateUserName= phone, + OperateUserName = phone, Amount = decimal.Parse(notifyOrder.Payment), OpAmountType = ScoreType.TaoBaoAdd, UserId = userEntity.Id, @@ -759,7 +772,7 @@ namespace Home.Controllers await m_TaoBaoService.Add(taobaoEntity); - + // await Task.Delay(3000); // Console.WriteLine("==================================================================="); // var send_msg_info = await m_TaoBaoService.SengMsg(notifyOrder.Tid,msg); @@ -777,55 +790,67 @@ namespace Home.Controllers if (refundInfo == null || refundInfo.RefundId.NotHas()) return false; - var his_order= m_TaoBaoService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault(); + var his_order = m_TaoBaoService.Query(m => m.Tid == refundInfo.Tid).FirstOrDefault(); refundInfo.Phone = his_order.Phone; var taobaoEntity = refundInfo.MapTo(); - + await m_TaoBaoRefundService.Add(taobaoEntity); return true; }; - + long aopic = long.Parse(this.Request.Query["aopic"]); string datainfo = this.Request.Form["json"]; var refundInfos = datainfo.FromJsonTo(); LogHelper.Info("淘宝参数回调", $"json={datainfo.ToJson()}"); var info = ""; - if (aopic == 2){ + if (aopic == 2) + { info = await m_TaoBaoService.ReceivedMsg(this.Request, process); - } else if(aopic == 256){//退款 - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); - if (his_order == null){ + } + else if (aopic == 256) + {//退款 + var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); + if (his_order == null) + { info = await m_TaoBaoRefundService.ReceivedRefundMsg(this.Request, refunds); - } else { + } + else + { his_order.status = 0; his_order.RefundFee = refundInfos.RefundFee; his_order.Modified = refundInfos.Modified; await m_TaoBaoRefundService.Update(his_order); } - - }else if(aopic == 65536){//卖家同意退款 - - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); + + } + else if (aopic == 65536) + {//卖家同意退款 + + var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 1; - + await m_TaoBaoRefundService.Update(his_order); - - }else if(aopic == 262144){//拒绝退款 - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); + + } + else if (aopic == 262144) + {//拒绝退款 + var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 2; - + await m_TaoBaoRefundService.Update(his_order); - - }else if(aopic == 32768){//关闭 - var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); + + } + else if (aopic == 32768) + {//关闭 + var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); his_order.status = 3; - + await m_TaoBaoRefundService.Update(his_order); - + } return Content(info); } @@ -847,23 +872,23 @@ namespace Home.Controllers } [HttpPost, UserAuth] - public async Task UpdatePwd([FromBody]UpdatePwdModel request) + public async Task UpdatePwd([FromBody] UpdatePwdModel request) { if (request.NewPwd != request.ConfirmPwd) { - return new ApiResult(ResultCode.C_INVALID_ERROR,"密码不一致"); + return new ApiResult(ResultCode.C_INVALID_ERROR, "密码不一致"); } var ret = await this.m_UserService.UpdatePwd(this.Request.GetUserInfo().UserId, request.OldPwd, request.NewPwd); return ret; } [HttpPost, UserAuth] - public async Task UpdateAccountPwd([FromBody]UpdateAccountPwdRequest request) + public async Task UpdateAccountPwd([FromBody] UpdateAccountPwdRequest request) { - return await m_ProductAccountService.UpdateAccountPwd(request); + return await m_ProductAccountService.UpdateAccountPwd(request); } [HttpPost, AllowAnonymous] - public async Task ApiUpdateAccountPwd([FromBody]UpdateAccountPwdRequest request) + public async Task ApiUpdateAccountPwd([FromBody] UpdateAccountPwdRequest request) { //通过apikey获取用户信息 var userEntity = m_UserService.Query(m => m.apikey == request.apikey).FirstOrDefault(); @@ -871,7 +896,7 @@ namespace Home.Controllers { return new ApiResult(ResultCode.C_INVALID_ERROR, "apikey不正确"); } - return await m_ProductAccountService.ApiUpdateAccountPwd(request,userEntity.Id); + return await m_ProductAccountService.ApiUpdateAccountPwd(request, userEntity.Id); } @@ -927,9 +952,9 @@ namespace Home.Controllers var userInfo = await WxOpenApi.GetUserinfoByWebAccessToken(access_token, openid); - if (userInfo==null) + if (userInfo == null) { - LogHelper.Error("GetUserinfoByWebAccessToken",$"access_token={access_token},openid={openid}"); + LogHelper.Error("GetUserinfoByWebAccessToken", $"access_token={access_token},openid={openid}"); return; } if (userInfo.errcode > 0) @@ -955,7 +980,7 @@ namespace Home.Controllers } var wxUserInfo = await m_WxAppUserService.GetWxUser(appid, userInfo.openid); if (wxUserInfo != null) - { + { var userEntity = await m_UserService.GetById(wxUserInfo.UserId); var loginRet = m_UserService.LoginInternal(userEntity, wxUserInfo); this.HttpContext.Response.Cookies.Append("token", loginRet.Token); @@ -968,7 +993,7 @@ namespace Home.Controllers var loginUrl = $"{baseUrl}User/WebLogin?redirect={returnUrl}"; // returnUrl = UrlHelper.SetUrlParam(returnUrl, "act", "login"); this.Response.Redirect(loginUrl); - } + } } @@ -979,7 +1004,7 @@ namespace Home.Controllers /// [HttpPost, UserAuth] - public async Task CreateOrder([FromBody]CreateOrderRequest request) + public async Task CreateOrder([FromBody] CreateOrderRequest request) { var userId = this.Request.GetUserInfo().UserId; var ret = await m_ChargeService.CreateOrder(request, userId); @@ -993,7 +1018,7 @@ namespace Home.Controllers { OrderInfo = ret.Data, }; - if (ret.Data.PayChannel == UPayChannel.WxH5|| ret.Data.PayChannel == UPayChannel.WxPc||ret.Data.PayChannel == UPayChannel.WxMp) + if (ret.Data.PayChannel == UPayChannel.WxH5 || ret.Data.PayChannel == UPayChannel.WxPc || ret.Data.PayChannel == UPayChannel.WxMp) { var url = await CreateWxPayOrder(ret.Data); data.PayData = url; @@ -1006,7 +1031,7 @@ namespace Home.Controllers } return new ApiResult(data); } - [HttpGet,AllowAnonymous] + [HttpGet, AllowAnonymous] public async Task IsPay(string orderNo) { var orderInfo = await m_ChargeService.GetOrderByNo(orderNo); @@ -1168,12 +1193,12 @@ namespace Home.Controllers #region 阿里支付 private async Task CreateAliPayOrder(UserChargeOrderEntity request) - { + { if (request.PayChannel == UPayChannel.AliPc) { - var Ali_APP_ID = m_Configuration["Aliyun:Pay:AppId"]; - var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:Pay:PrivateKey"]; - var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:Pay:PublicKey"];//支付宝的公钥，而不是应用的公钥 + var Ali_APP_ID = m_Configuration["Aliyun:Pay:AppId"]; + var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:Pay:PrivateKey"]; + var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:Pay:PublicKey"];//支付宝的公钥，而不是应用的公钥 string callBackUrl = m_Configuration["Aliyun:Pay:UNotifyUrl"]; string ReturnUrl = m_Configuration["Aliyun:Pay:UReturnUrl"]; @@ -1206,11 +1231,11 @@ namespace Home.Controllers } else if (request.PayChannel == UPayChannel.AliH5) { - var Ali_APP_ID = m_Configuration["Aliyun:PayH5:AppId"]; - var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:PayH5:PrivateKey"]; - var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; - var callBackUrl = m_Configuration["Aliyun:PayH5:UNotifyUrl"]; - var ReturnUrl = m_Configuration["Aliyun:PayH5:UReturnUrl"]; + var Ali_APP_ID = m_Configuration["Aliyun:PayH5:AppId"]; + var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:PayH5:PrivateKey"]; + var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; + var callBackUrl = m_Configuration["Aliyun:PayH5:UNotifyUrl"]; + var ReturnUrl = m_Configuration["Aliyun:PayH5:UReturnUrl"]; // 组装业务参数model AlipayTradeWapPayModel model = new AlipayTradeWapPayModel @@ -1306,7 +1331,8 @@ namespace Home.Controllers { var ordereNo = sArray["out_trade_no"]; var trade_status = sArray["trade_status"]; - if (trade_status == "TRADE_SUCCESS") { + if (trade_status == "TRADE_SUCCESS") + { var order = await m_ChargeService.GetOrderByNo(ordereNo); if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) { @@ -1353,7 +1379,7 @@ namespace Home.Controllers 3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email） 4、验证app_id是否为该商户本身。 */ - var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; + var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; Dictionary sArray = GetRequestGet(); @@ -1385,7 +1411,7 @@ namespace Home.Controllers 3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email） 4、验证app_id是否为该商户本身。 */ - var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; + var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; Dictionary sArray = GetRequestPost(); LogHelper.Info("AliNotify", AlipaySignature.GetSignContent(sArray)); if (sArray.Count != 0) @@ -1406,7 +1432,8 @@ namespace Home.Controllers { var ordereNo = sArray["out_trade_no"]; var trade_status = sArray["trade_status"]; - if (trade_status == "TRADE_SUCCESS") { + if (trade_status == "TRADE_SUCCESS") + { var order = await m_ChargeService.GetOrderByNo(ordereNo); if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) { @@ -1478,9 +1505,9 @@ namespace Home.Controllers [HttpGet, UserAuth] - public async Task OnLine(int productId,string account) + public async Task OnLine(int productId, string account) { - var data= await m_agentService.OnLine(productId, account); + var data = await m_agentService.OnLine(productId, account); return View(data.Data); } }