【新增】新增微信扫码支付功能,对接PC端。

【新增】增加DTO类库,将逐步完善dto层。
【修复】修复【分类】切换后,切换回来未清零原始数据,导致更新数据重复的问题。
【调整】移除模板库功能,防止出现审核因为模板库页面存在而导致的审核失败。暂将模板库的代码存放到会员QQ群内,方便下载使用。
【调整】代码生成器【Repository.tpl】移除Cache手动增删改,【SqlSugarSetup】增加sqlsugar自动检测增删改后清理二级缓存。
【调整】后端新增秒杀独立组件,用于区分团购及秒杀的差异,首页新增秒杀组件。
【优化】重写首页所有组件样式及接口数据获取效率。
【优化】优化拼团,秒杀,团购,接龙数据获取逻辑,提升列表及详情页面数据获取效率。
【优化】调整拼团,秒杀,团购,服务商品推广海报为新式海报效果。增加服务商品推广海报。
【优化】清理h5相关代码判断,移除h5支付组件,提高响应速度。
【优化】移除小程序前端冗余代码。加快代码执行效率。
This commit is contained in:
大灰灰
2022-10-31 05:28:16 +08:00
parent 6ae59c6af7
commit 81dcf814d1
173 changed files with 4172 additions and 3408 deletions

View File

@@ -14,6 +14,7 @@ using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.DTO;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Model.Entities;
@@ -176,5 +177,71 @@ namespace CoreCms.Net.Repository
#endregion
#region ID数组获取拼团相关信息
/// <summary>
/// 根据规则ID数组获取拼团相关信息
/// </summary>
/// <param name="ruleIds">规则序列</param>
/// <param name="orderByExpression"></param>
/// <param name="orderByType"></param>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public async Task<IPageList<PinTuanListDTO>> GetPinTuanInfos(int[] ruleIds, Expression<Func<PinTuanListDTO, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1, int pageSize = 20)
{
var dt = DateTime.Now;
RefAsync<int> totalCount = 0;
var reuslt = await DbClient.Queryable<CoreCmsPinTuanRule, CoreCmsPinTuanGoods, CoreCmsGoods, CoreCmsProducts>(
(prModel, pgModel, goodModel, productsModel) => new object[]
{
JoinType.Inner, prModel.id ==pgModel.ruleId ,
JoinType.Inner, pgModel.goodsId == goodModel.id,
JoinType.Left, goodModel.id == productsModel.goodsId
})
.Where((prModel, pgModel, goodModel, productsModel) => prModel.isStatusOpen == true && ruleIds.Contains(prModel.id) && prModel.endTime > dt && productsModel.isDefalut == true && productsModel.isDel == false)
.Select((prModel, pgModel, goodModel, productsModel) => new PinTuanListDTO
{
id = prModel.id,
goodsId = pgModel.goodsId,
sortId = prModel.sort,
name = prModel.name,
pinTuanRecordNums = SqlFunc.Subqueryable<CoreCmsOrder>().Where(s => s.objectId == prModel.id).Count(),
buyPinTuanCount = SqlFunc.Subqueryable<CoreCmsOrderItem>()
.LeftJoin<CoreCmsOrder>((sOrderItem, sOrder) => sOrder.orderId == sOrderItem.orderId)
.Where((sOrderItem, sOrder) => sOrderItem.goodsId == pgModel.goodsId
&& sOrder.orderType == (int)GlobalEnumVars.OrderType.PinTuan
&& sOrder.objectId == prModel.id)
.Sum(p => p.nums),
peopleNumber = prModel.peopleNumber,
timestamp = 0,
startStatus = 0,
goodBrief = goodModel.brief,
goodName = goodModel.name,
goodThumbnail = goodModel.image,
goodImages = goodModel.images,
goodStock = productsModel.stock,
goodViewCount = goodModel.viewCount,
goodUnit = goodModel.unit,
mktPrice = productsModel.mktprice,
pinTuanPrice = productsModel.price,
startTime = prModel.startTime,
endTime = prModel.endTime,
discountAmount = prModel.discountAmount,
maxGoodsNums = prModel.maxGoodsNums,
maxNums = prModel.maxNums,
}).MergeTable()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.With(SqlWith.Null).ToPageListAsync(pageIndex, pageSize, totalCount);
var list = new PageList<PinTuanListDTO>(reuslt, pageIndex, pageSize, totalCount);
return list;
}
#endregion
}
}