Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.Business/Sync/OrderSyncBusiness.cs

@@ -843,16 +843,43 @@ namespace BBWY.Server.Business
             if (shop == null)
                 return;
 
-            var isExists = fsql.Select<WaitPayOrder>(request.orderId).Any();
+            IInsert<WaitPayOrder> insertWaitPayOrder = null;
-            if (!isExists)
+            IInsert<JdPublishOrder> insertJdPublishOrder = null;
+
+            {
+                var isExists = fsql.Select<WaitPayOrder>(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<JdPublishOrder>(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,
+                    insertWaitPayOrder?.ExecuteAffrows();
-                    Id = request.orderId,
+                    insertJdPublishOrder?.ExecuteAffrows();
-                    ShopId = long.Parse(shop.ShopId)
+                });
-                }).ExecuteAffrows();
             }
+
         }
 
         #region 同步暂停订单
@@ -891,8 +918,24 @@ namespace BBWY.Server.Business
 
         public void DeleteTimeOutWaitPayOrder()
         {
-            var deleteTime = DateTime.Now.AddHours(-24);
+            IDelete<WaitPayOrder> deleteWaitPayOrder = null;
-            fsql.Delete<WaitPayOrder>().Where(w => w.CreateTime <= deleteTime).ExecuteAffrows();
+            IDelete<JdPublishOrder> deleteJdPublishOrder = null;
+
+            {
+                var deleteTime = DateTime.Now.AddHours(-24);
+                deleteWaitPayOrder = fsql.Delete<WaitPayOrder>().Where(w => w.CreateTime <= deleteTime);
+            }
+
+            {
+                var deleteTime = DateTime.Now.AddDays(-90);
+                deleteJdPublishOrder = fsql.Delete<JdPublishOrder>().Where(w => w.CreateTime <= deleteTime);
+            }
+
+            fsql.Transaction(() =>
+            {
+                deleteWaitPayOrder?.ExecuteAffrows();
+                deleteJdPublishOrder?.ExecuteAffrows();
+            });
         }
 
         /// <summary>

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; }
+
+	}
+
+}