mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 21:03:26 +08:00
# 2022-02-25
### 1.3.7 开源社区版: 无 ### 0.2.5 会员专业版: 【新增】数据库sku表【CoreCmsProducts】增加"赠送积分"【points】字段。 【新增】商品sku新增赠送积分功能,订单结算后可根据单品的积分与数量进行计算。与订单积分按照金额比例获取并存。 【新增】前端新增是否显示单品赠送积分功能,勾选显示,将在商品详情,购物车等界面显示购买此物品赠送多少积分的效果。 【优化】前端使用显示“积分”两个字的界面,替换为后台设置的名称。 【修复】修复form表单录入编辑界面属性值重复的问题。#I4V1PE 【修复】修复商品添加和编辑界面存在的错别字。#I4V1OR 【修复】修复广告位设置商品,弹出选择框不显示图片的问题。#I4V1EO
This commit is contained in:
@@ -187,6 +187,7 @@ namespace CoreCms.Net.Repository
|
||||
obj.freezeStock = 0;
|
||||
obj.spesDesc = p.spesDesc;
|
||||
obj.pointsDeduction = p.pointsDeduction;
|
||||
obj.points = p.points;
|
||||
obj.isDefalut = p.isDefalut;
|
||||
obj.isDel = false;
|
||||
products.Add(obj);
|
||||
@@ -235,6 +236,7 @@ namespace CoreCms.Net.Repository
|
||||
obj.freezeStock = 0;
|
||||
obj.spesDesc = oldObj.spesDesc;
|
||||
obj.pointsDeduction = oldObj.pointsDeduction;
|
||||
obj.points = oldObj.points;
|
||||
obj.isDefalut = true;
|
||||
obj.isDel = false;
|
||||
if (string.IsNullOrEmpty(obj.images) || !obj.images.Contains(".jpg"))
|
||||
@@ -517,6 +519,7 @@ namespace CoreCms.Net.Repository
|
||||
p.price = child.price;
|
||||
p.spesDesc = child.spesDesc;
|
||||
p.pointsDeduction = child.pointsDeduction;
|
||||
p.points = child.points;
|
||||
p.stock = child.stock;
|
||||
p.weight = child.weight;
|
||||
|
||||
@@ -611,6 +614,7 @@ namespace CoreCms.Net.Repository
|
||||
obj.freezeStock = 0;
|
||||
obj.spesDesc = p.spesDesc;
|
||||
obj.pointsDeduction = p.pointsDeduction;
|
||||
obj.points = p.points;
|
||||
obj.isDefalut = p.isDefalut;
|
||||
obj.images = p.images;
|
||||
if (string.IsNullOrEmpty(p.images) || !p.images.Contains(".jpg"))
|
||||
@@ -666,6 +670,7 @@ namespace CoreCms.Net.Repository
|
||||
obj.stock = newObj.stock;
|
||||
obj.weight = newObj.weight;
|
||||
obj.pointsDeduction = newObj.pointsDeduction;
|
||||
obj.points = newObj.points;
|
||||
obj.images = newObj.images;
|
||||
obj.isDefalut = true;
|
||||
obj.isDel = false;
|
||||
@@ -696,6 +701,7 @@ namespace CoreCms.Net.Repository
|
||||
obj.stock = newObj.stock;
|
||||
obj.weight = newObj.weight;
|
||||
obj.pointsDeduction = newObj.pointsDeduction;
|
||||
obj.points = newObj.points;
|
||||
obj.freezeStock = 0;
|
||||
obj.spesDesc = "";
|
||||
obj.isDefalut = true;
|
||||
@@ -918,6 +924,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -981,6 +988,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -1054,6 +1062,7 @@ namespace CoreCms.Net.Repository
|
||||
costprice = pd.costprice,
|
||||
mktprice = pd.mktprice,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
weight = pd.weight
|
||||
@@ -1105,6 +1114,7 @@ namespace CoreCms.Net.Repository
|
||||
costprice = pd.costprice,
|
||||
mktprice = pd.mktprice,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
weight = pd.weight
|
||||
@@ -1180,6 +1190,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.With(SqlWith.NoLock)
|
||||
@@ -1233,6 +1244,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -1304,6 +1316,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.With(SqlWith.NoLock)
|
||||
@@ -1357,6 +1370,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -1426,6 +1440,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.With(SqlWith.NoLock)
|
||||
@@ -1479,6 +1494,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -1551,6 +1567,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.With(SqlWith.NoLock)
|
||||
@@ -1604,6 +1621,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
@@ -1680,6 +1698,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.With(SqlWith.NoLock)
|
||||
@@ -1733,6 +1752,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = pd.stock,
|
||||
freezeStock = pd.freezeStock,
|
||||
pointsDeduction = pd.pointsDeduction,
|
||||
points = pd.points,
|
||||
weight = pd.weight
|
||||
})
|
||||
.MergeTable()
|
||||
|
||||
@@ -128,6 +128,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = product.stock,
|
||||
freezeStock = product.freezeStock,
|
||||
pointsDeduction = product.pointsDeduction,
|
||||
points = product.points,
|
||||
spesDesc = product.spesDesc,
|
||||
isDefalut = product.isDefalut,
|
||||
images = product.images,
|
||||
@@ -160,6 +161,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = product.stock,
|
||||
freezeStock = product.freezeStock,
|
||||
pointsDeduction = product.pointsDeduction,
|
||||
points = product.points,
|
||||
spesDesc = product.spesDesc,
|
||||
isDefalut = product.isDefalut,
|
||||
images = product.images,
|
||||
@@ -208,6 +210,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = p.stock,
|
||||
freezeStock = p.freezeStock,
|
||||
pointsDeduction = p.pointsDeduction,
|
||||
points = p.points,
|
||||
spesDesc = p.spesDesc,
|
||||
isDefalut = p.isDefalut,
|
||||
images = p.images,
|
||||
@@ -314,6 +317,7 @@ namespace CoreCms.Net.Repository
|
||||
stock = p.stock,
|
||||
freezeStock = p.freezeStock,
|
||||
pointsDeduction = p.pointsDeduction,
|
||||
points = p.points,
|
||||
spesDesc = p.spesDesc,
|
||||
isDefalut = p.isDefalut,
|
||||
images = p.images,
|
||||
|
||||
Reference in New Issue
Block a user