diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs index caeb10fc..be1310af 100644 --- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs @@ -93,6 +93,7 @@ huitongkuaidi 百世快递 System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncServiceOrderTaskScheduler); + } } @@ -117,12 +118,12 @@ huitongkuaidi 百世快递 .Where((osku, o) => o.ShopId == shopId && apiOrderIdList.Contains(osku.OrderId) && osku.Price != 0) .ToList((osku, o) => new { - Id = osku.Id, - ProductId = osku.ProductId, - SkuId = osku.SkuId, - OrderId = osku.OrderId, - ItemTotal = osku.ItemTotal, - StorageType = o.StorageType + osku.Id, + osku.ProductId, + osku.SkuId, + osku.OrderId, + osku.ItemTotal, + o.StorageType }); List insertServiceOrderList = new List(); @@ -131,7 +132,7 @@ huitongkuaidi 百世快递 foreach (var serviceOrderJToken in jtokenList) { var serviceId = serviceOrderJToken.Value("serviceId"); - var status = serviceOrderJToken.Value("sserviceOrderJToken"); + var status = serviceOrderJToken.Value("serviceStatus"); var statusUpdateTime = serviceOrderJToken.Value("updateTime").StampToDateTime(); var dbServiceOrder = dbServiceOrderList.FirstOrDefault(s => s.ServiceId == serviceId); if (dbServiceOrder == null) @@ -313,7 +314,7 @@ huitongkuaidi 百世快递 try { var relayAPIHost = GetPlatformRelayAPIHost(shop.PlatformId); - var serviceOrderList = fsql.Select().Where(s => s.ShopId == shop.Id && + var serviceOrderList = fsql.Select().Where(s => s.ShopId == shop.ShopId && s.IsNeedSubscribeKuaiDi100 == true && s.IsSubscribeKuaiDi100 == false) .OrderByDescending(s => s.StatusUpdateTime) @@ -353,6 +354,11 @@ huitongkuaidi 百世快递 serviceOrder.WayBillNo = serviceOrderDeliveryResponse.Data.Value("expressCode"); serviceOrder.ExpressName = serviceOrderDeliveryResponse.Data.Value("expressCompany"); + if (!string.IsNullOrEmpty(serviceOrder.WayBillNo) && serviceOrder.WayBillNo.StartsWith("JD") && string.IsNullOrEmpty(serviceOrder.ExpressName)) + { + serviceOrder.ExpressName = "京东快递"; + } + isUpdateDelivery = !string.IsNullOrEmpty(serviceOrder.WayBillNo) && !string.IsNullOrEmpty(serviceOrder.ExpressName); } #endregion diff --git a/BBWY.Server.Model/Db/Order/ExpressOrder.cs b/BBWY.Server.Model/Db/Order/ExpressOrder.cs index 78649d07..9f32ebcc 100644 --- a/BBWY.Server.Model/Db/Order/ExpressOrder.cs +++ b/BBWY.Server.Model/Db/Order/ExpressOrder.cs @@ -11,7 +11,7 @@ namespace BBWY.Server.Model.Db public partial class ExpressOrder { - [Column(IsPrimary = true, IsIdentity = true)] + [Column(IsPrimary = true)] public long Id { get; set; } [Column(DbType = "datetime")] diff --git a/BBWY.Server.Model/Db/Order/Serviceorder.cs b/BBWY.Server.Model/Db/Order/Serviceorder.cs index 9e7193ab..69d712f7 100644 --- a/BBWY.Server.Model/Db/Order/Serviceorder.cs +++ b/BBWY.Server.Model/Db/Order/Serviceorder.cs @@ -1,21 +1,16 @@ -using FreeSql.DatabaseModel;using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Threading.Tasks; -using Newtonsoft.Json; using FreeSql.DataAnnotations; +using System; -namespace BBWY.Server.Model.Db { +namespace BBWY.Server.Model.Db +{ - /// - /// 服务单表(new) - /// - [ Table(Name = "serviceorder", DisableSyncStructure = true)] + /// + /// 服务单表(new) + /// + [ Table(Name = "serviceorder", DisableSyncStructure = true)] public partial class ServiceOrder { - [Column(IsPrimary = true, IsIdentity = true)] + [Column(IsPrimary = true)] public long Id { get; set; } ///