user bug

application/api_broker/controller/User.php

@@ -236,7 +236,7 @@ class User extends Basic
         //邀请人
         if (!empty($params['invite_phone'])) {
             $where['a.referrer_id'] = ['NOT NULL']; //覆盖上面的值
-            $referrer_id = $this->user->findUserByPhone('id', $params['invite_phone']);
+            $referrer_id = $this->userModel->findUserByPhone('id', $params['invite_phone']);
             $where['a.referrer_id'] = $referrer_id['id'];//覆盖上面的值
             $where['referrer_source'] = 10;
             $type = 1;
@@ -455,8 +455,14 @@ class User extends Basic
         if($user_res[0]['agent_id'] != $params['agent_id']){
            // 判断是否vip客户，如果是 只有是当前经纪人自己的客户才能查看
            //vip客户 0:否 1：是
+
+            $vip_services = new VipService();
+            $examine_vip= $vip_services->vip($params['agent_id']);
+
            if (($user_res[0]['vip'] == 1)) {
-               return $this->response("201", "vip 非客方", ['user_id'=>$user_res[0]['id']]);
+               if (($examine_vip == 1)) {
+                   return $this->response("201", "vip 非客方", ['user_id'=>$user_res[0]['id']]);
+               }
            }
 
            // 判断是否24小时保护期内

application/index/controller/PerformanceInfo.php

@@ -162,6 +162,7 @@ class PerformanceInfo extends Basic
         $field .= 'Obargain.scale_fee,';
         $field .= 'Obargain.practical_fee';
         $return  = $this->oBargainModel->performancelInfoExcel($where,$field);
+
         if(!$return){
             return $this->response("101","无数据");
         }
@@ -170,19 +171,20 @@ class PerformanceInfo extends Basic
 
 
         foreach ($return as $key => $v) {
-            $e_data_old['create_time']    = $v['performance_total'];//提交时间
-            switch ($v['trade_type']) {//成交类型;
-                case 10:
-                    $e_data_old['trade_type'] = "出租";
-                case 20:
-                    $e_data_old['trade_type'] = "增佣";
-                case 30:
-                    $e_data_old['trade_type'] = "代理";
-                default:
-                    $e_data_old['trade_type'] = "好处费";
+            $e_data_old['create_time']    = $v['create_time'];//提交时间
+
+            if($v['trade_type'] == 10){
+                $e_data_old['trade_type'] = "出租";
+            }elseif($v['trade_type'] == 20){
+                $e_data_old['trade_type'] = "增佣";
+            }elseif($v['trade_type'] == 30){
+                $e_data_old['trade_type'] = "代理";
+            }else{
+                $e_data_old['trade_type'] = "好处费";
             }
+
             $e_data_old['landmark']             = $v['landmark'];//商铺地址
-            $e_data_old['id']                   = $v['id'];//商铺编号
+            $e_data_old['house_id']                   = $v['house_id'];//商铺编号
             $e_data_old['name_phone']           = $v['name'].'-'.$v['phone'];//分佣提成方
             $e_data_old['district_name']        = $v['district_name'].'-'.$v['store_name'];//所属部门
             $e_data_old['scale']                = $v['scale'];//分佣比例
@@ -191,6 +193,7 @@ class PerformanceInfo extends Basic
             $e_data_new[]=$e_data_old;
         }
 
+
         $title  = [ '提交时间', '成交类型', '商铺地址', '商铺编号', '分佣提成方', '所属部门门店', '分佣比例', '应收佣金', '实收佣金' ];
 
 

application/model/Users.php

@@ -136,8 +136,9 @@ class Users extends Model
                 ->page($pageNo)
                 ->select();
         }
-
+        //echo Db::table($this->table)->getLastSql();
         $user_follow = new UPhoneFollowPp();
+
         foreach ($result as $k => $v) {
             $data[$k] = $v->getData();