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 | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index b83a13e..f6a7319 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -1,10 +1,10 @@
/***********************************************************************
- * Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
- * Email: jianweie@163.com
- * CreateTime: 2021/1/31 21:45:10
+ * Project: baifenBinfa
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
using System;
@@ -16,6 +16,7 @@
using CoreCms.Net.DTO.ComponentsDTO;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.IServices.baifenbingfa;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.FromBody;
@@ -23,6 +24,7 @@
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Helper;
using Newtonsoft.Json;
+using NPOI.POIFS.Properties;
using SqlSugar;
namespace CoreCms.Net.Repository
@@ -32,8 +34,10 @@
/// </summary>
public class CoreCmsGoodsRepository : BaseRepository<CoreCmsGoods>, ICoreCmsGoodsRepository
{
- public CoreCmsGoodsRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+ private readonly IBfbfComAPIService _bfbfComAPIService;
+ public CoreCmsGoodsRepository(IUnitOfWork unitOfWork,IBfbfComAPIService bfbfComAPIService) : base(unitOfWork)
{
+ _bfbfComAPIService = bfbfComAPIService;
}
@@ -181,6 +185,7 @@
obj.goodsId = id;
obj.barcode = goods.bn;
obj.sn = p.sn;
+
obj.price = p.price;
obj.costprice = p.costprice;
obj.mktprice = p.mktprice;
@@ -194,6 +199,11 @@
obj.isDefalut = p.isDefalut;
obj.isDel = false;
obj.images = p.images;
+ //鐧惧垎鍏垫硶娣诲姞
+ obj.distributionCutMoney = p.distributionCutMoney;
+ obj.cutMoney = p.cutMoney;
+ obj.distributionPrice= p.distributionPrice;
+ obj.isCustomizable = p.isCustomizable;
products.Add(obj);
var pd = new CoreCmsProductsDistribution();
@@ -202,6 +212,7 @@
pd.levelOne = p.levelOne;
pd.levelTwo = p.levelTwo;
pd.levelThree = p.levelThree;
+
pds.Add(pd);
});
@@ -244,7 +255,10 @@
obj.isDefalut = true;
obj.isDel = false;
obj.images = oldObj.images;
-
+ 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;
@@ -393,6 +407,7 @@
}
//浜嬬墿澶勭悊杩囩▼寮�濮�
//oldModel.id = model.id;
+ oldModel.areaCode = model.areaCode;
oldModel.bn = model.bn;
oldModel.name = model.name;
oldModel.brief = model.brief;
@@ -534,6 +549,10 @@
p.points = child.points;
p.stock = child.stock;
p.weight = child.weight;
+ p.distributionPrice = child.distributionPrice;
+ p.cutMoney = child.cutMoney;
+ p.distributionCutMoney = child.distributionCutMoney;
+ p.isCustomizable= child.isCustomizable;
}
});
@@ -617,6 +636,10 @@
obj.points = p.points;
obj.isDefalut = p.isDefalut;
obj.images = p.images;
+ 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;
@@ -674,6 +697,10 @@
obj.images = newObj.images;
obj.isDefalut = true;
obj.isDel = false;
+ 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;
@@ -706,6 +733,10 @@
obj.spesDesc = "";
obj.isDefalut = true;
obj.isDel = false;
+ 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;
@@ -1708,12 +1739,19 @@
isRecommend = good.isRecommend,
isHot = good.isHot,
price = pd.price,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
+ distributionPrice = pd.distributionPrice,
mktprice = pd.mktprice,
stock = pd.stock,
pointsDeduction = pd.pointsDeduction,
points = pd.points,
weight = pd.weight,
initialSales = good.initialSales,
+ areaCode = good.areaCode,
+ publisherId= good.publisherId,
+ auditStatus = good.auditStatus,
+
})
.With(SqlWith.NoLock)
.MergeTable()
@@ -1749,6 +1787,9 @@
createTime = good.createTime,
isRecommend = good.isRecommend,
isHot = good.isHot,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
+ distributionPrice = pd.distributionPrice,
price = pd.price,
mktprice = pd.mktprice,
stock = pd.stock,
@@ -1756,6 +1797,8 @@
points = pd.points,
weight = pd.weight,
initialSales = good.initialSales,
+ publisherId= good.publisherId,
+ auditStatus= good.auditStatus,
})
.MergeTable()
.Where(predicate)
@@ -2214,6 +2257,9 @@
labelIds = good.labelIds,
createTime = good.createTime,
isRecommend = good.isRecommend,
+ distributionPrice = pd.distributionPrice,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
isHot = good.isHot,
price = pd.price,
mktprice = pd.mktprice,
@@ -2260,6 +2306,9 @@
isRecommend = good.isRecommend,
isHot = good.isHot,
price = pd.price,
+ distributionPrice = pd.distributionPrice,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
mktprice = pd.mktprice,
stock = pd.stock,
pointsDeduction = pd.pointsDeduction,
@@ -2320,6 +2369,9 @@
labelIds = good.labelIds,
createTime = good.createTime,
isRecommend = good.isRecommend,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
+ distributionPrice=pd.distributionPrice,
isHot = good.isHot,
price = pd.price,
mktprice = pd.mktprice,
@@ -2366,6 +2418,9 @@
isRecommend = good.isRecommend,
isHot = good.isHot,
price = pd.price,
+ distributionCutMoney = pd.distributionCutMoney,
+ cutMoney = pd.cutMoney,
+ distributionPrice = pd.distributionPrice,
mktprice = pd.mktprice,
stock = pd.stock,
pointsDeduction = pd.pointsDeduction,
--
Gitblit v1.9.1