From afb0bbd006ba03e108194f1c8e96dbc6c5a096b8 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 5 Jul 2023 14:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BD=90=E5=BA=93=E8=8E=B7=E5=8F=96=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9F=8E?=
 =?UTF-8?q?=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformSDK/JDBusiness.cs                 | 14 ++++++++++-
 BBWY.Server.Business/QiKu/QiKuBusiness.cs     | 24 ++++++++++++++++++-
 JD.API/Controllers/PlatformSDKController.cs   | 11 +++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 567d7ed6..a62dff98 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -674,8 +674,20 @@ namespace BBWY.Server.Business
 
         public override JArray JDQueryWareHouse(JDQueryWareHouseRequest request)
         {
+            var jdClient = GetJdClient(request.AppKey, request.AppSecret);
+            var req = new EclpMasterQueryWarehouseRequest();
+
+            req.deptNo = request.deptNo;
+            req.warehouseNos = request.wareHouseNos;
+            //req.status = "abc";
+
+            var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
 
-            return base.JDQueryWareHouse(request);
+            if (res.IsError)
+                throw new BusinessException($"获取仓库信息出错 {(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
+            if (res.Json == null)
+                res.Json = JsonConvert.DeserializeObject<JObject>(res.Body);
+            return (JArray)res.Json["jingdong_eclp_master_queryWarehouse_responce"]["querywarehouse_result"];
         }
 
         public override JArray GetStockNumBySku(SearchProductSkuRequest request)
diff --git a/BBWY.Server.Business/QiKu/QiKuBusiness.cs b/BBWY.Server.Business/QiKu/QiKuBusiness.cs
index c887a35e..b6b23f19 100644
--- a/BBWY.Server.Business/QiKu/QiKuBusiness.cs
+++ b/BBWY.Server.Business/QiKu/QiKuBusiness.cs
@@ -56,11 +56,33 @@ namespace BBWY.Server.Business.QiKu
             var store = storeList.FirstOrDefault(s => s.Id == whNo);
             #endregion
 
+            #region 查询仓库城市
+            var jdqueryResult = restApiService.SendRequest(GetPlatformRelayAPIHost(request.Platform), "api/PlatformSDK/JDQueryWareHouse", new
+            {
+                deptNo,
+                wareHouseNos = whNo,
+                request.AppKey,
+                request.AppSecret,
+                request.AppToken,
+                request.Platform
+            }, GetYunDingRequestHeader(), System.Net.Http.HttpMethod.Post);
+
+
+            if (jdqueryResult.StatusCode != System.Net.HttpStatusCode.OK)
+                throw new BusinessException(jdqueryResult.Content);
+            var jdqueryResponse = JsonConvert.DeserializeObject<ApiResponse<JToken>>(jdqueryResult.Content);
+            if (!jdqueryResponse.Success)
+                throw new BusinessException(jdqueryResponse.Msg);
+
+            var city = jdqueryResponse.Data.FirstOrDefault()?.Value<string>("city");
+            #endregion
+
             return new GetJDSupplierNameAndStoreNameResponse()
             {
                 StoreId = store?.Id,
                 StoreName = store?.Name,
-                SupplierName = supplierName
+                SupplierName = supplierName,
+                City = city
             };
         }
     }
diff --git a/JD.API/Controllers/PlatformSDKController.cs b/JD.API/Controllers/PlatformSDKController.cs
index b5455af1..e0b24dad 100644
--- a/JD.API/Controllers/PlatformSDKController.cs
+++ b/JD.API/Controllers/PlatformSDKController.cs
@@ -265,6 +265,17 @@ namespace JD.API.API.Controllers
             return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetStoreHouseList(request);
         }
 
+        /// <summary>
+        /// 获取仓库详细信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public JArray JDQueryWareHouse([FromBody] JDQueryWareHouseRequest request)
+        {
+            return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).JDQueryWareHouse(request);
+        }
+
         /// <summary>
         /// 查询单个sku库存
         /// </summary>