Merge branch 'test'

application/api/controller/Broker.php

@@ -7,6 +7,7 @@ use app\model\AAgents;
 use app\model\Agents;
 use app\model\Evaluate;
 use app\model\EvaluateSign;
+use app\model\OBargainModel;
 use app\model\Remarks;
 
 /**
@@ -168,30 +169,31 @@ class Broker extends Basic{
         if ($params['agent_id']) {
             $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
             $pageSize = empty($params['pageSize']) ? PAGESIZE : $params['pageSize'];
-            
-            $evalutate = new Evaluate();
-            $remarks  = new Remarks();
-            
-            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign,a.create_time,record_id,a.source';
-            $fields_journal  = 'house_id,apply_id,created';
-            $where['shopuser_id'] = $params['agent_id'];
-            $where['transaction_status'] = 3;
+
+            $bargain = new OBargainModel();
+            $evaluate = new Evaluate();
+
+            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,';
+            $fields_evaluate .= 'evaluate_sign,a.create_time,record_id,a.source,a.house_id,c.external_address';
+
+            $bargain_fields  = 'a.id,a.price,a.create_time as singntime,d.external_title as title,d.rent_type,d.shop_sign as shangpu_tags,shop_area_start as room_area';
+
             switch ($params['type']) {
                 case 0:
                     //评价列表信息
-                    $result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
+                    $result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     //成交记录
-                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data'] = $result;
                     break;
                 case 1:
                     //评价列表信息
-                    $result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
+                    $result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     $data['data'] = $result;
                     break;
                 case 2:
                     //成交记录
-                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data']   = $result;
                     break;
                 default:
@@ -221,7 +223,7 @@ class Broker extends Basic{
         $data['msg']    = '';
 
         if ($this->params['agent_id']) {
-            $agents = new Agents();
+            $agents = new AAgents();
             $data['data'] = $agents->agentsDetail($this->params['agent_id']);
         } else {
             $data['status'] = 101;

application/api_broker/controller/Performance.php

@@ -47,7 +47,7 @@ class Performance extends Basic
             return $this->response("101", "请求参数错误");
         }
         //默认排序一周
-        $end_day   = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
+        $end_day   = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d","-1 day");
         $start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-d", strtotime("-7 day"));
         $list = $this->service_->totalAgent($params["agent_id"], $params["type"], $end_day, $start_day);
         //dump($list);

application/app/view/index/agent_detail.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">
@@ -135,6 +141,6 @@
 		
 		<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
 		<script src="/app/js/common.js" charset="UTF-8"></script>
-		<script src="/app/js/agent_detail.js" charset="UTF-8"></script>
+		<script src="/app/js/agent_detail.js?new1" charset="UTF-8"></script>
 	</body>
 </html>

application/app/view/index/more_chengjiao.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">

application/app/view/index/more_pingjia.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">

application/index/controller/Member.php

@@ -217,7 +217,7 @@ class Member extends Basic{
             $insert_data['user_pswd']  = md5(md5($params['pwd']).'+123');
             $insert_data['status']     = 0;
             $insert_data['create_time']  = $date;
-            $insert_data['update_time']  = $date;
+            $insert_data['source']       = $date;
             $insert_data['agent_id'] = $params['agent_id']; //客方
             $this->user->save($insert_data);
             if ($this->user->id) {

application/model/AAgents.php

@@ -835,4 +835,60 @@ class AAgents extends BaseModel
             ->where($where)
             ->find();
     }
+
+    /**
+     * 经纪人详情
+     * @param $id
+     * @return array|bool|false|\PDOStatement|string|Model
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function agentsDetail($id)
+    {
+        if ($id) {
+            $result = $this->field('id,name as realname,create_time,img,store_id')->find($id);
+
+            $result['head_portrait'] = 'user_header/' . $result['img'];   //头像
+            $evaluate_grade          = Db::table('u_evaluate')
+                ->field('sum(evaluate_grade) as evaluate_grade, count(*) as evaluate_num')
+                ->where('agents_id', $id)->where('is_show', 0)->find();
+
+            $m_store = new AStore();
+            $result['sub_shopname'] = $m_store->getStoreKeyById('store_name', ['id'=>$result['store_id']]);
+            if ($evaluate_grade['evaluate_grade']) {
+                $grade = floor(($evaluate_grade['evaluate_grade'] / 2) / $evaluate_grade['evaluate_num']);
+            } else {
+                $grade = 0;
+            }
+
+            $result['evaluate_grade'] = $grade;   //评分等级
+            $result['evaluate_num']   = $evaluate_grade['evaluate_num'];        //评论数量
+            $result['watch_shop']     = Db::table('u_appoint_watch_shop')
+                ->where('agents_id', $id)->count(); //看铺
+
+            $result['head_portrait'] = AGENTHEADERIMGURL.$result['head_portrait'];
+
+            $bargain = new OBargainModel();
+            $result['JournalAccounts'] = $bargain->ifBargainNumByOrderId([ 'agent_id' => $id ]); //成交记录
+
+            $current_time = time();
+            $user_time    = strtotime($result['create_time']);
+            $year         = date('Y', $current_time) - date('Y', $user_time);
+
+            //入职年限
+            if ($year == 0) {
+                $result['created'] = '4年以上';
+            } else {
+                $result['created'] = '5年以上';
+            }
+
+            $result['label'] = array( 0 => '待定标签数据', 1 => '待定标签数据' );
+            $data            = $result;
+        } else {
+            $data = false;
+        }
+
+        return $data;
+    }
 }
\ No newline at end of file

application/model/Evaluate.php

@@ -11,27 +11,30 @@ class Evaluate extends Model
 
     /**
      * 获得评价列表
-     * 
-     * @param type $pageNo
-     * @param type $pageSize
-     * @param type $order_
-     * @param type $field
-     * @param type $params
-     * @param type $agent_id //获得经纪人的评价
-     * @return type
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param $field
+     * @param $params
+     * @param string $agent_id
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getEvaluate($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '') {
 
         if ($agent_id) {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b','a.user_id = b.id','left')
+                    ->join('g_houses c','a.house_id = c.id','left')
                     ->where('agents_id',$agent_id)
-                    ->where('is_show',0)
+                    ->where('a.is_show',0)
                     ->order($order_)
                     ->limit($pageSize)
                     ->page($pageNo)
                     ->select();
-
         } else {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b', 'a.user_id = b.id', 'left')
@@ -41,9 +44,9 @@ class Evaluate extends Model
                     ->page($pageNo)
                     ->select();
         }
-        $data    = array();
+        $data    = [];
         $sign    = new EvaluateSign();
-        $watch   = new AppointWatchShop();
+
         foreach ($result as $k=>$v) {
             $v->evaluate_grade = floor($v->evaluate_grade/2);
             $data[$k]   = $v->getData();
@@ -55,25 +58,22 @@ class Evaluate extends Model
                          ->select();
             }
 
-            if ($v->source == 10) {
-                $applies_time = $watch->alias('a')
-                    ->field('b.receptiontime')
-                    ->join('applies b','b.id = a.applies_id','left')
-                    ->where('a.applies_id',$v->record_id)
-                    ->find();
-            } else {
-
-                $applies_time = Db::table('Journalaccounts')->alias('a')
-                    ->field('b.receptiontime')
-                    ->join('applies b','b.id = a.apply_id','left')
-                    ->where('a.apply_id',$v->record_id)
-                    ->find();
+            if (isset($v['house_id'])) {
+                $applies_time = Db::table('o_bargain')->alias('a')
+                    ->join('o_order b', 'a.order_id = b.id', 'left')
+                    ->join('o_report c', 'a.report_id = c.id', 'left')
+                    ->where('b.house_id', $v['house_id'])
+                    ->where('c.user_id', $v['user_id'])
+                    ->where('a.agent_id', $agent_id)
+                    ->value('a.create_time');
             }
 
-            $house_address = Db::table('HouseInfos')->field('address')->where('id',$v['house_id'])->find();
+            if (!empty($v['external_address'])) {
+                $v['internal_address'] = $v['external_address'];
+            }
 
-            $data[$k]['houserAddress'] = $house_address['address'] ? $house_address['address'] : '';
-            $data[$k]['receptiontime'] = $applies_time['receptiontime'];
+            $data[$k]['houserAddress'] = $v['internal_address'];
+            $data[$k]['receptiontime'] = $applies_time;
             $data[$k]['created'] = $v['create_time'] ? $v['create_time']:'';
         }
                 
@@ -82,10 +82,14 @@ class Evaluate extends Model
 
     /**
      * 获取商铺是否评价
-     * @param int $source
+     *
+     * @param $source
      * @param $recordId
      * @param $userId
      * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getIsEvaluate($source ,$recordId , $userId){
         $params["source"] = $source ;
@@ -94,6 +98,5 @@ class Evaluate extends Model
         return $this->field("id")
             ->where($params)
             ->select();
-
     }
 }

application/model/OBargainModel.php

@@ -468,6 +468,46 @@ class OBargainModel extends Model
         if (isset($data['id'])) {
             $m_fee                 = new ORealIncome();
             $data['practical_fee'] = $m_fee->getBargainTaxes($data['id']);    //获取实收佣金
+        } else {
+            $data = [];
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取成交报告详情
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getBargainOrderList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params)
+    {
+        $data = $this->field($field)->alias('a')
+            ->join('o_report b', 'a.report_id = b.id', 'left')
+            ->join('o_order c', 'a.order_id = c.id', 'left')
+            ->join('g_houses d', 'c.house_id = d.id', 'left')
+            ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+
+        foreach ($data as $k=>$v) {
+            if (isset($v['singntime'])) {
+                $data[$k]['singntime'] = date('Y-m-d', strtotime($v['singntime']));
+            }
+
+            if (empty($v['shangpu_tags'])) {
+                $data[$k]['shangpu_tags'] = "";
+            }
         }
 
         return $data;

public/app/js/agent_detail.js

@@ -175,7 +175,7 @@ $(function() {
 											'1': dealStar(item['evaluate_grade']),
 											'2': dealStarText(item['evaluate_grade']),
 											'3': item['created'],
-											'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']['address']+'看房'):'暂无看房数据',
+											'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']+'看房'):'暂无看房数据',
 											'5': item['evaluate_content'],
 											'6': item['user_pic'],
 											'7': ServerHost+'/app/images/ic_default_headpic.png'

public/app/js/more_pingjia.js

@@ -90,7 +90,7 @@ $(function() {
 									'1': dealStar(item['evaluate_grade']),
 									'2': dealStarText(item['evaluate_grade']),
 									'3': item['created'],
-									'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']['address']+'看房'):'暂无看房数据',
+									'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']+'看房'):'暂无看房数据',
 									'5': item['evaluate_content'],
 									'6': item['user_pic'],
 									'7': ServerHost+'/app/images/ic_default_headpic.png'