From 437a8939737b7cd58cc8d5b172f351d299f578ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Mon, 20 Mar 2023 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E6=94=B6=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E6=88=90=E5=91=98=E9=82=80=E8=AF=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Maintainentry.php      |  50 ++++++++++++++++++++++
 app/api/controller/Userinfo.php           |  24 +++++++++++
 config/log.php                            |   1 +
 public/static/qrcode/1679122419645753.png | Bin 0 -> 447 bytes
 4 files changed, 75 insertions(+)
 create mode 100644 public/static/qrcode/1679122419645753.png

diff --git a/app/api/controller/Maintainentry.php b/app/api/controller/Maintainentry.php
index 2bce2e1..0cd1374 100644
--- a/app/api/controller/Maintainentry.php
+++ b/app/api/controller/Maintainentry.php
@@ -1771,7 +1771,57 @@ class Maintainentry extends BaseController
     }
 
 
+//    接收家庭成员邀请
+    public function receive_invitations(){
+        $params = get_params();
+        //用户id
+        $user_id = $this->request->uid;
+        $user = Db::table('fa_szxc_information_usermsg')->where('user_id',$user_id)->find();
+        if($user){
+            if($user['householder_id']){
+                $this->apiError('已有户主不能接收邀请');
+            }else{
+                $hz = Db::table('fa_szxc_information_usermsg')->where('user_id',$params['user_id'])->find();
+                if(!$hz){
+                    $this->apiError('邀请人未找到');
+                }
+                if($hz['is_hz'] != 1){
+                    $this->apiError('不是户主，不能邀请');
+                }
+                Db::startTrans();
+                try {
+                    $hz_id = $params['hz_id']; //户主id
+//                    修改用户户主
+                    $data['householder_id'] = $hz_id; //户主id
+                    $data['is_hz'] = 0;
+                    Db::table('fa_szxc_information_usermsg')->where('user_id',$user_id)->update($data);
+                    //写入家庭成员表
+                    $my_user_id =  $hz_id;
+                    $f_where[] = ['user_ids','find in set',$my_user_id];
+                    $family_arr = Db::table('fa_szxc_family')->where($f_where)->find();
+                    $time = time();
+                    if($family_arr){
+                        $u_data['user_ids'] = \think\facade\Db::raw("concat(user_ids ,"."',".$user_id."')");
+                        $u_data['updatetime'] = $time;
+                        Db::table('fa_szxc_family')->where('id',$family_arr['id'])->update($u_data);
 
+                    }else{
+                        $szxc_family['user_ids'] = $my_user_id.','.$user_id;
+                        $szxc_family['householder_id'] = $hz_id;
+                        $szxc_family['createtime'] = $time;
+                        Db::table('fa_szxc_family')->strict(false)->insert($szxc_family);
+                    }
+                    $this->apiSuccess('操作成功');
+                } catch (ValidateException | \PDOException | Exception $e) {
+                    Db::rollback();
+                    $this->apiError($e->getMessage());
+                }
+
+            }
+        }else{
+            $this->apiError('未找到该用户');
+        }
+    }
 
 
 }
diff --git a/app/api/controller/Userinfo.php b/app/api/controller/Userinfo.php
index 457fcde..fd3b122 100644
--- a/app/api/controller/Userinfo.php
+++ b/app/api/controller/Userinfo.php
@@ -192,6 +192,30 @@ class Userinfo extends BaseController
                     ->where('user_id', $userid)
                     ->find();
 
+//                新增被邀请的家庭成员注册，直接加入该家庭
+                if(isset($post['hz_id']) && !empty($post['hz_id'])){
+                    //                写入家庭成员表
+                    $my_user_id = $userid;
+                    $hz_id = $post['hz_id']; //户主id
+                    $time = time();
+                    $f_where[] = ['user_ids','find in set',$hz_id];
+                    $family_arr = Db::table('fa_szxc_family')->where($f_where)->find();
+                    if($family_arr){
+                        $u_data['user_ids'] = \think\facade\Db::raw("concat(user_ids ,"."',".$my_user_id."')");
+                        $u_data['updatetime'] = $time;
+                        Db::table('fa_szxc_family')->where('id',$family_arr['id'])->update($u_data);
+
+                        $h_data['householder_id'] = $hz_id;
+                        Db::table('fa_szxc_information_usermsg')->where('user_id',$my_user_id)->update($h_data);
+
+                    }else{
+                        $szxc_family['user_ids'] = $hz_id.','.$my_user_id;
+                        $szxc_family['householder_id'] = $hz_id;
+                        $szxc_family['createtime'] = $time;
+                        Db::table('fa_szxc_family')->strict(false)->insert($szxc_family);
+                    }
+                }
+
                 // 判断用户地区写入状态
                 if (!$add){
 
diff --git a/config/log.php b/config/log.php
index 0b27c12..0e90185 100644
--- a/config/log.php
+++ b/config/log.php
@@ -60,6 +60,7 @@ return [
 		'disable'    => '禁用',
 		'recovery'   => '恢复',
 		'reset'      => '重新设置',
+        'buy'      => '采购商品',
     ],
 	'user_action' => [
 		'login'      => '登录',
diff --git a/public/static/qrcode/1679122419645753.png b/public/static/qrcode/1679122419645753.png
new file mode 100644
index 0000000000000000000000000000000000000000..14aa43d4b7cf4dc98aabbab137e67b2abd8a6f78
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq005-`005-{0{{R32j#Ds00006P)t-s|Ns90
z0033O(|!N|010qNS#tmY4#WTe4#WYKD-Ig~00Cb~L_t(YiQSelj)X7_MIBM3<Otj(
zTx=wexES1oBcx1$;{A5QuF$sgr<h1Hf=A)R{@;$sH?LV$i;U|OcX<h3^d!=RUkO<R
zbUBO2K&7LeC0Y17u2N>*=rrU(+ta709(w)X!@H^FSMbRT`N%qfx^~jIo&NVw6oLA(
zYDUekr#T1|3018)XH>l=a|o5@MG<~6?QB{?t0s+_V!D8&JrQXVghym8_8rFW3FpwD
z>!ka5NizqXBJ!^RkzYSCiwaH*yRVZ7d|@_W(qL}zjhHWD?I$Kt*N*FRhIZ7(1Ca*v
zMKuALAHA~?Y4ZH$#fO5%z6TbCQhS>@vQOKANii8F^s{z#z{(4g{z)Y@rEW~>b7(eS
zB)hGoTTvY9GuG$Oam$rS{f>ef#>4tq?R#KSGl%%VyC(yaS{Fk#S8Fo^m3n^LcvTp`
pT_RYtYv&TTMBE>WdOQ8z^#f#WkGB+DU4#Gt002ovPDHLkV1iiZ#E$>~

literal 0
HcmV?d00001