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

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -709,7 +709,10 @@ namespace BBWY.Server.Business
                 throw new BusinessException(httpResult.Content);
             var response = JsonConvert.DeserializeObject<ApiResponse>(httpResult.Content);
             if (!response.Success)
-                throw new BusinessException(response.Msg);
+            {
+                if (!response.Msg.Contains("促销已删除"))
+                    throw new BusinessException(response.Msg);
+            }
             fsql.Update<PromotionTask>(request.Id).Set(pt => pt.Status, Enums.PromitionTaskStatus.已停止).ExecuteAffrows();
         }
 

BBWY.Server.Business/PlatformSDK/_1688Business.cs

@@ -126,9 +126,17 @@ namespace BBWY.Server.Business
             request.RequestEntity = param;
             if (!string.IsNullOrEmpty(previewOrderReuqest.AppToken))
                 request.AccessToken = previewOrderReuqest.AppToken;
-            var result = client.NewRequest(request, reqPolicy);
-            if (result.Value<bool>("success") != true)
-                throw new BusinessException(result.Value<string>("errorMsg")) { Code = 0 };
+            JObject result = null;
+            try
+            {
+                result = client.NewRequest(request, reqPolicy);
+                if (result.Value<bool>("success") != true)
+                    throw new BusinessException(result.Value<string>("errorMsg")) { Code = 0 };
+            }
+            catch (Exception ex)
+            {
+                throw new BusinessException(ex.Message);
+            }
 
             nLogManager.Default().Info($"PreviewOrder Request:{JsonConvert.SerializeObject(previewOrderReuqest)} Response:{result}");