diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index afcaed0d..b055c426 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -385,7 +385,7 @@ namespace BBWY.Server.Business var currentDbOrderSkuList = dbOrderSkuList.Where(osku => osku.OrderId == orderId).ToList(); - + var itemInfoList = orderJToken["itemInfoList"] as JArray; foreach (var orderSkuJToken in itemInfoList) { @@ -843,16 +843,43 @@ namespace BBWY.Server.Business if (shop == null) return; - var isExists = fsql.Select(request.orderId).Any(); - if (!isExists) + IInsert insertWaitPayOrder = null; + IInsert insertJdPublishOrder = null; + + { + var isExists = fsql.Select(request.orderId).Any(); + if (!isExists) + { + insertWaitPayOrder = fsql.Insert(new WaitPayOrder() + { + CreateTime = DateTime.Now, + Id = request.orderId, + ShopId = long.Parse(shop.ShopId) + }); + } + } + + { + var isExists = fsql.Select(request.orderId).Any(); + if (!isExists) + { + insertJdPublishOrder = fsql.Insert(new JdPublishOrder() + { + CreateTime = DateTime.Now, + Id = request.orderId, + ShopId = long.Parse(shop.ShopId) + }); + } + } + if (insertWaitPayOrder != null || insertJdPublishOrder != null) { - fsql.Insert(new WaitPayOrder() + fsql.Transaction(() => { - CreateTime = DateTime.Now, - Id = request.orderId, - ShopId = long.Parse(shop.ShopId) - }).ExecuteAffrows(); + insertWaitPayOrder?.ExecuteAffrows(); + insertJdPublishOrder?.ExecuteAffrows(); + }); } + } #region 同步暂停订单 @@ -891,8 +918,24 @@ namespace BBWY.Server.Business public void DeleteTimeOutWaitPayOrder() { - var deleteTime = DateTime.Now.AddHours(-24); - fsql.Delete().Where(w => w.CreateTime <= deleteTime).ExecuteAffrows(); + IDelete deleteWaitPayOrder = null; + IDelete deleteJdPublishOrder = null; + + { + var deleteTime = DateTime.Now.AddHours(-24); + deleteWaitPayOrder = fsql.Delete().Where(w => w.CreateTime <= deleteTime); + } + + { + var deleteTime = DateTime.Now.AddDays(-90); + deleteJdPublishOrder = fsql.Delete().Where(w => w.CreateTime <= deleteTime); + } + + fsql.Transaction(() => + { + deleteWaitPayOrder?.ExecuteAffrows(); + deleteJdPublishOrder?.ExecuteAffrows(); + }); } /// diff --git a/BBWY.Server.Model/Db/JD/JDPublishOrder.cs b/BBWY.Server.Model/Db/JD/JDPublishOrder.cs new file mode 100644 index 00000000..e267182b --- /dev/null +++ b/BBWY.Server.Model/Db/JD/JDPublishOrder.cs @@ -0,0 +1,21 @@ +using FreeSql.DataAnnotations; +using System; + +namespace BBWY.Server.Model.Db +{ + + [Table(Name = "jdpublishorder", DisableSyncStructure = true)] + public partial class JdPublishOrder { + + [Column(StringLength = 100, IsPrimary = true, IsNullable = false)] + public string Id { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + [Column(DbType = "bigint")] + public long? ShopId { get; set; } + + } + +}