GithubStar/CoreShop
1
0
Fork 0
mirror of https://github.com/CoreUnion/CoreShop.git synced 2026-10-29 13:39:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

【新增】小程序首页可视化【页面设计】增加【商品Tab卡】功能，支持添加多个tab，每个tab下面捆绑商品。

Browse Source 
【修复】修复老商品修改三级分销金额的时候修改一、二、三级返现失败的问题。#I4J4KP
【优化】延长后端登录后用户在线状态时长。从1小时调整为24小时。
【优化】调整备案调用数据变量名大小写问题。#I4JNC2
This commit is contained in:
JianWeie
2021-11-26 00:01:17 +08:00
parent c3dd1b7c30
commit 2fce29173b
16 changed files with 2287 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+43 -2
View File
@@ -519,7 +519,6 @@ namespace CoreCms.Net.Repository
}
});
oldDistributions.ForEach(o =>
{
var oldPost = oldPostProducts.Find(p => p.id == o.productsId);
@@ -533,11 +532,53 @@ namespace CoreCms.Net.Repository
}
});
//极端情况下，如果不存在三级佣金明细，则创建.
var newDt = new List<CoreCmsProductsDistribution>();
if (oldDistributions.Any())
{
var ids = oldDistributions.Select(p => p.productsId).ToList();
var oldNoDtProduts = oldPostProducts.Where(p => ids.Contains(p.id)).ToList();
if (oldNoDtProduts.Any())
{
oldNoDtProduts.ForEach(p =>
{
var pd = new CoreCmsProductsDistribution();
pd.createTime = DateTime.Now;
pd.productsSN = p.sn;
pd.levelOne = p.levelOne;
pd.levelTwo = p.levelTwo;
pd.levelThree = p.levelThree;
pd.productsId = p.id;
newDt.Add(pd);
});
}
}
else
{
oldPostProducts.ForEach(p =>
{
var pd = new CoreCmsProductsDistribution();
pd.createTime = DateTime.Now;
pd.productsSN = p.sn;
pd.levelOne = p.levelOne;
pd.levelTwo = p.levelTwo;
pd.levelThree = p.levelThree;
pd.productsId = p.id;
newDt.Add(pd);
});
}
var upOldData = await DbClient.Updateable(oldDataProducts).ExecuteCommandHasChangeAsync();
if (upOldData)
{
await DbClient.Updateable(oldDistributions).ExecuteCommandHasChangeAsync();
if (newDt.Any())
{
await DbClient.Insertable(newDt).ExecuteCommandAsync();
}
}
}
}
else
@@ -607,7 +648,7 @@ namespace CoreCms.Net.Repository
await DbClient.Updateable<CoreCmsProducts>().SetColumns(p => p.isDel == true).Where(p => p.goodsId == model.id).ExecuteCommandHasChangeAsync();
var newObj = entity.products.FirstOrDefault();
if (newObj != null && newObj.id > 0)
if (newObj is { id: > 0 })
{
var obj = products.Find(p => p.id == newObj.id);
//obj.barcode = model.bn;