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-02-19

Browse Source 
### 1.3.7 开源社区版：
无
### 0.2.0 会员专业版：
【调整】拆分下单支付单类型，由【订单，充值，服务订单，表单付款码，表单订单】拆分细则为【普通订单，拼团订单，团购订单，秒杀订单，砍价，赠品，接龙，交易组件，充值，服务订单，表单付款码，表单订单】。
【修复】修复拼团，秒杀，团购下单成功但提示“订单支付参数错误”问题。
【新增】商品详情封面图增加【原图上传】，前【上传图片】按钮改为【裁剪上传】。
【新增】商品详情图集增加【原图上传】，前【上传图片】按钮改为【裁剪上传】。
This commit is contained in:
JianWeie
2022-02-19 01:09:21 +08:00
parent 255be5a28f
commit 22cbe5921c
18 changed files with 308 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CoreCms.Net.Repository/Bill/CoreCmsBillPaymentsRepository.cs
View File

@@ -14,11 +14,13 @@ using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModels.UI;
using SqlSugar;
namespace CoreCms.Net.Repository
@@ -35,6 +37,7 @@ namespace CoreCms.Net.Repository
}
/// <summary>
/// 支付单7天统计
/// </summary>
@@ -43,8 +46,10 @@ namespace CoreCms.Net.Repository
{
var dt = DateTime.Now.AddDays(-8);
var types = new int[] { (int)GlobalEnumVars.BillPaymentsType.Common, (int)GlobalEnumVars.BillPaymentsType.PinTuan, (int)GlobalEnumVars.BillPaymentsType.Group, (int)GlobalEnumVars.BillPaymentsType.Skill, (int)GlobalEnumVars.BillPaymentsType.Bargain, (int)GlobalEnumVars.BillPaymentsType.Giveaway, (int)GlobalEnumVars.BillPaymentsType.Solitaire, (int)GlobalEnumVars.BillPaymentsType.TransactionComponent };
var list = await DbClient.Queryable<CoreCmsBillPayments>()
.Where(p => p.createTime >= dt && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed && p.type == (int)GlobalEnumVars.BillPaymentsType.Order)
.Where(p => p.createTime >= dt && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed && types.Contains(p.type))
.Select(it => new
{
it.paymentId,