mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 19:13:26 +08:00
### 0.6.0 专业版(大版本升级,破坏性升级,请酌情处理):
【新增】弃用现在sku前端,启用全新sku组件,更加灵活,体验更好。 【新增】新增通过商品序列获取sku全新列表功能。 【新增】仓储层底层增加二级缓存功能,后面将逐步完善底层缓存中心模块。 【新增】0元购,积分兑换模式下,也去计算用户是否科技升级。 【新增】数据及业务仓储增加二级缓存功能。curd可自主控制是否缓存和清除。 【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。 【新增】自定义交易组件增加【获取商家信息】【更新商家信息】两个接口处理。 【新增】增加公告列表及公告详情页面,首页组件公告点击跳转列表展示。 【新增】个人中心增加【公告中心】入口。 【新增】后台余额变动增加说明录入。 【调整】将前端能进行分包的文件夹都进行分包,减少主包占用,方便进行二开。 【调整】因ckeditor5存在图片不可设置宽度,上传不支持mp4,排版不畅等情况,降级使用ckeditor4版本。 【修复】修复0.5.5版本售后积分返还机制积分模式判断异常的问题。 【修复】修复使用积分全额抵扣,或其他优惠政策导致的0元购,未进行短信提醒及小票打印机未打印的问题。 【修复】修复更换ckeditor4编辑器后接龙添加编辑调用失败的问题。 【修复】修复积分全额抵扣,金额0元购的情况下,进行售后执行完毕,订单未完结的情况。 【优化】去除分销申请面板按钮无用并失效报错的customStyle属性。 【优化】优化部分方法中使用手写字符串的遗留问题,统一采用enum方式。 【优化】优化前端及接口部分命名错误的问题。错将skill误写成seckill。 【优化】去除uniapp端多个客服代码。 【优化】商品详情底部完善购物车数量显示的问题。 【优化】优化团购列表,拼团列表,秒杀页面页面样式布局差异问题。 【优化】调整支付结果界面样式效果,仿微信支付结果界面。更加清晰明朗。 【优化】优化售后提交页面json计算,开放当用户下单后但未发货情况下,可以申请直接售后的操作需求。 【优化】后台商家手机号码支持设置多个,使用小写逗号分隔,方便多个商家管理员接收下单提醒。 【优化】后台售后单审核,调整售后商品为必选项。
This commit is contained in:
@@ -68,7 +68,7 @@ namespace CoreCms.Net.Services
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var list = await _dal.QueryListByClauseAsync(p => ids.Contains(p.id));
|
||||
var list = await _dal.QueryListByClauseAsync(p => ids.Contains(p.id) && p.status == false);
|
||||
if (list.Any())
|
||||
{
|
||||
foreach (var item in list)
|
||||
@@ -101,7 +101,7 @@ namespace CoreCms.Net.Services
|
||||
|
||||
var clerks = await _clerkRepository.QueryListByClauseAsync(p => p.userId == userId);
|
||||
var storeIds = clerks.Select(p => p.storeId).ToList();
|
||||
var ladingList = await _dal.QueryPageAsync(p => storeIds.Contains(p.storeId) && p.isDel == false, p => p.status, OrderByType.Asc, page, limit);
|
||||
var ladingList = await _dal.QueryPageAsync(p => storeIds.Contains(p.storeId) && p.isDel == false, p => p.createTime, OrderByType.Desc, page, limit);
|
||||
|
||||
|
||||
jm.status = true;
|
||||
@@ -182,7 +182,7 @@ namespace CoreCms.Net.Services
|
||||
{
|
||||
var jm = new WebApiCallBack();
|
||||
|
||||
var list = await _dal.QueryListByClauseAsync(p => p.id == id || p.orderId == id || p.mobile == id);
|
||||
var list = await _dal.QueryListByClauseAsync(p => p.id.Contains(id) || p.orderId.Contains(id) || p.mobile.Contains(id), p => p.createTime, OrderByType.Desc);
|
||||
var data = new List<CoreCmsBillLading>();
|
||||
if (list != null)
|
||||
{
|
||||
|
||||
@@ -119,7 +119,7 @@ namespace CoreCms.Net.Services
|
||||
if (type == (int)GlobalEnumVars.BillPaymentsType.Common
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.PinTuan
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Group
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Skill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Seckill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Bargain
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Giveaway
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Solitaire
|
||||
@@ -275,7 +275,7 @@ namespace CoreCms.Net.Services
|
||||
if (type == (int)GlobalEnumVars.BillPaymentsType.Common
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.PinTuan
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Group
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Skill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Seckill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Bargain
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Giveaway
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Solitaire
|
||||
@@ -666,7 +666,7 @@ namespace CoreCms.Net.Services
|
||||
if (billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Common
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.PinTuan
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Group
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Skill
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Seckill
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Bargain
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Giveaway
|
||||
|| billPaymentInfo.type == (int)GlobalEnumVars.BillPaymentsType.Solitaire
|
||||
@@ -752,7 +752,7 @@ namespace CoreCms.Net.Services
|
||||
if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Common
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.PinTuan
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Group
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Skill
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Seckill
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Bargain
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Giveaway
|
||||
|| entity.type == (int)GlobalEnumVars.BillPaymentsType.Solitaire
|
||||
@@ -812,7 +812,7 @@ namespace CoreCms.Net.Services
|
||||
if (type == (int)GlobalEnumVars.BillPaymentsType.Common
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.PinTuan
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Group
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Skill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Seckill
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Bargain
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Giveaway
|
||||
|| type == (int)GlobalEnumVars.BillPaymentsType.Solitaire
|
||||
@@ -870,7 +870,7 @@ namespace CoreCms.Net.Services
|
||||
/// <param name="orderByExpression"></param>
|
||||
/// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
|
||||
/// <returns></returns>
|
||||
public new async Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(Expression<Func<CoreCmsBillPayments, bool>> predicate,
|
||||
public async Task<IPageList<CoreCmsBillPayments>> QueryPageAsync(Expression<Func<CoreCmsBillPayments, bool>> predicate,
|
||||
Expression<Func<CoreCmsBillPayments, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
|
||||
int pageSize = 20, bool blUseNoLock = false)
|
||||
{
|
||||
|
||||
@@ -84,7 +84,7 @@ namespace CoreCms.Net.Services
|
||||
billRefund.sourceId = sourceId;
|
||||
billRefund.type = type;
|
||||
//取支付成功的支付单号
|
||||
var paymentsInfo = await _billPaymentsServices.QueryByClauseAsync(p => p.sourceId == sourceId && p.type == type && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed);
|
||||
var paymentsInfo = await _billPaymentsServices.QueryByClauseAsync(p=>p.sourceId==sourceId && p.type==type && p.status == (int)GlobalEnumVars.BillPaymentsStatus.Payed);
|
||||
if (paymentsInfo != null)
|
||||
{
|
||||
billRefund.paymentCode = paymentsInfo.paymentCode;
|
||||
@@ -260,7 +260,7 @@ namespace CoreCms.Net.Services
|
||||
/// <param name="orderByExpression"></param>
|
||||
/// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
|
||||
/// <returns></returns>
|
||||
public new async Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(Expression<Func<CoreCmsBillRefund, bool>> predicate,
|
||||
public async Task<IPageList<CoreCmsBillRefund>> QueryPageAsync(Expression<Func<CoreCmsBillRefund, bool>> predicate,
|
||||
Expression<Func<CoreCmsBillRefund, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
|
||||
int pageSize = 20, bool blUseNoLock = false)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user