From 50103d80933c890495ac77b9ac9c698e7f84506d Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 18 May 2023 21:53:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=8F=96=E6=B6=88=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/Sync/OrderSyncBusiness.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 136bf7b..495f307 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -83,7 +83,7 @@ namespace BBWYB.Server.Business.Sync
                 foreach (var qtOrder in qtOrderList.Items)
                 {
                     var dbOrder = dbOrderList.FirstOrDefault(o => o.Id == qtOrder.OrderId);
-                    var orderState = !qtOrder.IsPay ? Enums.OrderState.待付款 : ConvertQuanTanOrderState(qtOrder.OrderState, dbOrder?.IsPurchased ?? false);
+                    var orderState = ConvertQuanTanOrderState(qtOrder.OrderState, qtOrder.IsPay, dbOrder?.IsPurchased ?? false);
                     if (dbOrder == null)
                     {
                         //新订单
@@ -150,7 +150,7 @@ namespace BBWYB.Server.Business.Sync
                                 Title = qtOrderSku.SkuTitle,
                                 ShopId = shopId,
                                 ProductId = qtOrderSku.ProductId,
-                                BelongSkuId = belongSkus?.FirstOrDefault(j=>j.Value<string>("SkuId") == qtOrderSku.SkuId)?.Value<string>("BelongSkuId") ?? string.Empty
+                                BelongSkuId = belongSkus?.FirstOrDefault(j => j.Value<string>("SkuId") == qtOrderSku.SkuId)?.Value<string>("BelongSkuId") ?? string.Empty
                             });
                         }
 
@@ -230,7 +230,7 @@ namespace BBWYB.Server.Business.Sync
             }
         }
 
-        private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPurchased)
+        private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPay, bool isPurchased)
         {
             /*
 -1、已取消；
@@ -241,6 +241,10 @@ namespace BBWYB.Server.Business.Sync
              */
             if (qtOrderState == "-1")
                 return Enums.OrderState.已取消;
+
+            if (isPay)
+                return Enums.OrderState.待付款;
+
             if (qtOrderState == "0")
             {
                 if (!isPurchased)