From e8fd9aa8a76c638991e60544ccab53e2e5bd5b6a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 九月 2024 14:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index 708ef60..f6a7319 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -203,6 +203,7 @@
obj.distributionCutMoney = p.distributionCutMoney;
obj.cutMoney = p.cutMoney;
obj.distributionPrice= p.distributionPrice;
+ obj.isCustomizable = p.isCustomizable;
products.Add(obj);
var pd = new CoreCmsProductsDistribution();
@@ -257,7 +258,7 @@
obj.distributionCutMoney = oldObj.distributionCutMoney;
obj.cutMoney = oldObj.cutMoney;
obj.distributionPrice = oldObj.distributionPrice;
-
+ obj.isCustomizable = oldObj.isCustomizable;
if (string.IsNullOrEmpty(obj.images))
{
obj.images = goods.image;
@@ -551,6 +552,7 @@
p.distributionPrice = child.distributionPrice;
p.cutMoney = child.cutMoney;
p.distributionCutMoney = child.distributionCutMoney;
+ p.isCustomizable= child.isCustomizable;
}
});
@@ -637,6 +639,7 @@
obj.distributionPrice = p.distributionPrice;
obj.cutMoney = p.cutMoney;
obj.distributionCutMoney = p.distributionCutMoney;
+ obj.isCustomizable =p.isCustomizable;
if (string.IsNullOrEmpty(p.images))
{
obj.images = oldModel.image;
@@ -697,6 +700,7 @@
obj.distributionPrice = newObj.distributionPrice;
obj.cutMoney = newObj.cutMoney;
obj.distributionCutMoney = newObj.distributionCutMoney;
+ obj.isCustomizable = newObj.isCustomizable;
if (string.IsNullOrEmpty(newObj.images))
{
obj.images = oldModel.image;
@@ -732,6 +736,7 @@
obj.distributionPrice = newObj.distributionPrice;
obj.cutMoney = newObj.cutMoney;
obj.distributionCutMoney = newObj.distributionCutMoney;
+ obj.isCustomizable = newObj.isCustomizable;
if (string.IsNullOrEmpty(newObj.images))
{
obj.images = oldModel.image;
@@ -1744,6 +1749,9 @@
weight = pd.weight,
initialSales = good.initialSales,
areaCode = good.areaCode,
+ publisherId= good.publisherId,
+ auditStatus = good.auditStatus,
+
})
.With(SqlWith.NoLock)
.MergeTable()
@@ -1789,6 +1797,8 @@
points = pd.points,
weight = pd.weight,
initialSales = good.initialSales,
+ publisherId= good.publisherId,
+ auditStatus= good.auditStatus,
})
.MergeTable()
.Where(predicate)
--
Gitblit v1.9.1