mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-03-23 11:47:20 +08:00
### 0.3.3 专业版:
【新增】后台新增支付单查询功能,实现支付单微信反馈支付数据,防止出现极端情况下,导致的支付数据回调失败而影响订单业务。#I4ZRMR 【新增】后台新增发票上传功能,前端小程序新增发票下载功能。#I4ZYT3 【新增】商家中心订单查询,增加发票下载查看功能。 【新增】代码生成器Controller模板的导出excel请求增加decimal类型的处理。 【优化】调整前端帮助文档默认传值问题,未指定具体分类情况下,默认取第一个栏目数据。 【修复】修复页面设计上传图片后不进行预览的问题。
This commit is contained in:
@@ -8,12 +8,16 @@
|
||||
* Description: 暂无
|
||||
***********************************************************************/
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using CoreCms.Net.Auth.HttpContextUser;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using CoreCms.Net.Model.Entities.Expression;
|
||||
using CoreCms.Net.Model.FromBody;
|
||||
using CoreCms.Net.Model.ViewModels.UI;
|
||||
using Essensoft.Paylink.Alipay.Domain;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SqlSugar;
|
||||
|
||||
@@ -77,25 +81,37 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
{
|
||||
var jm = new WebApiCallBack();
|
||||
|
||||
var list = await _articleServices.QueryPageAsync(p => p.isDel == false && p.typeId == entity.id, p => p.createTime, OrderByType.Desc,
|
||||
entity.page, entity.limit);
|
||||
|
||||
var articleType = await _articleTypeServices.QueryAsync();
|
||||
var typeName = string.Empty;
|
||||
if (articleType.Any())
|
||||
{
|
||||
var type = articleType.Find(p => p.id == entity.id);
|
||||
typeName = type != null ? type.name : "";
|
||||
var where = PredicateBuilder.True<Model.Entities.CoreCmsArticle>();
|
||||
if (entity.id > 0)
|
||||
{
|
||||
where = where.And(p => p.isDel == false && p.typeId == entity.id);
|
||||
}
|
||||
else
|
||||
{
|
||||
var typeId = articleType.FirstOrDefault()!.id;
|
||||
where = where.And(p => p.isDel == false && p.typeId == typeId);
|
||||
}
|
||||
var list = await _articleServices.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, entity.page, entity.limit);
|
||||
jm.data = new
|
||||
{
|
||||
list,
|
||||
articleType,
|
||||
count = list.TotalCount
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
jm.data = new
|
||||
{
|
||||
list = new List<CoreCmsArticle>(),
|
||||
articleType,
|
||||
count = 0
|
||||
};
|
||||
}
|
||||
jm.status = true;
|
||||
jm.data = new
|
||||
{
|
||||
list,
|
||||
articleType,
|
||||
type_name = typeName,
|
||||
count = list.TotalCount
|
||||
};
|
||||
|
||||
return jm;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user