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

483
Host/Controllers/ProductController.cs
View File

@@ -94,12 +94,14 @@ namespace Home.Controllers
//判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完 //判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完
var test_flag = false; 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; test_flag = true;
} }
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);
@@ -107,50 +109,63 @@ namespace Home.Controllers
foreach (var product in respList) foreach (var product in respList)
{ {
product.Product.Content = "0"; product.Product.Content = "0";
product.Packages.ForEach(m => { product.Packages.ForEach(m =>
{
if (discount != null) if (discount != null)
{ {
dis_price = m.LinePrice * discount.discount / 100; dis_price = m.LinePrice * discount.discount / 100;
} }
if(dis_price<m.Price){ if (dis_price < m.Price)
{
m.Price = dis_price; m.Price = dis_price;
m.Title = discount.Remark; m.Title = discount.Remark;
} else { }
else
{
m.Title = "0"; m.Title = "0";
} }
if(m.Price<m.MinPrice){ if (m.Price < m.MinPrice)
{
m.Price = m.MinPrice; m.Price = m.MinPrice;
} }
if (ExpiredProductAccountCount == 0 && (m.Id == 1012)){ if (ExpiredProductAccountCount == 0 && (m.Id == 1012))
{
m.Price = 0.1M; 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; 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; m.Price = 0.1M;
} }
//判断测试卡是否收费 //判断测试卡是否收费
if (test_flag && (m.IsTest == 1)) { if (test_flag && (m.IsTest == 1))
{
m.Price = 1.0M; m.Price = 1.0M;
m.IsTest = 0; m.IsTest = 0;
} }
}); });
//判断测试卡是否收费 //判断测试卡是否收费
if (test_flag) { if (test_flag)
{
product.Product.Content = "1"; product.Product.Content = "1";
} }
} }
} else { }
else
{
//根据会员价 //根据会员价
var userPrices = await m_ProductUserPriceService.GetProductUserPrice(userInfo.UserId); var userPrices = await m_ProductUserPriceService.GetProductUserPrice(userInfo.UserId);
foreach (var product in respList) foreach (var product in respList)
{ {
product.Product.Content = "0"; product.Product.Content = "0";
product.Packages.ForEach(m => { product.Packages.ForEach(m =>
{
m.Title = "0"; m.Title = "0";
var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId); var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId);
@@ -158,38 +173,47 @@ namespace Home.Controllers
{ {
m.Price = userPrice.UserPrice; m.Price = userPrice.UserPrice;
} }
if (ExpiredProductAccountCount == 0 && (m.Id == 1012)){ if (ExpiredProductAccountCount == 0 && (m.Id == 1012))
{
m.Price = 0.1M; 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; 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; m.Price = 0.1M;
} }
//判断测试卡是否收费 //判断测试卡是否收费
if (test_flag && (m.IsTest == 1)) { if (test_flag && (m.IsTest == 1))
{
m.Price = 1.0M; m.Price = 1.0M;
m.IsTest = 0; m.IsTest = 0;
} }
}); });
//判断测试卡是否收费 //判断测试卡是否收费
if (test_flag) { if (test_flag)
{
product.Product.Content = "1"; product.Product.Content = "1";
} }
} }
} }
} else { }
else
{
foreach (var product in respList) foreach (var product in respList)
{ {
product.Product.Content = "0"; product.Product.Content = "0";
product.Packages.ForEach(m => { product.Packages.ForEach(m =>
{
m.Title = "0"; 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){ 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; m.Price = 0.1M;
} }
}); });
@@ -543,7 +567,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_ProductOrderService.GetOrderByNo(ordereNo); 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)
{ {
@@ -561,7 +586,8 @@ namespace Home.Controllers
} }
await Response.WriteAsync("success"); await Response.WriteAsync("success");
}catch(Exception ex) }
catch (Exception ex)
{ {
LogHelper.Error("AliNotify.Exception", ex.Message); LogHelper.Error("AliNotify.Exception", ex.Message);
await Response.WriteAsync("fail"); await Response.WriteAsync("fail");
@@ -642,7 +668,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_ProductOrderService.GetOrderByNo(ordereNo); 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)
{ {
@@ -731,10 +758,13 @@ namespace Home.Controllers
var userId = this.Request.GetUserInfo().UserId; var userId = this.Request.GetUserInfo().UserId;
var product = new ProductEntity(); var product = new ProductEntity();
var package = new ProductPackageEntity(); var package = new ProductPackageEntity();
if (id==1034||id==1040){ if (id == 1034 || id == 1040)
{
package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync();
product = await m_ProductService.GetById(package.ProductId); product = await m_ProductService.GetById(package.ProductId);
} else { }
else
{
product = await m_ProductService.GetById(id); product = await m_ProductService.GetById(id);
package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); 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 product = new ProductEntity();
var package = new ProductPackageEntity(); 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(); package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync();
product = await m_ProductService.GetById(package.ProductId); product = await m_ProductService.GetById(package.ProductId);
} else { }
else
{
product = await m_ProductService.GetById(id); product = await m_ProductService.GetById(id);
package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync(); package = await m_ProductPackageService.Query(m => m.IsTest == 1 && m.ProductId == id).FirstOrDefaultAsync();
} }
@@ -824,14 +857,17 @@ namespace Home.Controllers
var jgday = user_Info.jgday; var jgday = user_Info.jgday;
var dis_price = 1000000M; 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){ 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);
if (discount != null) if (discount != null)
{ {
dis_price = package.LinePrice * discount.discount / 100; dis_price = package.LinePrice * discount.discount / 100;
} }
} else { }
else
{
//根据会员价 //根据会员价
var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(package.Id, userId); var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(package.Id, userId);
if (userPrice != null && userPrice.UserPrice > 0) if (userPrice != null && userPrice.UserPrice > 0)
@@ -839,22 +875,27 @@ namespace Home.Controllers
dis_price = userPrice.UserPrice; dis_price = userPrice.UserPrice;
} }
} }
if(dis_price<package.Price){ if (dis_price < package.Price)
{
package.Price = dis_price; package.Price = dis_price;
} }
if(package.Price<package.MinPrice){ if (package.Price < package.MinPrice)
{
package.Price = package.MinPrice; package.Price = package.MinPrice;
} }
if (ExpiredProductAccountCount == 0 &&(package.Id == 1012)){ if (ExpiredProductAccountCount == 0 && (package.Id == 1012))
{
package.Price = 0.1M; package.Price = 0.1M;
} }
if (mogu_jihu == 0 &&(package.Id == 1188 || package.Id == 1194 || package.Id == 1200)){ if (mogu_jihu == 0 && (package.Id == 1188 || package.Id == 1194 || package.Id == 1200))
{
package.Price = 0.1M; package.Price = 0.1M;
} }
if (jgday == 0 && (package.Id==1215 || package.Id==1221 || package.Id==1227)){ if (jgday == 0 && (package.Id == 1215 || package.Id == 1221 || package.Id == 1227))
{
package.Price = 0.1M; package.Price = 0.1M;
} }
@@ -884,7 +925,8 @@ namespace Home.Controllers
var accountList = await m_ProductAccountService.GetAccounts(accounts); var accountList = await m_ProductAccountService.GetAccounts(accounts);
var flag = true; var flag = true;
if (productId == 26 || productId == 14) { if (productId == 26 || productId == 14)
{
flag = await m_ProductAccountService.CheckAccountagentExist(productId, accounts.Split(',').ToList()); flag = await m_ProductAccountService.CheckAccountagentExist(productId, accounts.Split(',').ToList());
} }
@@ -907,66 +949,82 @@ namespace Home.Controllers
//0 无状态 1：尊享 2：高级 3：普通 //0 无状态 1：尊享 2：高级 3：普通
var pro_type_flag = 0; var pro_type_flag = 0;
var pro_type_temp = 0; var pro_type_temp = 0;
if (productId == 14) { if (productId == 14)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<1034) { if (m.PackageId < 1034)
{
pro_type_flag = 1; pro_type_flag = 1;
} }
if (m.PackageId>1034&&m.PackageId<1040) { if (m.PackageId > 1034 && m.PackageId < 1040)
{
pro_type_flag = 2; pro_type_flag = 2;
} }
if (m.PackageId>1040&&m.PackageId<1046) { if (m.PackageId > 1040 && m.PackageId < 1046)
{
pro_type_flag = 3; pro_type_flag = 3;
} }
if (pro_type_temp==0){ if (pro_type_temp == 0)
{
pro_type_temp = pro_type_flag; pro_type_temp = pro_type_flag;
} }
if (pro_type_temp!=pro_type_flag){ if (pro_type_temp != pro_type_flag)
{
ViewBag.errorTip = "天天不同类型不能同时续费"; ViewBag.errorTip = "天天不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "天天不同类型不能同时续费"){ if (ViewBag.errorTip == "天天不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
//0 无状态 1：尊享 2：高级 3：普通 //0 无状态 1：尊享 2：高级 3：普通
var pro_type_flag_liebao = 0; var pro_type_flag_liebao = 0;
var pro_type_temp_liebao = 0; var pro_type_temp_liebao = 0;
if (productId == 26) { if (productId == 26)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<1097) { if (m.PackageId < 1097)
{
pro_type_flag_liebao = 1; pro_type_flag_liebao = 1;
} }
if (m.PackageId>1096&&m.PackageId<1103) { if (m.PackageId > 1096 && m.PackageId < 1103)
{
pro_type_flag_liebao = 2; pro_type_flag_liebao = 2;
} }
if (m.PackageId>1103&&m.PackageId<1109) { if (m.PackageId > 1103 && m.PackageId < 1109)
{
pro_type_flag_liebao = 3; 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; 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 = "猎豹不同类型不能同时续费"; ViewBag.errorTip = "猎豹不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "猎豹不同类型不能同时续费"){ if (ViewBag.errorTip == "猎豹不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
@@ -974,33 +1032,41 @@ namespace Home.Controllers
//0 无状态 1：尊享 2：高级 3：普通 //0 无状态 1：尊享 2：高级 3：普通
var pro_type_flag_jihu = 0; var pro_type_flag_jihu = 0;
var pro_type_temp_jihu = 0; var pro_type_temp_jihu = 0;
if (productId == 29) { if (productId == 29)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<1193 || m.PackageId>1204&&m.PackageId<1208) { if (m.PackageId < 1193 || m.PackageId > 1204 && m.PackageId < 1208)
{
pro_type_flag_jihu = 1; 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; 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; 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; 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 = "不同类型不能同时续费"; ViewBag.errorTip = "不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "不同类型不能同时续费"){ if (ViewBag.errorTip == "不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
@@ -1008,68 +1074,85 @@ namespace Home.Controllers
//0 无状态 1：尊享 2：高级 3：普通 //0 无状态 1：尊享 2：高级 3：普通
var pro_type_flag_jiguang = 0; var pro_type_flag_jiguang = 0;
var pro_type_temp_jiguang = 0; var pro_type_temp_jiguang = 0;
if (productId == 3) { if (productId == 3)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<1220 || m.PackageId>1232&&m.PackageId<1235) { if (m.PackageId < 1220 || m.PackageId > 1232 && m.PackageId < 1235)
{
pro_type_flag_jiguang = 1; 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; 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; 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; 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 = "不同类型不能同时续费"; ViewBag.errorTip = "不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "不同类型不能同时续费"){ if (ViewBag.errorTip == "不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
//0 无状态 1：1m 5m 3：10m 4：20m //0 无状态 1：1m 5m 3：10m 4：20m
var pro_type_flag_qilindongtai = 0; var pro_type_flag_qilindongtai = 0;
var pro_type_temp_qilindongtai = 0; var pro_type_temp_qilindongtai = 0;
if (productId == 27) { if (productId == 27)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<1121) { if (m.PackageId < 1121)
{
pro_type_flag_qilindongtai = 1; pro_type_flag_qilindongtai = 1;
} }
if (m.PackageId>1121&&m.PackageId<1127) { if (m.PackageId > 1121 && m.PackageId < 1127)
{
pro_type_flag_qilindongtai = 2; pro_type_flag_qilindongtai = 2;
} }
if (m.PackageId>1127&&m.PackageId<1133) { if (m.PackageId > 1127 && m.PackageId < 1133)
{
pro_type_flag_qilindongtai = 3; pro_type_flag_qilindongtai = 3;
} }
if (m.PackageId>1133&&m.PackageId<1139) { if (m.PackageId > 1133 && m.PackageId < 1139)
{
pro_type_flag_qilindongtai = 4; 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; 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 = "麒麟不同类型不能同时续费"; ViewBag.errorTip = "麒麟不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "麒麟不同类型不能同时续费"){ if (ViewBag.errorTip == "麒麟不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
@@ -1077,30 +1160,37 @@ namespace Home.Controllers
//0 无状态 1：尊享 2：高级 3：普通 //0 无状态 1：尊享 2：高级 3：普通
var pro_type_flag_xianfeng = 0; var pro_type_flag_xianfeng = 0;
var pro_type_temp_xianfeng = 0; var pro_type_temp_xianfeng = 0;
if (productId == 6) { if (productId == 6)
{
accountList.ForEach(m => { accountList.ForEach(m =>
{
if (m.PackageId<61) { if (m.PackageId < 61)
{
pro_type_flag_xianfeng = 1; pro_type_flag_xianfeng = 1;
} }
if (m.PackageId>1108&&m.PackageId<1115) { if (m.PackageId > 1108 && m.PackageId < 1115)
{
pro_type_flag_xianfeng = 2; 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; 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 = "先锋不同类型不能同时续费"; ViewBag.errorTip = "先锋不同类型不能同时续费";
} }
}); });
if (ViewBag.errorTip == "先锋不同类型不能同时续费"){ if (ViewBag.errorTip == "先锋不同类型不能同时续费")
{
return View(model); return View(model);
} }
} }
@@ -1120,9 +1210,11 @@ namespace Home.Controllers
if (userInfo != null) if (userInfo != null)
{ {
if (productId == 28) { if (productId == 28)
{
var package_type = ""; var package_type = "";
if(package_name.Contains("-")){ if (package_name.Contains("-"))
{
string[] arrStr = package_name.Split('-'); string[] arrStr = package_name.Split('-');
package_type = arrStr[0] + "-" + arrStr[1] + "-" + arrStr[2]; package_type = arrStr[0] + "-" + arrStr[1] + "-" + arrStr[2];
} }
@@ -1134,13 +1226,15 @@ namespace Home.Controllers
//从user表获取用户信息 //从user表获取用户信息
var user_Info = await m_UserService.GetById(userInfo.UserId); 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; var dis_price = 1000000.0M;
respList.Packages.ForEach(m => { respList.Packages.ForEach(m =>
{
@@ -1148,95 +1242,136 @@ namespace Home.Controllers
{ {
dis_price = m.LinePrice * discount.discount / 100; dis_price = m.LinePrice * discount.discount / 100;
} }
if(dis_price<m.Price){ if (dis_price < m.Price)
{
m.Price = dis_price; m.Price = dis_price;
m.Title = discount.Remark; m.Title = discount.Remark;
} else { }
else
{
m.Title = "9.5"; m.Title = "9.5";
if (m.ProductId == 1||m.ProductId == 2){ if (m.ProductId == 1 || m.ProductId == 2)
{
m.Title = "7.5"; m.Title = "7.5";
} }
if (m.ProductId == 18){ if (m.ProductId == 18)
{
m.Title = "7.5"; m.Title = "7.5";
} }
if (m.ProductId == 6||m.ProductId == 5){ if (m.ProductId == 6 || m.ProductId == 5)
{
m.Title = "9"; m.Title = "9";
} }
if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 26||m.ProductId == 17){ if (m.ProductId == 23 || m.ProductId == 13 || m.ProductId == 14 || m.ProductId == 26 || m.ProductId == 17)
{
m.Title = "8"; m.Title = "8";
} }
} }
if(m.Price<m.MinPrice){ if (m.Price < m.MinPrice)
{
m.Price = m.MinPrice; m.Price = m.MinPrice;
} }
if (m.ProductId == 14){ if (m.ProductId == 14)
if (pro_type_temp ==1 && m.Id<1034) { {
if (pro_type_temp == 1 && m.Id < 1034)
{
package_temp.Add(m); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); package_temp.Add(m);
} }
} else { }
else
{
package_temp.Add(m); package_temp.Add(m);
} }
}); });
} else { }
else
{
//根据会员价 //根据会员价
var userPrices = await m_ProductUserPriceService.GetProductUserPrice(id, userInfo.UserId); var userPrices = await m_ProductUserPriceService.GetProductUserPrice(id, userInfo.UserId);
respList.Packages.ForEach(m => respList.Packages.ForEach(m =>
@@ -1244,16 +1379,20 @@ namespace Home.Controllers
m.Title = "9.5"; m.Title = "9.5";
if (m.ProductId == 1||m.ProductId == 2){ if (m.ProductId == 1 || m.ProductId == 2)
{
m.Title = "7.5"; m.Title = "7.5";
} }
if (m.ProductId == 18){ if (m.ProductId == 18)
{
m.Title = "7.5"; m.Title = "7.5";
} }
if (m.ProductId == 6||m.ProductId == 5){ if (m.ProductId == 6 || m.ProductId == 5)
{
m.Title = "9"; 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"; m.Title = "8";
} }
var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id); var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id);
@@ -1262,67 +1401,98 @@ namespace Home.Controllers
m.Price = userPrice.UserPrice; m.Price = userPrice.UserPrice;
} }
if (m.ProductId == 14){ if (m.ProductId == 14)
if (pro_type_temp ==1 && m.Id<1034) { {
if (pro_type_temp == 1 && m.Id < 1034)
{
package_temp.Add(m); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); 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); package_temp.Add(m);
} }
} else { }
else
{
package_temp.Add(m); package_temp.Add(m);
} }
}); });
@@ -1360,14 +1530,17 @@ namespace Home.Controllers
var user_Info = await m_UserService.GetById(userId); var user_Info = await m_UserService.GetById(userId);
var dis_price = 1000000M; 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){ 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);
if (discount != null) if (discount != null)
{ {
dis_price = package.LinePrice * discount.discount / 100; dis_price = package.LinePrice * discount.discount / 100;
} }
} else { }
else
{
//根据会员价 //根据会员价
var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(packageId, userId); var userPrice = await m_ProductUserPriceService.GetPackageUserPrice(packageId, userId);
if (userPrice != null && userPrice.UserPrice > 0) if (userPrice != null && userPrice.UserPrice > 0)
@@ -1375,11 +1548,13 @@ namespace Home.Controllers
dis_price = userPrice.UserPrice; dis_price = userPrice.UserPrice;
} }
} }
if(dis_price<package.Price){ if (dis_price < package.Price)
{
package.Price = dis_price; package.Price = dis_price;
} }
if(package.Price<package.MinPrice){ if (package.Price < package.MinPrice)
{
package.Price = package.MinPrice; package.Price = package.MinPrice;
} }

61
Host/Controllers/UserController.cs
View File

@@ -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 != "测试卡");
@@ -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;
@@ -727,10 +737,13 @@ namespace Home.Controllers
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);
} }
@@ -792,34 +805,46 @@ 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){//退款 }
else if (aopic == 256)
{//退款
var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault(); var his_order = m_TaoBaoRefundService.Query(m => m.Tid == refundInfos.Tid).FirstOrDefault();
if (his_order == null){ 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){//拒绝退款 }
else if (aopic == 262144)
{//拒绝退款
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 = 2; his_order.status = 2;
await m_TaoBaoRefundService.Update(his_order); await m_TaoBaoRefundService.Update(his_order);
}else if(aopic == 32768){//关闭 }
else if (aopic == 32768)
{//关闭
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 = 3; his_order.status = 3;
@@ -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)
{ {
@@ -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)
{ {