From f8c4170bbb2af3c888e1da626d4826eb21851b64 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 21 Dec 2023 13:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PurchaserController.cs        | 22 ++++++++++
 .../Purchaser/PurchaserBusiness.cs            | 42 +++++++++++++++++++
 ...sBasicInfo.cs => PurchaserExtendedInfo.cs} |  4 +-
 ....cs => Purchaser_ExtendedInfo_Relation.cs} | 10 ++---
 .../EditPurchaserExtendedInfoRequest.cs       | 13 ++++++
 .../QueryPurchaserExtendedRequest.cs          | 12 ++++++
 .../PurchaserCategoryTagsBasicInfoResponse.cs |  8 ----
 .../PurchaserExtendedInfoResponse.cs          |  8 ++++
 .../Response/Purchaser/PurchaserResponse.cs   |  8 ++--
 BBWYB.Server.Model/Enums.cs                   |  2 +-
 10 files changed, 109 insertions(+), 20 deletions(-)
 rename BBWYB.Server.Model/Db/Purchaser/{PurchaserCategoryTagsBasicInfo.cs => PurchaserExtendedInfo.cs} (78%)
 rename BBWYB.Server.Model/Db/Purchaser/{Purchaser_CategoryTagsBasicInfo_Relation.cs => Purchaser_ExtendedInfo_Relation.cs} (55%)
 create mode 100644 BBWYB.Server.Model/Dto/Request/Purchaser/EditPurchaserExtendedInfoRequest.cs
 create mode 100644 BBWYB.Server.Model/Dto/Request/Purchaser/QueryPurchaserExtendedRequest.cs
 delete mode 100644 BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserCategoryTagsBasicInfoResponse.cs
 create mode 100644 BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserExtendedInfoResponse.cs

diff --git a/BBWYB.Server.API/Controllers/PurchaserController.cs b/BBWYB.Server.API/Controllers/PurchaserController.cs
index 1c12c61..e24c5dd 100644
--- a/BBWYB.Server.API/Controllers/PurchaserController.cs
+++ b/BBWYB.Server.API/Controllers/PurchaserController.cs
@@ -1,4 +1,5 @@
 using BBWYB.Server.Business;
+using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Dto;
 using Microsoft.AspNetCore.Mvc;
 
@@ -23,5 +24,26 @@ namespace BBWYB.Server.API.Controllers
         {
             return purchaserBusiness.QueryPurchaserList(request);
         }
+
+        /// <summary>
+        /// 查询供应商主营类目或标签列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ListResponse<PurchaserExtendedInfoResponse> QueryPurchaserCategoryList([FromBody] QueryPurchaserExtendedRequest request)
+        {
+            return purchaserBusiness.QueryPurchaserCategoryList(request);
+        }
+
+        /// <summary>
+        /// 修改供应商扩展信息
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void EditPurchaserExtendedInfo([FromBody] EditPurchaserExtendedInfoRequest request)
+        {
+            purchaserBusiness.EditPurchaserExtendedInfo(request);
+        }
     }
 }
diff --git a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
index 62b6d0e..36b4ec9 100644
--- a/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
+++ b/BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs
@@ -1,5 +1,7 @@
 using BBWYB.Common.Log;
 using BBWYB.Common.Models;
+using BBWYB.Server.Model;
+using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Dto;
 using Yitter.IdGenerator;
 
@@ -16,5 +18,45 @@ namespace BBWYB.Server.Business
         {
             return new ListResponse<PurchaserResponse>();
         }
