Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/ViewModels/MainViewModel.cs

@@ -498,6 +498,20 @@ namespace BBWY.Client.ViewModels
             if (!apiResponse.Success)
             {
                 MessageBox.Show(apiResponse.Msg, "获取客服组");
+                if (apiResponse.Msg.Contains("订购链接"))
+                {
+                    var url = "https://fw.jd.com/main/detail/FW_GOODS-187201";
+                    try
+                    {
+
+                        ShellExecuteHelper.ShellExecute(IntPtr.Zero, "open", url, string.Empty, string.Empty, ShellExecuteHelper.ShowCommands.SW_SHOWNORMAL);
+                    }
+                    catch (Exception ex)
+                    {
+                        Clipboard.SetText(url);
+                        MessageBox.Show($"{ex.Message}\r\n打开订购页面失败,订购链接已复制到系统剪切板", "提示");
+                    }
+                }
                 Environment.Exit(Environment.ExitCode);
             }
             GlobalContext.ShopServiceGroupList.Clear();

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -420,12 +420,20 @@ namespace BBWY.Server.Business
         {
             var jdClient = GetJdClient(platformRequest.AppKey, platformRequest.AppSecret);
             var response = jdClient.Execute(new FceAlphaGetVenderCarrierRequest(), platformRequest.AppToken, DateTime.Now.ToLocalTime());
+            if (platformRequest.SaveResponseLog)
+                nLogManager.Default().Info(response.Body);
+
+            if (!string.IsNullOrEmpty(response.Body) && response.Body.Contains("token已过期"))
+                throw new BusinessException($"查询客服组失败-服务应用到期或未订购,请订购后进行授权\r\n订购链接:https://fw.jd.com/main/detail/FW_GOODS-187201");
             if (response.IsError)
                 throw new BusinessException($"{response.RealErrorMsg}");
             if (response.Json == null)
                 response.Json = JObject.Parse(response.Body);
-            if (platformRequest.SaveResponseLog)
+
-                nLogManager.Default().Info(response.Body);
+            if (!string.IsNullOrEmpty(response.ErrorMsg) && response.ErrorMsg.Contains("token已过期"))
+                throw new BusinessException($"查询客服组失败-服务应用到期或未订购,请订购后进行授权\r\n订购链接:https://fw.jd.com/main/detail/FW_GOODS-187201");
+            if (!string.IsNullOrEmpty(response.ErrMsg) && response.ErrMsg.Contains("token已过期"))
+                throw new BusinessException($"查询客服组失败-服务应用到期或未订购,请订购后进行授权\r\n订购链接:https://fw.jd.com/main/detail/FW_GOODS-187201");
 
 
             var jarray = (JArray)(response.Json["jingdong_fce_alpha_getVenderCarrier_responce"]["StandardGenericResponse"]["result"]["carrierList"]);
@@ -1374,7 +1382,15 @@ namespace BBWY.Server.Business
             var req = new ImPopGroupinfoGetRequest();
             var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
             if (res.IsError)
+            {
+                if (!string.IsNullOrEmpty(res.ErrorMsg) && res.ErrorMsg.Contains("token已过期"))
+                    throw new BusinessException($"查询客服组失败-服务应用到期或未订购,请订购后进行授权\r\n订购链接:https://fw.jd.com/main/detail/FW_GOODS-187201");
+                if (!string.IsNullOrEmpty(res.ErrMsg) && res.ErrMsg.Contains("token已过期"))
+                    throw new BusinessException($"查询客服组失败-服务应用到期或未订购,请订购后进行授权\r\n订购链接:https://fw.jd.com/main/detail/FW_GOODS-187201");
+
                 throw new BusinessException($"查询客服组失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
+            }
+
             if (res.Json == null)
                 res.Json = JsonConvert.DeserializeObject<JObject>(res.Body);
             return res.Json["jingdong_im_pop_groupinfo_get_responce"]["popgroup"]["waiterList"].Select(j => new WaiterResponse()

BBWY.Test/Program.cs

@@ -57,20 +57,11 @@ namespace BBWY.Test
                                                                 //var token = "44c19a1c1fbd4641957e6e8985ed1358jmtl"; //森王玩具
                                                                 //var token = "4a0ddc095e054c7aa90adcaccb14f83cwzgr";   //可比车品
                                                                 //var token = "50a4c0f5c55848b5a8a715709e8d6fe0jntb"; //卿卿玩具专营店
-            var client = GetJdClient(appkey, appSecret);
 
-            var req1 = new EclpPoQueryPoOrderRequest();
+            var jdClient = GetJdClient(appkey, appSecret);
-            req1.poOrderNo = "EPL4418077994061";
+            var response = jdClient.Execute(new FceAlphaGetVenderCarrierRequest(), token, DateTime.Now.ToLocalTime());
-            var response1 = client.Execute(req1, token, DateTime.Now.ToLocalTime());
-            Console.WriteLine(JsonConvert.SerializeObject(response1));
 
-            if (response1.Json == null)
+            Console.WriteLine(JsonConvert.SerializeObject(response));
-                response1.Json = JObject.Parse(response1.Body);
-
-            var req2 = new EclpMasterQuerySupplierRequest();
-            req2.deptNo = response1.Json["jingdong_eclp_po_queryPoOrder_responce"]["queryPoModelList"].Children().FirstOrDefault().Value<string>("deptNo");
-            var response2 = client.Execute(req2, token, DateTime.Now.ToLocalTime());
-            Console.WriteLine(JsonConvert.SerializeObject(response2));
             Console.ReadKey();
         }