From 4477be2a58ce409798e6efb79df9909b0a4b5b6f Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 24 Mar 2023 10:34:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=B8=8D=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E5=BC=80=E7=A5=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/model/system/store/SystemStore.php           | 2 --
 crmeb/app/services/order/StoreOrderInvoiceServices.php | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/model/system/store/SystemStore.php b/crmeb/app/model/system/store/SystemStore.php
index 649adf618..9fc53ab34 100644
--- a/crmeb/app/model/system/store/SystemStore.php
+++ b/crmeb/app/model/system/store/SystemStore.php
@@ -78,6 +78,4 @@ class SystemStore extends BaseModel
             $query->where('id|name|introduction|phone', 'LIKE', "%$value%");
         }
     }
-
-
 }
diff --git a/crmeb/app/services/order/StoreOrderInvoiceServices.php b/crmeb/app/services/order/StoreOrderInvoiceServices.php
index 0ea780c78..3e76fc10a 100644
--- a/crmeb/app/services/order/StoreOrderInvoiceServices.php
+++ b/crmeb/app/services/order/StoreOrderInvoiceServices.php
@@ -155,7 +155,9 @@ class StoreOrderInvoiceServices extends BaseServices
         if (!$orderInvoice) {
             throw new ApiException(100026);
         }
-        $data['invoice_time'] = time();
+        if ($data['is_invoice'] == 1) {
+            $data['invoice_time'] = time();
+        }
         if (!$this->dao->update($id, $data, 'id')) {
             throw new ApiException(100015);
         }

From 1dd4da9a7888e88340b817c013aae296bbf01ceb Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 24 Mar 2023 10:46:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9A=84=E6=97=B6=E5=80=99=E9=AA=8C=E8=AF=81=E9=99=90?=
 =?UTF-8?q?=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreCartServices.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/order/StoreCartServices.php b/crmeb/app/services/order/StoreCartServices.php
index ededd6887..d4efe3568 100644
--- a/crmeb/app/services/order/StoreCartServices.php
+++ b/crmeb/app/services/order/StoreCartServices.php
@@ -432,8 +432,10 @@ class StoreCartServices extends BaseServices
      */
     public function setCartNum($uid, $productId, $num, $unique, $type)
     {
-        //检查限购
-        $this->checkLimit($uid, $productId, $num, 0);
+        if ($type == 1) {
+            //检查限购
+            $this->checkLimit($uid, $productId, $num, 0);
+        }
 
         /** @var StoreProductAttrValueServices $attrValueServices */
         $attrValueServices = app()->make(StoreProductAttrValueServices::class);

From abb3b17a51a292cbe5cc75f1f4be630b76aec479 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 24 Mar 2023 10:58:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=A0=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8B=E6=9C=89=E6=B8=A0=E9=81=93=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/wechat/WechatQrcodeCateServices.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crmeb/app/services/wechat/WechatQrcodeCateServices.php b/crmeb/app/services/wechat/WechatQrcodeCateServices.php
index ef46dabaa..306e7d47b 100644
--- a/crmeb/app/services/wechat/WechatQrcodeCateServices.php
+++ b/crmeb/app/services/wechat/WechatQrcodeCateServices.php
@@ -69,6 +69,8 @@ class WechatQrcodeCateServices extends BaseServices
      */
     public function delCate($id = 0)
     {
+        $count = app()->make(WechatQrcodeServices::class)->count(['cate_id' => $id]);
+        if ($count) throw new AdminException(400454);
         if (!$id) throw new AdminException(100100);
         $res = $this->dao->update($id, ['is_del' => 1]);
         if (!$res) throw new AdminException(100008);