From c4faaed24f5ef1e97a221803e1ebb47e8262be11 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 12 Jan 2024 09:46:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/user/UserLogic.php | 54 +++++++++++++++++++--------
 app/common.php                        | 12 ++++++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/app/adminapi/logic/user/UserLogic.php b/app/adminapi/logic/user/UserLogic.php
index 88419ec6..4bb6b190 100644
--- a/app/adminapi/logic/user/UserLogic.php
+++ b/app/adminapi/logic/user/UserLogic.php
@@ -72,7 +72,27 @@ class UserLogic extends BaseLogic
     {
         return User::update([
             'id' => $params['id'],
-            $params['field'] => $params['value']
+            'nickname' => $params['nickname'],
+            'account' => $params['account'],
+            'mobile' => $params['account'],
+            'id_card' => $params['id_card'],
+            'channel' => 0,
+            'sex' => $params['sex'],
+            'province' => $params['province'],
+            'city' => $params['city'],
+            'area' => $params['area'],
+            'street' => $params['street'],
+            'village' => $params['village'],
+            'brigade' => $params['brigade'],
+            'address' => $params['address'],
+            'qualification' => json_encode($params['qualification']),
+            'company_id' => $params['company_id'],
+            'deposit' => $params['deposit'],
+            'deposit_date' => strtotime($params['deposit_date']),
+            'user_information_count' => $params['user_information_count'],
+            'register_num' => $params['register_num'],
+            'merchant_num' => $params['merchant_num'],
+            'trade_amount' => $params['trade_amount'],
         ]);
     }
 
@@ -141,21 +161,21 @@ class UserLogic extends BaseLogic
 //        }
         $group_id = $params['group_id'];
         // 每个公司市场部长只有1个
-        if($group_id == 16) {
-            $marketManger = User::where(['group_id' =>$group_id,'company_id'=>$params['company_id']])->findOrEmpty();
-            if (!$marketManger->isEmpty()) {
-                self::setError('公司已创建市场部长账号');
-                return false;
-            }
-        }
+//        if($group_id == 16) {
+//            $marketManger = User::where(['group_id' =>$group_id,'company_id'=>$params['company_id']])->findOrEmpty();
+//            if (!$marketManger->isEmpty()) {
+//                self::setError('公司已创建市场部长账号');
+//                return false;
+//            }
+//        }
         // 每个公司服务部长只有1个
-        if($group_id == 14) {
-            $marketManger = User::where(['group_id' =>$group_id,'company_id'=>$params['company_id']])->findOrEmpty();
-            if (!$marketManger->isEmpty()) {
-                self::setError('公司已创建服务部长账号');
-                return false;
-            }
-        }
+//        if($group_id == 14) {
+//            $marketManger = User::where(['group_id' =>$group_id,'company_id'=>$params['company_id']])->findOrEmpty();
+//            if (!$marketManger->isEmpty()) {
+//                self::setError('公司已创建服务部长账号');
+//                return false;
+//            }
+//        }
         $userSn = User::createUserSn();
         $passwordSalt = Config::get('project.unique_identification');
         $password = create_password(123456, $passwordSalt);
@@ -190,6 +210,10 @@ class UserLogic extends BaseLogic
             'deposit' => $params['deposit'],
             'deposit_date' => strtotime($params['deposit_date']),
             'user_information_count' => $params['user_information_count'],
+            'register_num' => $params['register_num'],
+            'merchant_num' => $params['merchant_num'],
+            'trade_amount' => $params['trade_amount'],
+            'invite_code' => generate_rand_code(10),
         ]);
         return true;
     }
diff --git a/app/common.php b/app/common.php
index 6ed3b5fe..7846704e 100644
--- a/app/common.php
+++ b/app/common.php
@@ -529,4 +529,16 @@ function push_message($reg_id,$message){
     } catch (\JPush\Exceptions\JPushException $e) {
         return ['code'=>0,'msg'=>$e->getMessage(),'data'=>[]];
     }
+}
+
+function generate_rand_code($length = 8) {
+    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; // 包含所有字符（大小写）和数字
+    $code = '';
+
+    for ($i = 0; $i < $length; $i++) {
+        $index = rand(0, strlen($characters)-1);
+        $code .= $characters[$index];
+    }
+
+    return $code;
 }
\ No newline at end of file