From b5088bbffed768aa71e6c16257ab2ade96c80d73 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 25 Dec 2023 02:35:57 +0800 Subject: [PATCH] =?UTF-8?q?1)1688=20=E7=88=AC=E8=99=AB=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=A0=87=E7=AD=BE=202)=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E6=A0=87=E7=AD=BE=203)=E7=BC=96=E8=BE=91=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataRepair/DataRepairBusiness.cs | 5 +++++ .../PurchaseProductAPIService.cs | 10 +++++++--- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 4 +++- BBWYB.Server.Model/Db/Purchaser/Purchaser.cs | 7 +++++-- .../InputPurchaseSchemeProductRequest.cs | 5 +++++ .../PurchaseSchemeProductResponse.cs | 16 +--------------- .../Response/Purchaser/PurchaserResponse.cs | 19 +------------------ 7 files changed, 27 insertions(+), 39 deletions(-) diff --git a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs index 6a005f5..fdc82f2 100644 --- a/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs +++ b/BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs @@ -1002,5 +1002,10 @@ namespace BBWYB.Server.Business //找出接口丢失的类目 } + + public void SuncPurchaserName() + { + + } } } diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs index 3d4ad13..411cdfc 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs @@ -257,8 +257,11 @@ namespace BBWYB.Server.Business #region 验证purchaserName var purchaserName = jobject["globalData"]["tempModel"]["companyName"].ToString(); + var tag = string.Empty; if (invalidPurchaserNameList.Any(x => purchaserName.Contains(x))) { + tag = invalidPurchaserNameList.FirstOrDefault(x => purchaserName.Contains(x)); + var storeDataMatch = Regex.Match(_1688pageResult.Content, @"(window\.__STORE_DATA=)(.*)(\r*\n*\s*)"); if (storeDataMatch.Success) { @@ -268,12 +271,12 @@ namespace BBWYB.Server.Business var jobject_storeData = JObject.Parse(jsonStr_storeData); foreach (var purchaserNodeId in purchaserNameIdList) { - var purchaserTempName = jobject_storeData["components"]?[purchaserNodeId]?["moduleData"]?["companyName"].ToString(); + var purchaserTempName = jobject_storeData["components"]?[purchaserNodeId]?["moduleData"]?["companyName"].ToString(); if (!string.IsNullOrEmpty(purchaserTempName)) { purchaserName = purchaserTempName; break; - } + } } } catch { } @@ -317,7 +320,8 @@ namespace BBWYB.Server.Business Name = purchaserName, MemberId = memberId, Location = location, - Platform = Enums.Platform.阿里巴巴 + Platform = Enums.Platform.阿里巴巴, + Tag = tag }; diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index f9cac77..a1f1e99 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -58,7 +58,8 @@ namespace BBWYB.Server.Business Name = ps.PurchaserName, Location = ps.PurchaserLocation, Platform = ps.PurchasePlatform ?? Enums.Platform.阿里巴巴, - MemberId = ps.PurchaserMemberId + MemberId = ps.PurchaserMemberId, + Tag = ps.PurchaserTag }); } } @@ -828,6 +829,7 @@ namespace BBWYB.Server.Business schemeProduct.PurchaserPurchasedCount = purchaser.PurchasedCount; schemeProduct.PurchaserPurchasedSkuCount = purchaser.PurchasedSkuCount; schemeProduct.PurchasePlatform = purchaser.Platform; + schemeProduct.PurchaserTag = purchaser.Tag; } } } diff --git a/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs b/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs index 1024c17..a37fc77 100644 --- a/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs +++ b/BBWYB.Server.Model/Db/Purchaser/Purchaser.cs @@ -49,8 +49,11 @@ namespace BBWYB.Server.Model.Db [Column(MapType = typeof(int?))] public Enums.Platform? Platform { get; set; } - - + /// + /// 商家标签 (超级工厂/实力工厂/实力供应商),可空 + /// + [Column(StringLength = 20)] + public string Tag { get; set; } } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs index cd9caec..d140dde 100644 --- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs @@ -35,6 +35,11 @@ public string PurchaserMemberId { get; set; } + /// + /// 商家标签(超级工厂/实力工厂/实力供应商),可空 + /// + public string PurchaserTag { get; set; } + public Enums.Platform? PurchasePlatform { get; set; } diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductResponse.cs index 7b96951..ec9a041 100644 --- a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductResponse.cs @@ -28,21 +28,7 @@ namespace BBWYB.Server.Model.Dto /// /// 采购商标签 /// - public string PurchaserTag - { - get - { - if (string.IsNullOrEmpty(PurchaserName)) - return string.Empty; - if (PurchaserName.EndsWith("超级工厂")) - return "超级工厂"; - if (PurchaserName.EndsWith("实力工厂")) - return "实力工厂"; - if (PurchaserName.EndsWith("实力供应商")) - return "实力供应商"; - return string.Empty; - } - } + public string PurchaserTag { get; set; } #endregion /// diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs index f86a11c..f0df51f 100644 --- a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs +++ b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs @@ -10,7 +10,7 @@ namespace BBWYB.Server.Model.Dto public IList CategoryList { get; set; } /// - /// 标签集合 + /// 自定义标签集合 /// public IList TagList { get; set; } @@ -54,23 +54,6 @@ namespace BBWYB.Server.Model.Dto /// public IList Recent30dProductSku { get; set; } - /// - /// 采购商标签 - /// - public string Tag - { - get - { - if (Name.EndsWith("超级工厂")) - return "超级工厂"; - if (Name.EndsWith("实力工厂")) - return "实力工厂"; - if (Name.EndsWith("实力供应商")) - return "实力供应商"; - return string.Empty; - } - } - public PurchaserResponse() { CategoryList = new List();