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

手机端页面修改

Browse Source
This commit is contained in:
“wanyongkang”
2023-08-26 17:31:44 +08:00
parent ebe53896fe
commit a4b0f2e5c5
22 changed files with 1312 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Host/Controllers/ActicleController.cs
View File

@@ -64,9 +64,24 @@ namespace Home.Controllers
return View(ret);
}
[HttpGet]
public async Task<IActionResult> Info(int id)
{
var prev = await m_ArticleServce.Query(m => m.Id < id).OrderByDescending(m => m.Id).FirstOrDefaultAsync();
var ret = await m_ArticleServce.GetById(id);
var next = await m_ArticleServce.Query(m => m.Id > id).OrderBy(m => m.Id).FirstOrDefaultAsync();
return View(new ArticleInfoMode()
{
Prev = prev,
Info = ret,
Next = next
});
}
[HttpGet]
public async Task<ApiResult> Info(int id)
public async Task<ApiResult> Infoapi(int id)
{
var prev = await m_ArticleServce.Query(m => m.Id < id).OrderByDescending(m => m.Id).FirstOrDefaultAsync();
var ret = await m_ArticleServce.GetById(id);

29
Host/Controllers/ProductController.cs
View File

@@ -527,20 +527,23 @@ namespace Home.Controllers
try
{
var ordereNo = sArray["out_trade_no"];
var order = await m_ProductOrderService.GetOrderByNo(ordereNo);
if (order.OrderState == OrderStatus.Complete|| order.OrderState == OrderStatus.PayOk)
{
await Response.WriteAsync("success");
return;
}
var trade_status = sArray["trade_status"];
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"];
order.UpdateTime = DateTime.Now;
await m_ProductOrderService.Update(order);
await m_ProductOrderService.ProcessOrderAccount(order);
order.OrderState = OrderStatus.PayOk;
order.TradeNo = sArray["trade_no"];
order.UpdateTime = DateTime.Now;
await m_ProductOrderService.Update(order);
await m_ProductOrderService.ProcessOrderAccount(order);
Console.WriteLine(Request.Form["trade_status"]);
Console.WriteLine(Request.Form["trade_status"]);
}
await Response.WriteAsync("success");
}catch(Exception ex)
@@ -733,7 +736,7 @@ namespace Home.Controllers
{
var product = new ProductEntity();
var package = new ProductPackageEntity();
if (id==1034||id==1040){
if (id==1034||id==1040||id==89){
package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync();
product = await m_ProductService.GetById(package.ProductId);
} else {

30
Host/Controllers/UserController.cs
View File

@@ -1239,21 +1239,24 @@ namespace Home.Controllers
try
{
var ordereNo = sArray["out_trade_no"];
var order = await m_ChargeService.GetOrderByNo(ordereNo);
if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk)
{
await Response.WriteAsync("success");
return;
var trade_status = sArray["trade_status"];
if (trade_status == "TRADE_SUCCESS") {
var order = await m_ChargeService.GetOrderByNo(ordereNo);
if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk)
{
await Response.WriteAsync("success");
return;
}
order.OrderState = UOrderStatus.PayOk;
order.TradeNo = sArray["trade_no"];
order.UpdateTime = DateTime.Now;
await m_ChargeService.Update(order);
await m_ChargeService.ProcessOrderAccount(order);
Console.WriteLine(Request.Form["trade_status"]);
}
order.OrderState = UOrderStatus.PayOk;
order.TradeNo = sArray["trade_no"];
order.UpdateTime = DateTime.Now;
await m_ChargeService.Update(order);
await m_ChargeService.ProcessOrderAccount(order);
Console.WriteLine(Request.Form["trade_status"]);
await Response.WriteAsync("success");
}
catch (Exception ex)
@@ -1409,7 +1412,6 @@ namespace Home.Controllers
public async Task<IActionResult> OnLine(int productId,string account)
{
var data= await m_agentService.OnLine(productId, account);
return View(data.Data);
}
}