订单任务，现已修改成全局任务列表 包括 订单任务和礼品单任务

订单列表动态展示礼品单状态

Work/29WxOrderWork.csproj

@@ -126,6 +126,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="WPFCommon, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WPFCommon.1.1.0\lib\net462\WPFCommon.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AddressSetIni.cs" />

Work/KJDServer.API/KJDServerHttp.cs

@@ -23,12 +23,12 @@ namespace Work.KJDServer.API
 			data = $"{sign}&{data}";
 			return await _postAsync(url, data);
 		}
-		public static async Task<T> PostAsync<T>(string url, string data) where T : Result, new()
+		public static async Task<T> PostAsync<T>(string url, string data, JsonSerializerSettings settings = null) where T : Result, new()
 		{
 			try
 			{
 				string result = await PostAsync(url, data);
-				return JsonConvert.DeserializeObject<T>(result);
+				return JsonConvert.DeserializeObject<T>(result, settings);
 			}
 			catch (JsonException)
 			{

Work/KJDServer.API/Models/OrderTask.cs

@@ -1,16 +1,39 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WPFCommon.Attributes;
 
 namespace Work.KJDServer.API.Models
 {
-	public class OrderTask
+	public enum TaskType
+	{
+		[Description("全部")]
+		ALL =0,
+		/// <summary>
+		/// 普通订单任务
+		/// </summary>
+		[Description("订单拉取")]
+		WXORD = 25,
+		/// <summary>
+		/// 售后订单任务
+		/// </summary>
+		[Description("售后拉取")]
+		WXASO = 31,
+		[Description("礼物发货")]
+		Gifts = 36
+	}
+
+	/// <summary>
+	/// Task 任务
+	/// </summary>
+	public class TaskItem
 	{
 		public int Id { get; set; }
 
-		public int TaskType { get; set; }
+		public TaskType TaskType { get; set; }
 
 		public string TaskDescribe { get; set; }
 
@@ -38,6 +61,23 @@ namespace Work.KJDServer.API.Models
 		public DateTime CreateTime { get; set; }
 
 		public DateTime UpdateTime { get; set; }
+
+		public List<TaskSubItem> SubTasks { get; set; }
 	}
 
+	/// <summary>
+	/// Task 子任务
+	/// </summary>
+	public class TaskSubItem
+	{
+		public string ObjectId { get; set; }
+		/// <summary>
+		/// 0:待执行，1：成功，2：失败，3：人为终止
+		/// </summary>
+		public int Status { get; set; }
+		public string SysMsg { get; set; }
+		public DateTime CreateTime { get; set; }
+
+		public DateTime UpdateTime { get; set; }
+	}
 }

Work/KJDServer.API/WXOrder/WxOrderServiceApi.cs

@@ -1,5 +1,6 @@
 using AllBase;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,9 +18,19 @@ namespace Work.KJDServer.API.WXOrder
 
 		}
 
-		public async Task<List<OrderTask>> GetWxTaskStatus()
+		public async Task<List<TaskItem>> GetWxTaskStatus(IEnumerable<string> shopIds,DateTime startTime,DateTime endTime)
 		{
-			var ret = await KJDServerHttp.PostAsync<Result<List<OrderTask>>>("order/wx_get_task_status_list", "");
+			StringBuilder sb = new StringBuilder();
+			sb.Append("&shop_ids=").Append(string.Join(",", shopIds));
+			sb.Append("&start_time=").Append(BaseClass.ConvertDateTimeLong(startTime));
+			sb.Append("&end_time=").Append(BaseClass.ConvertDateTimeLong(endTime));
+			var ret = await KJDServerHttp.PostAsync<Result<List<TaskItem>>>("order/wx_get_task_status_list", sb.ToString(),new Newtonsoft.Json.JsonSerializerSettings
+			{
+				ContractResolver = new DefaultContractResolver
+				{
+					NamingStrategy = new SnakeCaseNamingStrategy()
+				}
+			});
 			if (ret.Code == 200)
 			{
 				return ret.Data;

Work/packages.config

@@ -7,4 +7,5 @@
   <package id="chromiumembeddedframework.runtime.win-x64" version="138.0.34" targetFramework="net462" />
   <package id="chromiumembeddedframework.runtime.win-x86" version="138.0.34" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
+  <package id="WPFCommon" version="1.1.0" targetFramework="net462" />
 </packages>