同步订单增加一些代码，修改多店铺同步异常返回提示

29WxOrderWpf/Converters/OrderTaskStatusConverter.cs

@@ -23,6 +23,8 @@ namespace _29WxOrderWpf.Converters
 						return "已完成";
 					case TaskStatus.ManuallyInterrupted:
 						return "已中断";
+					case TaskStatus.Fail:
+						return "执行失败";
 				}
 			}
 			return value?.ToString() ?? string.Empty;

29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml

@@ -187,6 +187,9 @@
 											<DataTrigger Binding="{Binding Status}" Value="3">
 												<Setter Property="Foreground" Value="#F56C6C" />
 											</DataTrigger>
+											<DataTrigger Binding="{Binding Status}" Value="4">
+												<Setter Property="Foreground" Value="#F56C6C" />
+											</DataTrigger>
 										</Style.Triggers>
 									</Style>
 								</TextBlock.Style>

29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs

@@ -109,7 +109,7 @@ public class OrderTaskDialogViewModel : BindableBaseEx, IDisposable
 		if (IsShowAll == true)
 			return true;
 
-		return task.Status == 1 || task.Status == 3;
+		return task.Status !=2;
 	}
 
 	/// <summary>任务列表</summary>

29WxOrderWpf/Services/PullWXOrderService.cs

@@ -91,10 +91,21 @@ namespace _29WxOrderWpf.Services
 		public async Task GetTaskStatus()
 		{
 			var tasks = await _kjdApi.GetWxTaskStatus();
+
 			if (tasks != null)
 			{
 				Tasks.Clear();
-				tasks.ForEach(a => Tasks.Add(a));
+				tasks.ForEach(a =>
+				{
+					if (!string.IsNullOrEmpty(a.TaskFailReason))
+					{
+						if (a.TaskFailReason.Contains("任务执行异常"))
+						{
+							a.Status = 4;
+						}
+					}
+					Tasks.Add(a);
+				});
 			}
 		}
 

Work/ERP.API/Orders/PullWXOrderServiceApi.cs

@@ -94,7 +94,7 @@ namespace Work.ERP.API.Orders
 				startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
 				endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
 				clientUserName = BaseClass.UserName,
-				remark=$"同步 {startTime.ToString("yyyy-MM-dd")}/{endTime.ToString("dd")}"
+				remark = $"同步 {startTime.ToString("yyyy-MM-dd")}/{endTime.ToString("dd")}"
 			});
 			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order", data);
 
@@ -104,7 +104,7 @@ namespace Work.ERP.API.Orders
 			}
 			else
 			{
-				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},任务正在执行中"));
 				throw new Exception(msg);
 			}
 		}
@@ -136,7 +136,7 @@ namespace Work.ERP.API.Orders
 			}
 			else
 			{
-				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},任务正在执行中"));
 				throw new Exception(msg);
 			}
 		}
@@ -179,7 +179,6 @@ namespace Work.ERP.API.Orders
 		private async Task<PullWXOrderResult> PostAndGetTaskIdAsync(string url, string data)
 		{
 			var result = await ERPHttp.e57PostResponseAsync<PullWXOrderResult>(url, data);
-			if (result.Code != 200) throw new Exception(result.Msg);
 			return result;
 		}
 	}

Work/ERP.API/TaskStatus.cs

@@ -21,6 +21,8 @@ namespace Work.ERP.API
 		/// 已人为中断
 		/// </summary>
 		[Description("已人为中断")]
-		ManuallyInterrupted = 3
+		ManuallyInterrupted = 3,
+		[Description("失败")]
+		Fail = 4
 	}
 }