From 1428284ade391f33c6fea64d87b2366af5c50aee Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 25 六月 2024 09:05:32 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Services/Order/CoreCmsOrderServices.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
index 4eb4577..0ee675d 100644
--- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
@@ -527,12 +527,12 @@
                             jm.msg = "璁″垝璁㈠崟鑾峰彇澶辫触";
                             return jm;
                         }
-                        if (planOrder.status != 2)
-                        {
-                            _unitOfWork.RollbackTran();
-                            jm.msg = "璁″垝璁㈠崟娌℃湁閿佸崟";
-                            return jm;
-                        }
+                        //if (planOrder.status != 2)
+                        //{
+                        //    _unitOfWork.RollbackTran();
+                        //    jm.msg = "璁″垝璁㈠崟娌℃湁閿佸崟";
+                        //    return jm;
+                        //}
 
                         if ((planOrder.keYongAmount - planOrder.huaFeiAmount - order.orderAmount)<0)
                         {

--
Gitblit v1.9.1