From 43fc07f578f94d1d0b70542c9e271c25e7d11a4f Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Thu, 28 Dec 2023 20:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8C=E6=AD=A5=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sync/OrderSyncBusiness.cs                 | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index b415c6e5..510ef7aa 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -148,15 +148,15 @@ namespace BBWY.Server.Business
             if ((syncOrderByDateRequest.EndTime - syncOrderByDateRequest.StartTime).Days > 7)
                 throw new BusinessException("同步任务时差最长7天");
 
-            var orderSyncTask = new OrderSyncTask()
-            {
-                Id = idGenerator.NewLong(),
-                ShopId = syncOrderByDateRequest.ShopId,
-                State = Enums.OrderSyncState.Running,
-                SyncStartTime = syncOrderByDateRequest.StartTime,
-                SyncEndTime = syncOrderByDateRequest.EndTime
-            };
-            fsql.Insert(orderSyncTask).ExecuteAffrows();
+            //var orderSyncTask = new OrderSyncTask()
+            //{
+            //    Id = idGenerator.NewLong(),
+            //    ShopId = syncOrderByDateRequest.ShopId,
+            //    State = Enums.OrderSyncState.Running,
+            //    SyncStartTime = syncOrderByDateRequest.StartTime,
+            //    SyncEndTime = syncOrderByDateRequest.EndTime
+            //};
+            //fsql.Insert(orderSyncTask).ExecuteAffrows();
             Task.Factory.StartNew(() =>
             {
                 var currentStartTime = syncOrderByDateRequest.StartTime;
@@ -188,11 +188,11 @@ namespace BBWY.Server.Business
                         }
                     }
                 }
-                try
-                {
-                    fsql.Update<OrderSyncTask>(orderSyncTask.Id).Set(ost => ost.State, Enums.OrderSyncState.End).ExecuteAffrows();
-                }
-                catch (Exception ex) { }
+                //try
+                //{
+                //    fsql.Update<OrderSyncTask>(orderSyncTask.Id).Set(ost => ost.State, Enums.OrderSyncState.End).ExecuteAffrows();
+                //}
+                //catch (Exception ex) { }
             }, System.Threading.CancellationToken.None, TaskCreationOptions.LongRunning, taskSchedulerManager.SyncOrderTaskScheduler);
         }
 
@@ -308,7 +308,12 @@ namespace BBWY.Server.Business
                             if (orderCouponDetailResponse.Success)
                             {
                                 var jtoken = orderCouponDetailResponse.Data["jingdong_pop_order_queryCouponDetai_responce"]["couponDetailExternal"]["couponDetailVo"];
-                                if (jtoken.Value<decimal>("totalShouldPay") > 0M)
+                                if (jtoken.Value<decimal>("totalShouldPay") > 0M ||
+                                    jtoken.Value<decimal>("totalSuperRedEnvelope") > 0M ||
+                                    jtoken.Value<decimal>("totalDongQuan") > 0M ||
+                                    jtoken.Value<decimal>("totalJingDou") > 0M ||
+                                    jtoken.Value<decimal>("totalXianPinLeiDongQuan") > 0M ||
+                                    jtoken.Value<decimal>("totalPingTaiChengDanYouHuiQuan") > 0M )
                                 {
                                     #region 订单合计信息
                                     var orderTotal = new OrderTotalInfo()