wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

格式化代码

Browse Source 
Co-authored-by: luorijun <luorijun@outlook.com>
This commit is contained in:
wmp
2025-10-18 20:12:15 +08:00
parent aeec6dbab6
commit aada71df8a
2 changed files with 646 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

671
Host/Controllers/ProductController.cs
View File

File diff suppressed because it is too large Load Diff

219
Host/Controllers/UserController.cs
View File

@@ -39,7 +39,7 @@ namespace Home.Controllers
{ {
[Controller] [Controller]
[Route("[Controller]/[Action]")] [Route("[Controller]/[Action]")]
public class UserController:Controller public class UserController : Controller
{ {
UserService m_UserService; UserService m_UserService;
ProductAccountService m_ProductAccountService; ProductAccountService m_ProductAccountService;
@@ -68,7 +68,7 @@ namespace Home.Controllers
, Hncore.Pass.BaseInfo.Service.UserScoreService _UserScoreService , Hncore.Pass.BaseInfo.Service.UserScoreService _UserScoreService
, AgentService _AgentService , AgentService _AgentService
, ProductPackageService _PackageService , ProductPackageService _PackageService
,ProductService _ProductService , ProductService _ProductService
, CouponService _CouponService , CouponService _CouponService
, SellerTaoBaoService _TaoBaoService , SellerTaoBaoService _TaoBaoService
, TaoBaoRefundService _TaoBaoRefundService , TaoBaoRefundService _TaoBaoRefundService
@@ -76,7 +76,7 @@ namespace Home.Controllers
, WxAppUserService _WxAppUserService , WxAppUserService _WxAppUserService
, UserChargeOrderService _ChargeService , UserChargeOrderService _ChargeService
, IConfiguration _Configuration , IConfiguration _Configuration
,WxPayClient _WxPayClient , WxPayClient _WxPayClient
, AgentService _agentService , AgentService _agentService
, CouponUserOrginService _CouponUserOrginService) , CouponUserOrginService _CouponUserOrginService)
{ {
@@ -107,28 +107,28 @@ namespace Home.Controllers
var model = new UserHomeModel(); var model = new UserHomeModel();
model.UserModel = await m_UserService.GetById(userId); model.UserModel = await m_UserService.GetById(userId);
var accountQuery = m_ProductAccountService.Query(m => 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.TotalCount = await accountQuery.CountAsync();
model.AccountModel.ExpriedCount = await accountQuery.Where(m => m.EndTime < DateTime.Now).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); 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.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.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); 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); 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.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.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); model.TopNewsModel = await m_ArticleService.GetTop(6, Hncore.Pass.Vpn.Domain.ArticleCatalog.Top);
@@ -269,9 +269,9 @@ namespace Home.Controllers
LoginCode = request.Phone, LoginCode = request.Phone,
Password = request.Pwd, Password = request.Pwd,
Phone = request.Phone, Phone = request.Phone,
Wx=request.Wx, Wx = request.Wx,
QQ=request.QQ, QQ = request.QQ,
id_code="" id_code = ""
}; };
var ret = await m_UserService.Regist(userEntity); var ret = await m_UserService.Regist(userEntity);
@@ -319,7 +319,7 @@ namespace Home.Controllers
return new ApiResult(ResultCode.C_Access_Forbidden, "验证码不正确或者过期"); return new ApiResult(ResultCode.C_Access_Forbidden, "验证码不正确或者过期");
} }
var user = await m_UserService.GetByPhone(request.Phone); 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); return await m_UserService.UpdatePwd(user, request.Pwd);
} }
@@ -344,11 +344,11 @@ namespace Home.Controllers
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost, AllowAnonymous] [HttpPost, AllowAnonymous]
public async Task<ApiResult> SendPhoneCodevefy(string phone,string key) public async Task<ApiResult> SendPhoneCodevefy(string phone, string key)
{ {
key = $"{key}:{phone}"; key = $"{key}:{phone}";
if (key.StartsWith("User_Code:") &&m_UserService.Exist(m => m.LoginCode == phone || m.Phone == phone)) if (key.StartsWith("User_Code:") && m_UserService.Exist(m => m.LoginCode == phone || m.Phone == phone))
{ {
return new ApiResult(ResultCode.C_ALREADY_EXISTS_ERROR, "该手机号已经被注册了"); return new ApiResult(ResultCode.C_ALREADY_EXISTS_ERROR, "该手机号已经被注册了");
} }
@@ -361,7 +361,7 @@ namespace Home.Controllers
} }
code = ValidateCodeHelper.MakeNumCode(4); code = ValidateCodeHelper.MakeNumCode(4);
await RedisHelper.SetAsync(key, code, 60); 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) if (ret)
{ {
return new ApiResult(ResultCode.C_SUCCESS, "验证码已发送到您的手机"); return new ApiResult(ResultCode.C_SUCCESS, "验证码已发送到您的手机");
@@ -370,7 +370,7 @@ namespace Home.Controllers
} }
[HttpPost, UserAuth] [HttpPost, UserAuth]
public async Task<ApiResult> OrginAccountAuth([FromBody]OriginAccountAuthRequest request) public async Task<ApiResult> OrginAccountAuth([FromBody] OriginAccountAuthRequest request)
{ {
var user = this.Request.GetUserInfo(); var user = this.Request.GetUserInfo();
@@ -381,9 +381,9 @@ namespace Home.Controllers
var end = request.StartNum + request.Count; var end = request.StartNum + request.Count;
for (var i = request.StartNum; i < end; i++) for (var i = request.StartNum; i < end; i++)
{ {
var account = $"{ request.Account}{i}"; var account = $"{request.Account}{i}";
// if (!m_ProductAccountService.Exist(m => m.Account == account))//m.ProductId == request.ProductId && // if (!m_ProductAccountService.Exist(m => m.Account == account))//m.ProductId == request.ProductId &&
accounts.Add(account); accounts.Add(account);
} }
} }
else else
@@ -397,12 +397,12 @@ namespace Home.Controllers
List<string> error = new List<string>(); List<string> error = new List<string>();
foreach (var accountItem in accounts) 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}]已存在"); error.Add($"[{accountItem}]已存在");
continue; 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) if (originModel.Code != ResultCode.C_SUCCESS)
{ {
@@ -438,9 +438,9 @@ namespace Home.Controllers
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public async Task<IActionResult> MyOrders([FromQuery]OrderSearchModel request) public async Task<IActionResult> 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); var orderQuery = m_OrderService.Query(m => m.UserId == userId && m.DeleteTag == 0);
orderQuery = orderQuery.Where(m => m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete); 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); orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId);
} }
if (request.PackageId !="0") if (request.PackageId != "0")
{ {
orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId);
} }
@@ -465,15 +465,15 @@ namespace Home.Controllers
if (request.KeyWord.Has()) 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); return View(data);
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public async Task<IActionResult> MyRefundOrders([FromQuery]OrderSearchModel request) public async Task<IActionResult> MyRefundOrders([FromQuery] OrderSearchModel request)
{ {
var userId = this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
@@ -509,7 +509,7 @@ namespace Home.Controllers
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public async Task<IActionResult> MyAccounts([FromQuery]AccountSearchModel request=null ) public async Task<IActionResult> MyAccounts([FromQuery] AccountSearchModel request = null)
{ {
request = request ?? new AccountSearchModel(); request = request ?? new AccountSearchModel();
var userId = this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
@@ -528,15 +528,24 @@ namespace Home.Controllers
if (request.ExpiredDay > -100) 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); 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); 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); 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); 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.EndTime < DateTime.Now);
} }
exp = exp.And(m => m.PackageName != "测试卡"); exp = exp.And(m => m.PackageName != "测试卡");
@@ -553,12 +562,12 @@ namespace Home.Controllers
} }
//var ret = await m_ProductAccountService.PageDesc(request.PageIndex,request.PageSize, exp,true,m=>m.Id); //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); return View(ret);
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public async Task<IActionResult> AssignAddress([FromQuery]AccountSearchModel request=null ) public async Task<IActionResult> AssignAddress([FromQuery] AccountSearchModel request = null)
{ {
return View(); return View();
@@ -568,7 +577,7 @@ namespace Home.Controllers
[UserAuth] [UserAuth]
public async Task<IActionResult> MyCoupons() public async Task<IActionResult> MyCoupons()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
var model = await m_CouponService.GetUserCoupon(userId); var model = await m_CouponService.GetUserCoupon(userId);
return View(model); return View(model);
} }
@@ -577,7 +586,7 @@ namespace Home.Controllers
[UserAuth] [UserAuth]
public IActionResult CashOut() public IActionResult CashOut()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
@@ -586,7 +595,7 @@ namespace Home.Controllers
[UserAuth] [UserAuth]
public IActionResult RosOrder() public IActionResult RosOrder()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
@@ -594,14 +603,14 @@ namespace Home.Controllers
[UserAuth] [UserAuth]
public IActionResult jinqiao() public IActionResult jinqiao()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult api() public IActionResult api()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
@@ -616,42 +625,42 @@ namespace Home.Controllers
[UserAuth] [UserAuth]
public IActionResult MyMoney() public IActionResult MyMoney()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult HttpRecharge() public IActionResult HttpRecharge()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult HttpPackageList() public IActionResult HttpPackageList()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult HttpLongterm() public IActionResult HttpLongterm()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult HttpUseHistory() public IActionResult HttpUseHistory()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
[HttpGet] [HttpGet]
[UserAuth] [UserAuth]
public IActionResult HttpWhiteIp() public IActionResult HttpWhiteIp()
{ {
var userId =this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
return View(); return View();
} }
@@ -662,7 +671,7 @@ namespace Home.Controllers
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet, AllowAnonymous] [HttpGet, AllowAnonymous]
public IActionResult WebLogin(string redirect="") public IActionResult WebLogin(string redirect = "")
{ {
ViewBag.redirect = redirect; ViewBag.redirect = redirect;
return View("Login"); return View("Login");
@@ -681,7 +690,8 @@ namespace Home.Controllers
var notifyOrder = data.FromJsonTo<TaoBaoNotifyModel>(); var notifyOrder = data.FromJsonTo<TaoBaoNotifyModel>();
var taobaoEntity = notifyOrder.MapTo<TaoBaoOrderEntity>(); var taobaoEntity = notifyOrder.MapTo<TaoBaoOrderEntity>();
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.Phone = "none";
taobaoEntity.SkuPropertiesName = notifyOrder.Orders.FirstOrDefault()?.SkuPropertiesName; taobaoEntity.SkuPropertiesName = notifyOrder.Orders.FirstOrDefault()?.SkuPropertiesName;
@@ -720,27 +730,30 @@ namespace Home.Controllers
LoginCode = phone, LoginCode = phone,
Password = pas_result, Password = pas_result,
Phone = phone, Phone = phone,
TaoBao= notifyOrder.BuyerNick, TaoBao = notifyOrder.BuyerNick,
id_code="" id_code = ""
}; };
var ret = await m_UserService.Regist(userEntity); 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; if (ret.Code != ResultCode.C_SUCCESS) return msg;
} else { }
else
{
phone = userEntity.Phone; phone = userEntity.Phone;
if(userEntity.TaoBao == null){ if (userEntity.TaoBao == null)
userEntity.TaoBao= notifyOrder.BuyerNick; {
userEntity.TaoBao = notifyOrder.BuyerNick;
await m_UserService.Update(userEntity); 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() var amountInfo = new UpdateAmountRequest()
{ {
OperateUserName= phone, OperateUserName = phone,
Amount = decimal.Parse(notifyOrder.Payment), Amount = decimal.Parse(notifyOrder.Payment),
OpAmountType = ScoreType.TaoBaoAdd, OpAmountType = ScoreType.TaoBaoAdd,
UserId = userEntity.Id, UserId = userEntity.Id,
@@ -777,7 +790,7 @@ namespace Home.Controllers
if (refundInfo == null || refundInfo.RefundId.NotHas()) if (refundInfo == null || refundInfo.RefundId.NotHas())
return false; 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; refundInfo.Phone = his_order.Phone;
var taobaoEntity = refundInfo.MapTo<TaoBaoRefundEntity>(); var taobaoEntity = refundInfo.MapTo<TaoBaoRefundEntity>();
@@ -792,35 +805,47 @@ namespace Home.Controllers
var refundInfos = datainfo.FromJsonTo<TaoBaoRefundModel>(); var refundInfos = datainfo.FromJsonTo<TaoBaoRefundModel>();
LogHelper.Info("淘宝参数回调", $"json={datainfo.ToJson()}"); LogHelper.Info("淘宝参数回调", $"json={datainfo.ToJson()}");
var info = ""; var info = "";
if (aopic == 2){ if (aopic == 2)
{
info = await m_TaoBaoService.ReceivedMsg(this.Request, process); info = await m_TaoBaoService.ReceivedMsg(this.Request, process);
} else if(aopic == 256){//退款 }
var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); else if (aopic == 256)
if (his_order == null){ {//退款
var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
if (his_order == null)
{
info = await m_TaoBaoRefundService.ReceivedRefundMsg(this.Request, refunds); info = await m_TaoBaoRefundService.ReceivedRefundMsg(this.Request, refunds);
} else { }
else
{
his_order.status = 0; his_order.status = 0;
his_order.RefundFee = refundInfos.RefundFee; his_order.RefundFee = refundInfos.RefundFee;
his_order.Modified = refundInfos.Modified; his_order.Modified = refundInfos.Modified;
await m_TaoBaoRefundService.Update(his_order); await m_TaoBaoRefundService.Update(his_order);
} }
}else if(aopic == 65536){//卖家同意退款 }
else if (aopic == 65536)
{//卖家同意退款
var his_order= m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
his_order.status = 1; his_order.status = 1;
await m_TaoBaoRefundService.Update(his_order); 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; his_order.status = 2;
await m_TaoBaoRefundService.Update(his_order); 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; his_order.status = 3;
@@ -847,23 +872,23 @@ namespace Home.Controllers
} }
[HttpPost, UserAuth] [HttpPost, UserAuth]
public async Task<ApiResult> UpdatePwd([FromBody]UpdatePwdModel request) public async Task<ApiResult> UpdatePwd([FromBody] UpdatePwdModel request)
{ {
if (request.NewPwd != request.ConfirmPwd) 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); var ret = await this.m_UserService.UpdatePwd(this.Request.GetUserInfo().UserId, request.OldPwd, request.NewPwd);
return ret; return ret;
} }
[HttpPost, UserAuth] [HttpPost, UserAuth]
public async Task<ApiResult> UpdateAccountPwd([FromBody]UpdateAccountPwdRequest request) public async Task<ApiResult> UpdateAccountPwd([FromBody] UpdateAccountPwdRequest request)
{ {
return await m_ProductAccountService.UpdateAccountPwd(request); return await m_ProductAccountService.UpdateAccountPwd(request);
} }
[HttpPost, AllowAnonymous] [HttpPost, AllowAnonymous]
public async Task<ApiResult> ApiUpdateAccountPwd([FromBody]UpdateAccountPwdRequest request) public async Task<ApiResult> ApiUpdateAccountPwd([FromBody] UpdateAccountPwdRequest request)
{ {
//通过apikey获取用户信息 //通过apikey获取用户信息
var userEntity = m_UserService.Query(m => m.apikey == request.apikey).FirstOrDefault(); 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 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); 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; return;
} }
if (userInfo.errcode > 0) if (userInfo.errcode > 0)
@@ -979,7 +1004,7 @@ namespace Home.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost, UserAuth] [HttpPost, UserAuth]
public async Task<ApiResult> CreateOrder([FromBody]CreateOrderRequest request) public async Task<ApiResult> CreateOrder([FromBody] CreateOrderRequest request)
{ {
var userId = this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
var ret = await m_ChargeService.CreateOrder(request, userId); var ret = await m_ChargeService.CreateOrder(request, userId);
@@ -993,7 +1018,7 @@ namespace Home.Controllers
{ {
OrderInfo = ret.Data, 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); var url = await CreateWxPayOrder(ret.Data);
data.PayData = url; data.PayData = url;
@@ -1006,7 +1031,7 @@ namespace Home.Controllers
} }
return new ApiResult(data); return new ApiResult(data);
} }
[HttpGet,AllowAnonymous] [HttpGet, AllowAnonymous]
public async Task<ApiResult> IsPay(string orderNo) public async Task<ApiResult> IsPay(string orderNo)
{ {
var orderInfo = await m_ChargeService.GetOrderByNo(orderNo); var orderInfo = await m_ChargeService.GetOrderByNo(orderNo);
@@ -1171,9 +1196,9 @@ namespace Home.Controllers
{ {
if (request.PayChannel == UPayChannel.AliPc) if (request.PayChannel == UPayChannel.AliPc)
{ {
var Ali_APP_ID = m_Configuration["Aliyun:Pay:AppId"]; var Ali_APP_ID = m_Configuration["Aliyun:Pay:AppId"];
var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:Pay:PrivateKey"]; var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:Pay:PrivateKey"];
var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:Pay:PublicKey"];//支付宝的公钥，而不是应用的公钥 var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:Pay:PublicKey"];//支付宝的公钥，而不是应用的公钥
string callBackUrl = m_Configuration["Aliyun:Pay:UNotifyUrl"]; string callBackUrl = m_Configuration["Aliyun:Pay:UNotifyUrl"];
string ReturnUrl = m_Configuration["Aliyun:Pay:UReturnUrl"]; string ReturnUrl = m_Configuration["Aliyun:Pay:UReturnUrl"];
@@ -1206,11 +1231,11 @@ namespace Home.Controllers
} }
else if (request.PayChannel == UPayChannel.AliH5) else if (request.PayChannel == UPayChannel.AliH5)
{ {
var Ali_APP_ID = m_Configuration["Aliyun:PayH5:AppId"]; var Ali_APP_ID = m_Configuration["Aliyun:PayH5:AppId"];
var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:PayH5:PrivateKey"]; var Ali_APP_PRIVATE_KEY = m_Configuration["Aliyun:PayH5:PrivateKey"];
var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"];
var callBackUrl = m_Configuration["Aliyun:PayH5:UNotifyUrl"]; var callBackUrl = m_Configuration["Aliyun:PayH5:UNotifyUrl"];
var ReturnUrl = m_Configuration["Aliyun:PayH5:UReturnUrl"]; var ReturnUrl = m_Configuration["Aliyun:PayH5:UReturnUrl"];
// 组装业务参数model // 组装业务参数model
AlipayTradeWapPayModel model = new AlipayTradeWapPayModel AlipayTradeWapPayModel model = new AlipayTradeWapPayModel
@@ -1306,7 +1331,8 @@ namespace Home.Controllers
{ {
var ordereNo = sArray["out_trade_no"]; var ordereNo = sArray["out_trade_no"];
var trade_status = sArray["trade_status"]; var trade_status = sArray["trade_status"];
if (trade_status == "TRADE_SUCCESS") { if (trade_status == "TRADE_SUCCESS")
{
var order = await m_ChargeService.GetOrderByNo(ordereNo); var order = await m_ChargeService.GetOrderByNo(ordereNo);
if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) 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） 3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email）
4、验证app_id是否为该商户本身。 4、验证app_id是否为该商户本身。
*/ */
var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"];
Dictionary<string, string> sArray = GetRequestGet(); Dictionary<string, string> sArray = GetRequestGet();
@@ -1385,7 +1411,7 @@ namespace Home.Controllers
3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email） 3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email）
4、验证app_id是否为该商户本身。 4、验证app_id是否为该商户本身。
*/ */
var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"]; var ALIPAY_PUBLIC_KEY = m_Configuration["Aliyun:PayH5:PublicKey"];
Dictionary<string, string> sArray = GetRequestPost(); Dictionary<string, string> sArray = GetRequestPost();
LogHelper.Info("AliNotify", AlipaySignature.GetSignContent(sArray)); LogHelper.Info("AliNotify", AlipaySignature.GetSignContent(sArray));
if (sArray.Count != 0) if (sArray.Count != 0)
@@ -1406,7 +1432,8 @@ namespace Home.Controllers
{ {
var ordereNo = sArray["out_trade_no"]; var ordereNo = sArray["out_trade_no"];
var trade_status = sArray["trade_status"]; var trade_status = sArray["trade_status"];
if (trade_status == "TRADE_SUCCESS") { if (trade_status == "TRADE_SUCCESS")
{
var order = await m_ChargeService.GetOrderByNo(ordereNo); var order = await m_ChargeService.GetOrderByNo(ordereNo);
if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk)
{ {
@@ -1478,9 +1505,9 @@ namespace Home.Controllers
[HttpGet, UserAuth] [HttpGet, UserAuth]
public async Task<IActionResult> OnLine(int productId,string account) public async Task<IActionResult> 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); return View(data.Data);
} }
} }