wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 17:43:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-01-17

Browse Source 
### 1.3.0 开源社区版：
【新增】完善商品查看详情功能。#I4QTLR
【新增】订单详情页面需要增加下单客户信息。
【新增】完善服务订单管理功能，实现订单作废、导出功能；核销码实现列表，作废，导出功能。#I4OSBK
【修复】修复普通订单查看详情，因优惠信息问题导致的异常情况。#I4QXUQ
【修复】修复门店列表下的用户编辑页面名称大小写问题（linux下大小写敏感问题）。
【修复】修复微信支付成功相应的日志记录类型有误。#I4QSNZ
【修复】修复发货日志记录sku货号错误问题。#I4PX25
【修复】修复发货单列表查看详情，提示权限不足的问题。#I4QDQR

### 0.0.8 会员专业版：
【新增】新增接龙功能营销功能，实现单个活动，可以添加多个不同商品的不同sku混合选择下单。
【新增】增加接龙数据库脚本及演示文件。
【升级】升级uView组件到2.0.20版本。
【修复】修复编辑收货地址的路径中选取区域部分可以手动输入文字。
【修复】修复【微信直播带货】组件缺少获取sku分页数据的问题。#I4QKSU
【优化】调整【微信自定义交易组件】商品类目排序方式及展示内容。#I4QE0N
This commit is contained in:
JianWeie
2022-01-17 02:16:00 +08:00
parent 4164e59919
commit 5167b0e096
107 changed files with 7668 additions and 3218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
CoreCms.Net.Repository/Service/CoreCmsUserServicesOrderRepository.cs
View File

@@ -8,9 +8,15 @@
* Description: 暂无
***********************************************************************/
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using SqlSugar;
namespace CoreCms.Net.Repository
{
@@ -23,5 +29,81 @@ namespace CoreCms.Net.Repository
public CoreCmsUserServicesOrderRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
#region 重写根据条件查询分页数据
/// <summary>
/// 重写根据条件查询分页数据
/// </summary>
/// <param name="predicate">判断集合</param>
/// <param name="orderByType">排序方式</param>
/// <param name="pageIndex">当前页面索引</param>
/// <param name="pageSize">分布大小</param>
/// <param name="orderByExpression"></param>
/// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
/// <returns></returns>
public new async Task<IPageList<CoreCmsUserServicesOrder>> QueryPageAsync(Expression<Func<CoreCmsUserServicesOrder, bool>> predicate,
Expression<Func<CoreCmsUserServicesOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
int pageSize = 20, bool blUseNoLock = false)
{
RefAsync<int> totalCount = 0;
List<CoreCmsUserServicesOrder> page;
if (blUseNoLock)
{
page = await DbClient.Queryable<CoreCmsUserServicesOrder, CoreCmsUser, CoreCmsServices>((sOrder, sUser, sService) => new JoinQueryInfos(
JoinType.Left, sOrder.userId == sUser.id, JoinType.Left, sOrder.servicesId == sService.id))
.Select((sOrder, sUser, sService) => new CoreCmsUserServicesOrder
{
id = sOrder.id,
serviceOrderId = sOrder.serviceOrderId,
userId = sOrder.userId,
servicesId = sOrder.servicesId,
isPay = sOrder.isPay,
payTime = sOrder.payTime,
paymentId = sOrder.paymentId,
status = sOrder.status,
createTime = sOrder.createTime,
servicesEndTime = sOrder.servicesEndTime,
serviceTitle = sService.title,
userName = sUser.nickName
})
.With(SqlWith.NoLock)
.MergeTable()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.WhereIF(predicate != null, predicate)
.ToPageListAsync(pageIndex, pageSize, totalCount);
}
else
{
page = await DbClient.Queryable<CoreCmsUserServicesOrder, CoreCmsUser, CoreCmsServices>((sOrder, sUser, sService) => new JoinQueryInfos(
JoinType.Left, sOrder.userId == sUser.id, JoinType.Left, sOrder.servicesId == sService.id))
.Select((sOrder, sUser, sService) => new CoreCmsUserServicesOrder
{
id = sOrder.id,
serviceOrderId = sOrder.serviceOrderId,
userId = sOrder.userId,
servicesId = sOrder.servicesId,
isPay = sOrder.isPay,
payTime = sOrder.payTime,
paymentId = sOrder.paymentId,
status = sOrder.status,
createTime = sOrder.createTime,
servicesEndTime = sOrder.servicesEndTime,
serviceTitle = sService.title,
userName = sUser.nickName
})
.MergeTable()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.WhereIF(predicate != null, predicate)
.ToPageListAsync(pageIndex, pageSize, totalCount);
}
var list = new PageList<CoreCmsUserServicesOrder>(page, pageIndex, pageSize, totalCount);
return list;
}
#endregion
}
}

77
CoreCms.Net.Repository/Service/CoreCmsUserServicesTicketRepository.cs
View File

@@ -8,9 +8,15 @@
* Description: 暂无
***********************************************************************/
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using SqlSugar;
namespace CoreCms.Net.Repository
{
@@ -23,5 +29,76 @@ namespace CoreCms.Net.Repository
public CoreCmsUserServicesTicketRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
#region 重写根据条件查询分页数据
/// <summary>
/// 重写根据条件查询分页数据
/// </summary>
/// <param name="predicate">判断集合</param>
/// <param name="orderByType">排序方式</param>
/// <param name="pageIndex">当前页面索引</param>
/// <param name="pageSize">分布大小</param>
/// <param name="orderByExpression"></param>
/// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
/// <returns></returns>
public new async Task<IPageList<CoreCmsUserServicesTicket>> QueryPageAsync(Expression<Func<CoreCmsUserServicesTicket, bool>> predicate,
Expression<Func<CoreCmsUserServicesTicket, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
int pageSize = 20, bool blUseNoLock = false)
{
RefAsync<int> totalCount = 0;
List<CoreCmsUserServicesTicket> page;
if (blUseNoLock)
{
page = await DbClient.Queryable<CoreCmsUserServicesTicket>()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserServicesTicket
{
id = p.id,
serviceOrderId = p.serviceOrderId,
securityCode = p.securityCode,
redeemCode = p.redeemCode,
serviceId = p.serviceId,
userId = p.userId,
status = p.status,
validityType = p.validityType,
validityStartTime = p.validityStartTime,
validityEndTime = p.validityEndTime,
createTime = p.createTime,
isVerification = p.isVerification,
verificationTime = p.verificationTime,
}).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
}
else
{
page = await DbClient.Queryable<CoreCmsUserServicesTicket>()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserServicesTicket
{
id = p.id,
serviceOrderId = p.serviceOrderId,
securityCode = p.securityCode,
redeemCode = p.redeemCode,
serviceId = p.serviceId,
userId = p.userId,
status = p.status,
validityType = p.validityType,
validityStartTime = p.validityStartTime,
validityEndTime = p.validityEndTime,
createTime = p.createTime,
isVerification = p.isVerification,
verificationTime = p.verificationTime,
}).ToPageListAsync(pageIndex, pageSize, totalCount);
}
var list = new PageList<CoreCmsUserServicesTicket>(page, pageIndex, pageSize, totalCount);
return list;
}
#endregion
}
}