From 3f26b3dae72739cab9abc5151b4667f6a0bc1101 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 23 Mar 2023 14:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE=E6=97=B6?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=83=BD=E9=80=89=E6=8B=A9=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/user/User.php  |  2 +-
 crmeb/app/model/user/User.php                   | 10 ++++++++++
 crmeb/app/services/order/StoreOrderServices.php |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/adminapi/controller/v1/user/User.php b/crmeb/app/adminapi/controller/v1/user/User.php
index 3767ce9d1..6f3795d0b 100644
--- a/crmeb/app/adminapi/controller/v1/user/User.php
+++ b/crmeb/app/adminapi/controller/v1/user/User.php
@@ -387,7 +387,7 @@ class User extends AuthController
         if ($data['phone']) {
             if (!preg_match("/^1[3456789]\d{9}$/", $data['phone'])) return app('json')->fail(400252);
         }
-        if ($this->services->count(['phone' => $data['phone'], 'is_del' => 0])) {
+        if ($this->services->count(['phone' => $data['phone'], 'is_del' => 0, 'not_uid' => $id])) {
             return app('json')->fail(400314);
         }
         if ($data['card_id']) {
diff --git a/crmeb/app/model/user/User.php b/crmeb/app/model/user/User.php
index a7d4e99d4..4cfb748d5 100644
--- a/crmeb/app/model/user/User.php
+++ b/crmeb/app/model/user/User.php
@@ -440,4 +440,14 @@ class User extends BaseModel
     {
         if ($value !== '') $query->where('is_del', $value);
     }
+
+    /**
+     * 不等于uid搜索器
+     * @param $query
+     * @param $value
+     */
+    public function searchNotUidAttr($query, $value)
+    {
+        if ($value !== '') $query->where('uid', '<>', $value);
+    }
 }
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index 1d653a599..d9671914c 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -2351,6 +2351,7 @@ HTML;
             }
         }
         $data['_status'] = $orderInfo['_status'] ?? [];
+        $data['_status']['is_back'] = $orderInfo['delivery_type'] == 'fictitious' || $orderInfo['virtual_type'] > 0;
         $data['cartInfo'] = $data['cartInfo'] ?? $cartInfo;
         return $data;
     }