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();