调整退货仓判定逻辑

BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs

@@ -148,35 +148,33 @@ huitongkuaidi  百世快递
                     #region 待收货服务单，检查是否需要订阅快递100
                     if (status == 10005)
                     {
-                        if (dbOsku.StorageType == Enums.StorageType.代发)
-                            isNeedSubscribeKuaiDi100 = true;
-                        else
+                        try
                         {
-                            try
+                            var serviceOrderDetailResult = restApiService.SendRequest(relayAPIHost, "api/PlatformSDK/GetServiceOrderDetail", new QueryServiceOrderDetailRequest()
                             {
-                                var serviceOrderDetailResult = restApiService.SendRequest(relayAPIHost, "api/PlatformSDK/GetServiceOrderDetail", new QueryServiceOrderDetailRequest()
-                                {
-                                    AppKey = appKey,
-                                    AppSecret = appSecret,
-                                    AppToken = token,
-                                    OrderId = serviceOrderId,
-                                    ServiceId = serviceId,
-                                    Platform = Enums.Platform.京东,
-                                    VenderId = shop.VenderId
-                                }, GetYunDingRequestHeader(), HttpMethod.Post);
-
-                                if (serviceOrderDetailResult.StatusCode != System.Net.HttpStatusCode.OK)
-                                    throw new Exception($"获取服务单详情失败 {serviceOrderDetailResult.Content}");
-                                var serviceOrderDetailResponse = JsonConvert.DeserializeObject<ApiResponse<JToken>>(serviceOrderDetailResult.Content);
-                                if (!serviceOrderDetailResponse.Success)
-                                    throw new Exception($"获取服务单详情失败 {serviceOrderDetailResponse.Msg}");
-
-                                //检查退货城市是否为泉州
-                                isNeedSubscribeKuaiDi100 = serviceOrderDetailResponse.Data["returnWareAddress"].Value<int>("cityCode") == 2812;
-                                isTuiHuoCang = isNeedSubscribeKuaiDi100;
-                            }
-                            catch { }
+                                AppKey = appKey,
+                                AppSecret = appSecret,
+                                AppToken = token,
+                                OrderId = serviceOrderId,
+                                ServiceId = serviceId,
+                                Platform = Enums.Platform.京东,
+                                VenderId = shop.VenderId
+                            }, GetYunDingRequestHeader(), HttpMethod.Post);
+
+                            if (serviceOrderDetailResult.StatusCode != System.Net.HttpStatusCode.OK)
+                                throw new Exception($"获取服务单详情失败 {serviceOrderDetailResult.Content}");
+                            var serviceOrderDetailResponse = JsonConvert.DeserializeObject<ApiResponse<JToken>>(serviceOrderDetailResult.Content);
+                            if (!serviceOrderDetailResponse.Success)
+                                throw new Exception($"获取服务单详情失败 {serviceOrderDetailResponse.Msg}");
+
+                            //检查退货城市是否为泉州
+                            isNeedSubscribeKuaiDi100 = serviceOrderDetailResponse.Data["returnWareAddress"].Value<int>("cityCode") == 2812;
+                            isTuiHuoCang = isNeedSubscribeKuaiDi100;
                         }
+                        catch { }
+
+                        if (dbOsku.StorageType == Enums.StorageType.代发)
+                            isNeedSubscribeKuaiDi100 = true;
                     }
                     #endregion