1)1688 爬虫返回商家标签

2)采购方案列表增加商家标签
3)编辑采购方案列表请求参数增加商家标签

BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs

@@ -1002,5 +1002,10 @@ namespace BBWYB.Server.Business
             //找出接口丢失的类目
 
         }
+
+        public void SuncPurchaserName()
+        { 
+            
+        }
     }
 }

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*</script>)");
                     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
                 };
 
 

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;
                             }
                         }
                     }

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; }
 
-
+        /// <summary>
-
+        /// 商家标签 (超级工厂/实力工厂/实力供应商),可空
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string Tag { get; set; }
     }
 
 }

BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeProductRequest.cs

@@ -35,6 +35,11 @@
 
         public string PurchaserMemberId { get; set; }
 
+        /// <summary>
+        /// 商家标签(超级工厂/实力工厂/实力供应商),可空
+        /// </summary>
+        public string PurchaserTag { get; set; }
+
 
         public Enums.Platform? PurchasePlatform { get; set; }
 

BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductResponse.cs

@@ -28,21 +28,7 @@ namespace BBWYB.Server.Model.Dto
         /// <summary>
         /// 采购商标签
         /// </summary>
-        public string PurchaserTag
+        public string PurchaserTag { get; set; }
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(PurchaserName))
-                    return string.Empty;
-                if (PurchaserName.EndsWith("超级工厂"))
-                    return "超级工厂";
-                if (PurchaserName.EndsWith("实力工厂"))
-                    return "实力工厂";
-                if (PurchaserName.EndsWith("实力供应商"))
-                    return "实力供应商";
-                return string.Empty;
-            }
-        }
         #endregion
 
         /// <summary>

BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs

@@ -10,7 +10,7 @@ namespace BBWYB.Server.Model.Dto
         public IList<PurchaserExtendedInfoResponse> CategoryList { get; set; }
 
         /// <summary>
-        /// 标签集合
+        /// 自定义标签集合
         /// </summary>
         public IList<PurchaserExtendedInfoResponse> TagList { get; set; }
 
@@ -54,23 +54,6 @@ namespace BBWYB.Server.Model.Dto
         /// </summary>
         public IList<ProductSkuResponse> Recent30dProductSku { get; set; }
 
-        /// <summary>
-        /// 采购商标签
-        /// </summary>
-        public string Tag
-        {
-            get
-            {
-                if (Name.EndsWith("超级工厂"))
-                    return "超级工厂";
-                if (Name.EndsWith("实力工厂"))
-                    return "实力工厂";
-                if (Name.EndsWith("实力供应商"))
-                    return "实力供应商";
-                return string.Empty;
-            }
-        }
-
         public PurchaserResponse()
         {
             CategoryList = new List<PurchaserExtendedInfoResponse>();