+
+        public ListResponse<PurchaserExtendedInfoResponse> QueryPurchaserCategoryList(QueryPurchaserExtendedRequest request)
+        {
+            var list = fsql.Select<PurchaserExtendedInfo>()
+                           .Where(x => x.Type == request.Type)
+                           .WhereIf(!string.IsNullOrEmpty(request.Keywords), x => x.Name.Contains(request.Keywords))
+                           .Count(out var count)
+                           .ToList<PurchaserExtendedInfoResponse>();
+            return new ListResponse<PurchaserExtendedInfoResponse> { Items = list, TotalCount = count };
+        }
+
+        public void EditPurchaserExtendedInfo(EditPurchaserExtendedInfoRequest request)
+        {
+            var insertRelationList = new List<Purchaser_ExtendedInfo_Relation>();
+            insertRelationList.AddRange(request.CategoryIdList.Select(x => new Purchaser_ExtendedInfo_Relation()
+            {
+                Id = idGenerator.NewLong(),
+                PurchaserId = request.PurchaserId,
+                ExtendedType = Enums.PurchaserBasicInfoType.主营类目,
+                ExtendedInfoId = x
+            }));
+
+            insertRelationList.AddRange(request.TagIdList.Select(x => new Purchaser_ExtendedInfo_Relation()
+            {
+                Id = idGenerator.NewLong(),
+                PurchaserId = request.PurchaserId,
+                ExtendedType = Enums.PurchaserBasicInfoType.标签,
+                ExtendedInfoId = x
+            }));
+
+            fsql.Transaction(() =>
+            {
+                fsql.Delete<Purchaser_ExtendedInfo_Relation>().Where(r => r.PurchaserId == request.PurchaserId).ExecuteAffrows();
+                fsql.Update<Purchaser>(request.PurchaserId).Set(p => p.ManagmentMode, request.ManagmentMode).ExecuteAffrows();
+                if (insertRelationList.Count() > 0)
+                    fsql.Insert(insertRelationList).ExecuteAffrows();
+
+            });
+
+        }
     }
 }
