更新快递100推送状态识别规则

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

@@ -20,7 +20,10 @@ namespace BBWY.Server.Business.Sync
     public class JDServiceOrderSyncBusiness : BaseSyncBusiness, IDenpendency
     {
         private IList<LogisticsCompanyRelationship> jd_kd100_logisticsCompanyDictionary;
-        private IList<int> kuaiDi100PushStateList;
+        private IList<int> kuaiDi100PushStateList_zaitu;
+        private IList<int> kuaiDi100PushStateList_lanshou;
+        private IList<int> kuaiDi100PushStateList_qianshou;
+        private IList<int> kuaiDi100PushStateList_paijian;
 
         public JDServiceOrderSyncBusiness(RestApiService restApiService, IOptions<GlobalConfig> options, NLogManager nLogManager, IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService, options, nLogManager, fsql, idGenerator, taskSchedulerManager, venderBusiness, yunDingBusiness)
         {
@@ -49,13 +52,10 @@ jingdongkuaiyun  京东快运
 huitongkuaidi  百世快递
 
              */
-            kuaiDi100PushStateList = new List<int>()
+            kuaiDi100PushStateList_zaitu = new List<int>() { 0, 1001, 1002, 1003 };
-            {
+            kuaiDi100PushStateList_lanshou = new List<int>() { 1, 101, 102, 103 };
-                0, //在途
+            kuaiDi100PushStateList_qianshou = new List<int>() { 3, 301, 302, 303, 304 };
-                1, //揽收
+            kuaiDi100PushStateList_paijian = new List<int>() { 5, 501 };
-                3, //签收
-                5, //派件
-            };
 
             jd_kd100_logisticsCompanyDictionary = new List<LogisticsCompanyRelationship>()
             {
@@ -472,7 +472,10 @@ huitongkuaidi  百世快递
             JObject jobject = JObject.Parse(param);
             var waybillNo = jobject["lastResult"].Value<string>("nu");
             var state = jobject["lastResult"].Value<int>("state");
-            if (!kuaiDi100PushStateList.Contains(state))
+            if (!kuaiDi100PushStateList_lanshou.Contains(state) &&
+                !kuaiDi100PushStateList_zaitu.Contains(state) &&
+                !kuaiDi100PushStateList_paijian.Contains(state) &&
+                !kuaiDi100PushStateList_qianshou.Contains(state))
                 return;
 
             var serviceOrderList = fsql.Select<ServiceOrder>().Where(s => s.WayBillNo == waybillNo).ToList();
@@ -489,18 +492,11 @@ huitongkuaidi  百世快递
             IUpdate<ExpressOrder> updateExpressOrder = null;
             List<IUpdate<ServiceOrder>> updateServiceOrderList = new List<IUpdate<ServiceOrder>>();
 
-            /*
-               0, //在途
-               1, //揽收
-               3, //签收
-               5, //派件
-            */
-
             var isUpdate = false;
             var newStatus = 0;
             DateTime? signTime = null;
 
-            if (state == 0 || state == 1)
+            if (kuaiDi100PushStateList_zaitu.Contains(state) || kuaiDi100PushStateList_lanshou.Contains(state))
             {
                 //在途 //揽收
                 if (expressOrder.TransportStatus != 3)
@@ -509,7 +505,7 @@ huitongkuaidi  百世快递
                     newStatus = 3;
                 }
             }
-            else if (state == 3)
+            else if (kuaiDi100PushStateList_qianshou.Contains(state))
             {
                 if (expressOrder.TransportStatus != 0)
                 {
@@ -521,7 +517,7 @@ huitongkuaidi  百世快递
                         signTime = DateTime.Parse(data.Value<string>("ftime"));
                 }
             }
-            else if (state == 5)
+            else if (kuaiDi100PushStateList_paijian.Contains(state))
             {
                 if (expressOrder.TransportStatus != 2)
                 {