From c8938650ba939c1241a034ae190f8aee5ae64239 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 20 Mar 2024 15:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E9=9D=9E=E8=AE=AE=E4=BB=B7?= =?UTF-8?q?=E7=BB=84=E6=9F=A5=E8=AF=A2spu=E4=BB=BB=E5=8A=A1=20=E4=BD=86?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=AE=8C=E6=88=90=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=8A=A5=E4=BB=B7=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E8=AE=AE?= =?UTF-8?q?=E4=BB=B7=E7=BB=84=E6=9F=A5=E8=AF=A2=E5=8F=AA=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=B7=9F=E5=BD=93=E5=89=8D=E8=AE=AE=E4=BB=B7=E7=BB=84=E6=9C=89?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PurchaseSchemeController.cs | 2 +- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 4 +- .../SkuOptimization/OptimizationBusiness.cs | 2 +- .../Db/PurchaseScheme/PurchaseSchemeGroup.cs | 69 ++++++++++--------- 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs index bb7412f..fcc59ff 100644 --- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs @@ -56,7 +56,7 @@ namespace BBWYB.Server.API.Controllers [HttpPost] public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request) { - return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request); + return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request, GetUserId()); } /// diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 85f0728..20f72fb 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -952,11 +952,13 @@ namespace BBWYB.Server.Business return purchaseSchemeList; } - public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request) + public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request, string userId) { + var user = userBusiness.GetisBargainTeamByUserId(userId); var purchaseSchemeGroupsList = fsql.Select() .Where(psg => psg.ShopId == request.ShopId && request.ProductIdList.Contains(psg.ProductId)) + .WhereIf(user.isBargainTeam, psg => psg.BelongBargainTeamId == user.department.Id) .ToList(); if (purchaseSchemeGroupsList.Count() > 0) { diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index 2feb4c3..29ee702 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -541,7 +541,7 @@ namespace BBWYB.Server.Business public ListResponse GetNoCompletionSkuOptimizationTask(QueryNoCompletionOptimizationTaskRequest request, string userId) { request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); - var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true); + var uInfo = userBusiness.GetisBargainTeamByUserId(userId); ISelect select = null; if (request.SpuOptimizationTaskId != null && request.SpuOptimizationTaskId != 0) diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs index 035efd9..17229eb 100644 --- a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs +++ b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs @@ -7,39 +7,44 @@ namespace BBWYB.Server.Model.Db /// 采购方案分组表 /// [Table(Name = "purchaseschemegroup", DisableSyncStructure = true)] - public partial class PurchaseSchemeGroup + public partial class PurchaseSchemeGroup { - /// - /// 分组Id - /// - [Column(DbType = "bigint", IsPrimary = true)] - public long Id { get; set; } - - /// - /// 创建时间 - /// - [Column(DbType = "datetime")] - public DateTime? CreateTime { get; set; } - - /// - /// 组名 - /// - [Column(StringLength = 100)] - public string GroupName { get; set; } - - /// - /// 店铺spu,店铺商品Id - /// - [Column(StringLength = 50)] - public string ProductId { get; set; } - - /// - /// 店铺Id - /// - [Column(DbType = "bigint")] - public long? ShopId { get; set; } - - } + /// + /// 分组Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + /// + /// 创建时间 + /// + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 组名 + /// + [Column(StringLength = 100)] + public string GroupName { get; set; } + + /// + /// 店铺spu,店铺商品Id + /// + [Column(StringLength = 50)] + public string ProductId { get; set; } + + /// + /// 店铺Id + /// + [Column(DbType = "bigint")] + public long? ShopId { get; set; } + + /// + /// 归属议价组 + /// + [Column(StringLength = 50)] + public string BelongBargainTeamId { get; set; } + } }