From 5ae976edc634b374af04f156ebfd9bcf30e66380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Mar 2023 15:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E7=9A=84=E8=AE=A2=E5=8D=95=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=A0=B8=E9=94=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/setting/SystemRole.php | 8 ++++----
 crmeb/app/services/order/StoreOrderWriteOffServices.php | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php
index 00af6a6a4..3869f730f 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php
@@ -80,12 +80,12 @@ class SystemRole extends AuthController
         $data['rules'] = implode(',', $data['rules']);
         if ($id) {
             if (!$this->services->update($id, $data)) return app('json')->fail(100007);
-            CacheService::clear();
+            $this->services->cacheDriver()->clear();
             return app('json')->success(100001);
         } else {
             $data['level'] = $this->adminInfo['level'] + 1;
             if (!$this->services->save($data)) return app('json')->fail(400223);
-            CacheService::clear();
+            $this->services->cacheDriver()->clear();
             return app('json')->success(400222);
         }
     }
@@ -123,7 +123,7 @@ class SystemRole extends AuthController
         if (!$this->services->delete($id))
             return app('json')->fail(100008);
         else {
-            CacheService::clear();
+            $this->services->cacheDriver()->clear();
             return app('json')->success(100002);
         }
     }
@@ -145,7 +145,7 @@ class SystemRole extends AuthController
         }
         $role->status = $status;
         if ($role->save()) {
-            CacheService::clear();
+            $this->services->cacheDriver()->clear();
             return app('json')->success(100001);
         } else {
             return app('json')->fail(100007);
diff --git a/crmeb/app/services/order/StoreOrderWriteOffServices.php b/crmeb/app/services/order/StoreOrderWriteOffServices.php
index 788bedcc2..aeb21b058 100644
--- a/crmeb/app/services/order/StoreOrderWriteOffServices.php
+++ b/crmeb/app/services/order/StoreOrderWriteOffServices.php
@@ -49,7 +49,13 @@ class StoreOrderWriteOffServices extends BaseServices
      */
     public function writeOffOrder(string $code, int $confirm, int $uid = 0)
     {
-        $orderInfo = $this->dao->getOne(['verify_code' => $code, 'paid' => 1, 'refund_status' => 0, 'is_del' => 0]);
+        $orderInfo = $this->dao->getOne([
+            ['verify_code', '=', $code],
+            ['paid', '=', 1],
+            ['refund_status', '=', 0],
+            ['is_del', '=', 0],
+            ['pid', '>=', 0]
+        ]);
         if (!$orderInfo) {
             throw new ApiException(410173);
         }