diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs index 0709b372..063acc64 100644 --- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs @@ -20,7 +20,10 @@ namespace BBWY.Server.Business.Sync public class JDServiceOrderSyncBusiness : BaseSyncBusiness, IDenpendency { private IList jd_kd100_logisticsCompanyDictionary; - private IList kuaiDi100PushStateList; + private IList kuaiDi100PushStateList_zaitu; + private IList kuaiDi100PushStateList_lanshou; + private IList kuaiDi100PushStateList_qianshou; + private IList kuaiDi100PushStateList_paijian; public JDServiceOrderSyncBusiness(RestApiService restApiService, IOptions 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() - { - 0, //在途 - 1, //揽收 - 3, //签收 - 5, //派件 - }; + kuaiDi100PushStateList_zaitu = new List() { 0, 1001, 1002, 1003 }; + kuaiDi100PushStateList_lanshou = new List() { 1, 101, 102, 103 }; + kuaiDi100PushStateList_qianshou = new List() { 3, 301, 302, 303, 304 }; + kuaiDi100PushStateList_paijian = new List() { 5, 501 }; jd_kd100_logisticsCompanyDictionary = new List() { @@ -472,7 +472,10 @@ huitongkuaidi 百世快递 JObject jobject = JObject.Parse(param); var waybillNo = jobject["lastResult"].Value("nu"); var state = jobject["lastResult"].Value("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().Where(s => s.WayBillNo == waybillNo).ToList(); @@ -489,18 +492,11 @@ huitongkuaidi 百世快递 IUpdate updateExpressOrder = null; List> updateServiceOrderList = new List>(); - /* - 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("ftime")); } } - else if (state == 5) + else if (kuaiDi100PushStateList_paijian.Contains(state)) { if (expressOrder.TransportStatus != 2) {