优化供应链小组增加

app/admin/controller/SupplyTeam.php

@@ -20,6 +20,7 @@ use app\admin\model\GeoCity;
 use app\admin\model\GeoArea;
 use app\admin\model\GeoStreet;
 use app\admin\model\GeoVillage;
+use app\admin\model\ShopUser;
 
 class SupplyTeam extends BaseController
 
@@ -41,7 +42,7 @@ class SupplyTeam extends BaseController
 			$param = get_params();
 			$where = [];
 			
-            $list = $this->model->with(['level', 'user'])->select();
+            $list = $this->model->with(['level', 'user', 'userMsg'])->select();
             $total = $this->model->count();
             // $list = $this->model->getSupplyTeamList($where,$param);
             foreach ($list as $k =>$v){ 
@@ -91,7 +92,8 @@ class SupplyTeam extends BaseController
                 return to_assign(1, $e->getError());
             }
 			
-            $userAdmin = Db::table('fa_szxc_information_useraddress')->where('admin_id', $param['user_id'])->find();
+            $userAdmin = Db::table('fa_szxc_information_useraddress')->where('user_id', $param['user_id'])->find();
+
             $parent_code = '';
 
             // 验证用户级别，获取对应的区域代码
@@ -126,15 +128,9 @@ class SupplyTeam extends BaseController
             View::assign('level', $level);
 
             //获取用户信息
-            $this->users = Db::table('fa_szxc_information_useraddress')
-                ->alias('a')
-                ->where('a.status',1)
-                ->whereNotIn('a.id', [1])
-                ->leftJoin ('nk_lihaink_cn.cms_admin b', 'a.admin_id = b.id')
-                ->field('b.id, b.username, b.nickname, a.admin_id, a.street_id, a.area_id, a.village_id, a.village_code, a.brigade_id')
-                ->select();
+            $usersList = ShopUser::with(['userAddress', 'userMsg'])->select();
             
-            View::assign('users', $this->users);
+            View::assign('users', $usersList);
 			return view();
 		}
     }

app/admin/model/InformationUserAddress.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 勾股工作室
+ * @license https://opensource.org/licenses/Apache-2.0
+ * @link https://www.gougucms.com
+ */
+namespace app\admin\model;
+
+use think\facade\Db;
+use think\model;
+
+/**
+ * 
+ * 用户关联居住信息表
+ * 
+ */
+class InformationUserAddress extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'fa_szxc_information_useraddress';
+
+}

app/admin/model/InformationUserMsg.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 勾股工作室
+ * @license https://opensource.org/licenses/Apache-2.0
+ * @link https://www.gougucms.com
+ */
+namespace app\admin\model;
+
+use think\facade\Db;
+use think\model;
+
+/**
+ * 
+ * 用户关联居住信息表
+ * 
+ */
+class InformationUserMsg extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'fa_szxc_information_usermsg';
+
+}

app/admin/model/ShopUser.php

@@ -22,4 +22,23 @@ class ShopUser extends Model
     protected $table = 'eb_user';
     protected $pk = 'uid';
 
+    /**
+     * 
+     * 用户地址信息
+     * 
+     */
+    public function userAddress()
+    {
+        return $this->hasOne(InformationUserAddress::class, 'user_id', 'uid');
+    }
+
+    /**
+     * 
+     * 用户家庭信息
+     * 
+     */
+    public function userMsg()
+    {
+        return $this->hasOne(InformationUserMsg::class, 'user_id', 'uid');
+    }
 }

app/admin/model/SupplyTeam.php

@@ -7,6 +7,7 @@
 namespace app\admin\model;
 use think\model;
 use app\common\model\User;
+use app\admin\model\ShopUser;
 
 class SupplyTeam extends Model
 {
@@ -30,7 +31,17 @@ class SupplyTeam extends Model
      */
     public function user()
     {
-      return $this->hasOne(User::class, 'id', 'user_id');
+      return $this->hasOne(ShopUser::class, 'uid', 'user_id');
+    }
+
+    /**
+     * 
+     * 用户家庭信息
+     * 
+     */
+    public function userMsg()
+    {
+        return $this->hasOne(InformationUserMsg::class, 'user_id', 'user_id');
     }
 
     /**
@@ -55,15 +66,16 @@ class SupplyTeam extends Model
     */
     public function addSupplyTeam($param)
     {
-		$insertId = 0;
+        $insertId = 0;
         try {
-			$param['create_time'] = time();
-			$insertId = self::strict(false)->field(true)->insertGetId($param);
-			add_log('add', $insertId, $param);
+          $param['create_time'] = time();
+          $insertId = self::strict(false)->field(true)->insertGetId($param);
+          ShopUser::where('uid', $param['user_id'])->update([ 'fa_supply_team_id' => $insertId]);
+          add_log('add', $insertId, $param);
         } catch(\Exception $e) {
-			return to_assign(1, '操作失败，原因：'.$e->getMessage());
+          return to_assign(1, '操作失败，原因：'.$e->getMessage());
         }
-		return to_assign(0,'操作成功',['aid'=>$insertId]);
+        return to_assign(0,'操作成功',['aid'=>$insertId]);
     }
 
     /**

app/admin/view/supply_team/add.html

@@ -37,7 +37,7 @@
 					<select name="user_id"  lay-verify="required" lay-reqText="供应链后台团队负责人">
 						<option value="">请选择</option>
 						{volist name='users' id='vo'}
-							<option value="{$vo.id}" >{$vo.username}|{$vo.nickname}</option>
+							<option value="{$vo.uid}" >{$vo.nickname}---{$vo.userMsg.name}---{$vo.userMsg.phone}</option>
 						{/volist}
 					</select>
 				</td>

app/admin/view/supply_team/datalist.html

@@ -68,7 +68,7 @@
 					// width: 100,
 					templet: function (d)
 					{   
-						return d.user.nickname + ',手机号：' + d.user.mobile;
+						return d.userMsg.name + ',手机号：' + d.user.phone;
 					}
 				},{
 					field: 'auth_range',

app/api/controller/Userinfo.php

@@ -278,7 +278,6 @@ class Userinfo extends BaseController
                     $userinfo_data['userinfo']['address_name'] = '';
                 }
 
-                \think\facade\Log::info($userinfo_data);
                 Db::commit();
                 $this->apiSuccess('已完善，登录成功', $userinfo_data);