采购商主营类目修复

BBWYB.Server.Business/DataRepair/DataRepairBusiness.cs

@@ -976,20 +976,48 @@ namespace BBWYB.Server.Business
                 PageSize = 500,
                 AppKey = "BBWYB2023022501",
                 AppSecret = "3a1521deccc6819d61788a0d6baae49e9",
-                AppToken = "9"
+                AppToken = "9",
+                Level = 0
             };
 
-            var qtCategoryList = new List<OP_ProductCategoryResponse>();
-            var response = client.GetProductCategoryList(request);
-            if (response.Items != null)
-                qtCategoryList.AddRange(response.Items);
+            var L1_qtCategoryList = new List<OP_ProductCategoryResponse>();
+            var L1_response = client.GetProductCategoryList(request);
+            if (L1_response.Items != null)
+                L1_qtCategoryList.AddRange(L1_response.Items);
+
+            request.Level = 1;
+            var L2_qtCategoryList = new List<OP_ProductCategoryResponse>();
+            var L2_response = client.GetProductCategoryList(request);
+            if (L2_response.Items != null)
+                L2_qtCategoryList.AddRange(L2_response.Items);
+
+            request.Level = 2;
+            var L3_qtCategoryList = new List<OP_ProductCategoryResponse>();
+            var L3_response = client.GetProductCategoryList(request);
+            if (L3_response.Items != null)
+                L3_qtCategoryList.AddRange(L3_response.Items);
+
+            foreach (var l3Category in L3_qtCategoryList)
+            {
+                var parentPathIdArray = l3Category.CategoryPath.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                if (parentPathIdArray.Length != 3)
+                    continue;
+                var l2Category = L2_qtCategoryList.FirstOrDefault(x => x.CategoryId == parentPathIdArray[1]);
+                if (l2Category == null)
+                    continue;
+                var l1Category = L1_qtCategoryList.FirstOrDefault(x => x.CategoryId == parentPathIdArray[0]);
+                if (l1Category == null)
+                    continue;
+
+                l3Category.CategoryPath = $"{l1Category.CategoryName},{l2Category.CategoryName}";
+            }
 
 
             //找出新增的类目
             //var newCategoryList = qtCategoryList.Where(c => !dbCategoryList.Any(dc => dc.Id == long.Parse(c.CategoryId))).ToList();
             //if (newCategoryList.Count() > 0)
             //{
-            insertList.AddRange(qtCategoryList.Select(c => new PurchaserExtendedInfo()
+            insertList.AddRange(L3_qtCategoryList.Select(c => new PurchaserExtendedInfo()
             {
                 Id = long.Parse(c.CategoryId),
                 Name = c.CategoryName,

BBWYB.Server.Business/Purchaser/PurchaserBusiness.cs

@@ -150,7 +150,7 @@ namespace BBWYB.Server.Business
                 #region 查询SPU采购数/SKU采购数
                 var purchasedList = fsql.Select<ProductSku, OrderPurchaseRelationInfo, OrderPurchaseInfo, Order>()
                                         .InnerJoin((ps, ori, opi, o) => ps.Id == ori.BelongSkuId)
-                                        .InnerJoin((ps, ori, opi, o) => ori.PurchaseOrderId == opi.PurchaseOrderId && 
+                                        .InnerJoin((ps, ori, opi, o) => ori.PurchaseOrderId == opi.PurchaseOrderId &&
                                                                         ori.OrderId == opi.OrderId)
                                         .InnerJoin((ps, ori, opi, o) => opi.OrderId == o.Id)
                                         .WhereIf(request.ShopId != null && request.ShopId > 0, (ps, ori, opi, o) => o.ShopId == request.ShopId)
@@ -228,7 +228,8 @@ namespace BBWYB.Server.Business
                                                       pei.Id,
                                                       pei.Name,
                                                       pei.Type,
-                                                      per.PurchaserId
+                                                      per.PurchaserId,
+                                                      pei.ExtendInfo
                                                   });
                 #endregion
 
@@ -298,7 +299,8 @@ namespace BBWYB.Server.Business
                                                                   {
                                                                       Id = x.Id,
                                                                       Name = x.Name,
-                                                                      Type = x.Type
+                                                                      Type = x.Type,
+                                                                      ExtendInfo = x.ExtendInfo
                                                                   }).ToList();
 
                     purchaser.TagList = currentExtendInfoList.Where(x => x.Type == Enums.PurchaserBasicInfoType.标签)
@@ -306,7 +308,8 @@ namespace BBWYB.Server.Business
                                                              {
                                                                  Id = x.Id,
                                                                  Name = x.Name,
-                                                                 Type = x.Type
+                                                                 Type = x.Type,
+                                                                 ExtendInfo = x.ExtendInfo
                                                              }).ToList();
                     #endregion
 

SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs

@@ -4,6 +4,7 @@ using com.alibaba.openapi.client;
 using QuanTan.SDK.Client.Supplier;
 using QuanTan.SDK.Models.Supplier;
 using SDKAdapter.OperationPlatform.Models;
+using System.Reflection.Emit;
 using static System.Net.WebRequestMethods;
 
 namespace SDKAdapter.OperationPlatform.Client
@@ -250,31 +251,25 @@ namespace SDKAdapter.OperationPlatform.Client
 
         public override OP_ListResponse<OP_ProductCategoryResponse> GetProductCategoryList(OP_QueryProductCategoryRequest request)
         {
-            var levels = new List<int>() { 0, 1, 2 };
-            var items = new List<OP_ProductCategoryResponse>();
-            foreach (var level in levels)
+            var qtResponse = supplier_ProductClient.GetProductCategoryList(new QuanTan_Supplier_SearchProductCategoryRequest()
             {
-                var qtResponse = supplier_ProductClient.GetProductCategoryList(new QuanTan_Supplier_SearchProductCategoryRequest()
-                {
-                    page = request.PageIndex,
-                    pageSize = request.PageSize,
-                    categoryLevel = level
-                }, request.AppKey, request.AppSecret);
-                if (qtResponse.Data.List != null && qtResponse.Data.List.Count() > 0)
-                {
-                    items.AddRange(qtResponse.Data.List.Select(x => new OP_ProductCategoryResponse()
-                    {
-                        CategoryId = x.CategoryId,
-                        CategoryName = x.CategoryName,
-                        CategoryPath = x.CategoryPath
-                    }).ToList());
-                }
-            }
+                page = request.PageIndex,
+                pageSize = request.PageSize,
+                categoryLevel = request.Level
+            }, request.AppKey, request.AppSecret);
+
+            if (qtResponse.Status != 200)
+                throw new BusinessException(qtResponse.Message);
 
             return new OP_ListResponse<OP_ProductCategoryResponse>()
             {
-                Count = items.Count,
-                Items = items
+                Count = qtResponse.Data?.Count ?? 0,
+                Items = qtResponse.Data?.List?.Select(x => new OP_ProductCategoryResponse()
+                {
+                    CategoryId = x.CategoryId,
+                    CategoryName = x.CategoryName,
+                    CategoryPath = x.CategoryPath
+                }).ToList()
             };
         }
     }

SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductCategoryRequest.cs

@@ -5,5 +5,10 @@
         public int PageIndex { get; set; }
 
         public int PageSize { get; set; }
+
+        /// <summary>
+        /// 分类层级 0/1/2
+        /// </summary>
+        public int Level { get; set; } = 2;
     }
 }