mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 18:43:26 +08:00
# 2022-02-09
### 1.3.5 开源社区版(会员专业版同步修改): 无 ### 0.1.5 会员专业版: 【升级】nuget升级常用组件到最新版本。 【修复】服务商品列表图片组件从image调整为u--image组件。#I4RUC6 【优化】规范coreshop-goods.vue组件for循环未定义key的问题。 【修复】修复因升级uview版本导致【商品选项卡goodTabBar组件】切换失效的问题。 【新增】微信自定义交易组件增加【商品审核结果回调】,【类目审核结果回调】微信服务器消息推送处理。 【优化】调整自定义交易组件sku价格为decimal(18, 2)类型,方便小数处理。 【优化】微信自定义交易组件增加图片同步至微信侧功能。 【优化】重命名一些方法名称大小写。 【新增】首页设计轮播图增加高度设置功能。#I4SWEA 【修复】优化在苹果6/7/8plus及安卓一些机型出现分享海报弹窗文字被遮挡的问题。#I4SWCA
This commit is contained in:
@@ -53,7 +53,7 @@ namespace CoreCms.Net.Repository
|
||||
return jm;
|
||||
}
|
||||
//事物处理过程开始
|
||||
oldModel.id = entity.id;
|
||||
//oldModel.id = entity.id;
|
||||
oldModel.licenseImage = entity.licenseImage;
|
||||
oldModel.level1 = entity.level1;
|
||||
oldModel.level1Name = entity.level1Name;
|
||||
@@ -62,11 +62,11 @@ namespace CoreCms.Net.Repository
|
||||
oldModel.level3 = entity.level3;
|
||||
oldModel.level3Name = entity.level3Name;
|
||||
oldModel.certificateImage = entity.certificateImage;
|
||||
oldModel.auditId = entity.auditId;
|
||||
oldModel.status = entity.status;
|
||||
oldModel.brandId = entity.brandId;
|
||||
oldModel.rejectReason = entity.rejectReason;
|
||||
oldModel.createTime = entity.createTime;
|
||||
//oldModel.auditId = entity.auditId;
|
||||
//oldModel.status = entity.status;
|
||||
//oldModel.brandId = entity.brandId;
|
||||
//oldModel.rejectReason = entity.rejectReason;
|
||||
//oldModel.createTime = entity.createTime;
|
||||
|
||||
//事物处理过程结束
|
||||
var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
|
||||
|
||||
@@ -119,7 +119,7 @@ namespace CoreCms.Net.Repository
|
||||
return jm;
|
||||
}
|
||||
//事物处理过程开始
|
||||
oldModel.id = entity.id;
|
||||
//oldModel.id = entity.id;
|
||||
oldModel.productId = entity.productId;
|
||||
oldModel.createTime = entity.createTime;
|
||||
oldModel.outProductId = entity.outProductId;
|
||||
@@ -138,9 +138,44 @@ namespace CoreCms.Net.Repository
|
||||
|
||||
//事物处理过程结束
|
||||
var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
|
||||
|
||||
if (entity.sku == null || entity.sku.Count < 0)
|
||||
{
|
||||
jm.msg = "请提交sku列表";
|
||||
return jm;
|
||||
}
|
||||
|
||||
var isSelectCount = entity.sku.Count(p => p.isSelect == true);
|
||||
if (isSelectCount <= 0)
|
||||
{
|
||||
jm.msg = "请至少勾选一个需要提交的sku";
|
||||
return jm;
|
||||
}
|
||||
|
||||
var oldSku = await DbClient.Queryable<WeChatTransactionComponentGoodSKU>()
|
||||
.Where(p => p.outProductId == oldModel.outProductId).ToListAsync();
|
||||
oldSku.ForEach(p =>
|
||||
{
|
||||
var newSku = entity.sku.Find(o => o.outSkuId == p.outSkuId);
|
||||
if (newSku != null)
|
||||
{
|
||||
p.thumbImg = newSku.thumbImg;
|
||||
p.costprice = newSku.costprice;
|
||||
p.salePrice = newSku.salePrice;
|
||||
p.marketPrice = newSku.marketPrice;
|
||||
p.stockNum = newSku.stockNum;
|
||||
p.isSelect = newSku.isSelect;
|
||||
}
|
||||
});
|
||||
|
||||
await DbClient.Updateable(oldSku).ExecuteCommandAsync();
|
||||
|
||||
jm.code = bl ? 0 : 1;
|
||||
jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
|
||||
|
||||
|
||||
|
||||
|
||||
return jm;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user