ソースを参照

优化退款时是否能选择退款类型,用户编辑优化

evoxwht 2 年 前
コミット
3f26b3dae7

+ 1 - 1
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']) {

+ 10 - 0
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);
+    }
 }

+ 1 - 0
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;
     }