diff --git a/BBWYB.Server.Model/Db/Purchaser/PurchaserCategoryTagsBasicInfo.cs b/BBWYB.Server.Model/Db/Purchaser/PurchaserExtendedInfo.cs
similarity index 78%
rename from BBWYB.Server.Model/Db/Purchaser/PurchaserCategoryTagsBasicInfo.cs
rename to BBWYB.Server.Model/Db/Purchaser/PurchaserExtendedInfo.cs
index 341440a..73bd4ad 100644
--- a/BBWYB.Server.Model/Db/Purchaser/PurchaserCategoryTagsBasicInfo.cs
+++ b/BBWYB.Server.Model/Db/Purchaser/PurchaserExtendedInfo.cs
@@ -3,8 +3,8 @@
 namespace BBWYB.Server.Model.Db
 {
 
-    [Table(Name = "purchasercategorytagsbasicinfo", DisableSyncStructure = true)]
-    public partial class PurchaserCategoryTagsBasicInfo
+    [Table(Name = "purchaserextendedinfo", DisableSyncStructure = true)]
+    public partial class PurchaserExtendedInfo
     {
 
         [Column(DbType = "bigint", IsPrimary = true)]
diff --git a/BBWYB.Server.Model/Db/Purchaser/Purchaser_CategoryTagsBasicInfo_Relation.cs b/BBWYB.Server.Model/Db/Purchaser/Purchaser_ExtendedInfo_Relation.cs
similarity index 55%
rename from BBWYB.Server.Model/Db/Purchaser/Purchaser_CategoryTagsBasicInfo_Relation.cs
rename to BBWYB.Server.Model/Db/Purchaser/Purchaser_ExtendedInfo_Relation.cs
index f7728b3..a27c1df 100644
--- a/BBWYB.Server.Model/Db/Purchaser/Purchaser_CategoryTagsBasicInfo_Relation.cs
+++ b/BBWYB.Server.Model/Db/Purchaser/Purchaser_ExtendedInfo_Relation.cs
@@ -3,21 +3,21 @@
 namespace BBWYB.Server.Model.Db
 {
 
-    [Table(Name = "purchaser_categorytagsbasicinfo_relation", DisableSyncStructure = true)]
-    public partial class Purchaser_CategoryTagsBasicInfo_Relation
+    [Table(Name = "purchaser_extendedInfo_relation", DisableSyncStructure = true)]
+    public partial class Purchaser_ExtendedInfo_Relation
     {
 
         [Column(DbType = "bigint", IsPrimary = true)]
         public long Id { get; set; }
 
         [Column(DbType = "bigint")]
-        public long? BasicExtendedInfoId { get; set; }
+        public long? ExtendedInfoId { get; set; }
 
         /// <summary>
         /// 关系类型 主营类目=0 标签=1
         /// </summary>
-        [Column(DbType = "int")]
-        public Enums.PurchaserBasicInfoType? BasicType { get; set; }
+        [Column(DbType = "int",MapType = typeof(int?))]
+        public Enums.PurchaserBasicInfoType? ExtendedType { get; set; }
 
         [Column(StringLength = 50)]
         public string PurchaserId { get; set; }
diff --git a/BBWYB.Server.Model/Dto/Request/Purchaser/EditPurchaserExtendedInfoRequest.cs b/BBWYB.Server.Model/Dto/Request/Purchaser/EditPurchaserExtendedInfoRequest.cs
new file mode 100644
index 0000000..8747b10
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/Purchaser/EditPurchaserExtendedInfoRequest.cs
@@ -0,0 +1,13 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class EditPurchaserExtendedInfoRequest
+    {
+        public string PurchaserId { get; set; }
+
+        public Enums.ManagmentMode ManagmentMode { get; set; }
+
+        public List<long> CategoryIdList { get; set; }
+
+        public List<long> TagIdList { get; set; }
+    }
+}
diff --git a/BBWYB.Server.Model/Dto/Request/Purchaser/QueryPurchaserExtendedRequest.cs b/BBWYB.Server.Model/Dto/Request/Purchaser/QueryPurchaserExtendedRequest.cs
new file mode 100644
index 0000000..7481987
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/Purchaser/QueryPurchaserExtendedRequest.cs
@@ -0,0 +1,12 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class QueryPurchaserExtendedRequest
+    {
+        public Enums.PurchaserBasicInfoType Type { get; set; }
+
+        /// <summary>
+        /// 不传关键字默认查所有
+        /// </summary>
+        public string Keywords { get; set; }
+    }
+}
diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserCategoryTagsBasicInfoResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserCategoryTagsBasicInfoResponse.cs
deleted file mode 100644
index bcdce27..0000000
--- a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserCategoryTagsBasicInfoResponse.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using BBWYB.Server.Model.Db;
-
-namespace BBWYB.Server.Model.Dto
-{
-    public class PurchaserCategoryTagsBasicInfoResponse: PurchaserCategoryTagsBasicInfo
-    {
-    }
-}
diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserExtendedInfoResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserExtendedInfoResponse.cs
new file mode 100644
index 0000000..6ba1571
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserExtendedInfoResponse.cs
@@ -0,0 +1,8 @@
+using BBWYB.Server.Model.Db;
+
+namespace BBWYB.Server.Model.Dto
+{
+    public class PurchaserExtendedInfoResponse: PurchaserExtendedInfo
+    {
+    }
+}
diff --git a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
index 33386fd..6d3f3d9 100644
--- a/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Purchaser/PurchaserResponse.cs
@@ -7,12 +7,12 @@ namespace BBWYB.Server.Model.Dto
         /// <summary>
         /// 类目集合
         /// </summary>
-        public IList<PurchaserCategoryTagsBasicInfoResponse> CategoryList { get; set; }
+        public IList<PurchaserExtendedInfoResponse> CategoryList { get; set; }
 
         /// <summary>
         /// 标签集合
         /// </summary>
-        public IList<PurchaserCategoryTagsBasicInfoResponse> TagList { get; set; }
+        public IList<PurchaserExtendedInfoResponse> TagList { get; set; }
 
         /// <summary>
         /// 绑定SPU数
@@ -56,8 +56,8 @@ namespace BBWYB.Server.Model.Dto
 
         public PurchaserResponse()
         {
-            CategoryList = new List<PurchaserCategoryTagsBasicInfoResponse>();
-            TagList = new List<PurchaserCategoryTagsBasicInfoResponse>();
+            CategoryList = new List<PurchaserExtendedInfoResponse>();
+            TagList = new List<PurchaserExtendedInfoResponse>();
             Recent30dProductSku = new List<ProductSkuResponse>();
         }
     }
diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs
index 62132e6..f55d25a 100644
--- a/BBWYB.Server.Model/Enums.cs
+++ b/BBWYB.Server.Model/Enums.cs
@@ -340,7 +340,7 @@
         }
 
         /// <summary>
-        /// 厂家扩展信息类型
+        /// 厂家扩展信息类型 主营类目 = 0, 标签 = 1
         /// </summary>
         public enum PurchaserBasicInfoType
         {