开业审核详情

application/index/controller/Finance.php

@@ -5080,19 +5080,34 @@ class Finance extends Basic
             $where['a.agent_id'] = $this->params['agent_id'];
         }
 
+        //提交人id门店
+        if (isset($this->params['store_id'])) {
+            $where['c.store_id'] = $this->params['store_id'];
+        }
+
+        //提交人id部门
+        if (isset($this->params['district_id'])) {
+            $where['c.district_id'] = $this->params['district_id'];
+        }
+
         $where['a.is_del'] = 0;
         $fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.house_address,a.status,b.create_time as disc_time,max(b.id) as two_id';
         $m_pay_open = new OPayLogOpen();
         $m_pay_open_log = new OPayLogOpenLog();
         $redis_service = new RedisCacheService();
+        $m_pay_log = new OPayLogModel();
         $list = $m_pay_open->getListCheck($pageNo, $pageSize, 'a.id desc', $fields, $where);
 
         if ($this->params['excel'] == 0) {
             foreach ($list as $k=>$v) {
+                $log_where['open_id'] = $v['id'];
+                $log_where['is_del'] = 0;
+                $log_where['status'] = 1;
+                $list[$k]['disc_time'] = $m_pay_open_log->getFieldOneValue('create_time', $log_where);
+
                 if ($v['status'] == 3) {
-                    $log_where['open_id'] = $v['id'];
-                    $log_where['is_del'] = 0;
-                    $list[$k]['check_time'] = $m_pay_open_log->getFieldOneValue('create_time', $log_where);
+                    $pay_log_data = $m_pay_log->selectPayLogByOrderNo('create_time', ['id'=>$v['pay_log_id']]);
+                    $list[$k]['check_time'] = isset($pay_log_data[0]['create_time']) ? $pay_log_data[0]['create_time'] : '';
                 } else {
                     $list[$k]['check_time'] = '';
                 }
@@ -5193,7 +5208,7 @@ class Finance extends Basic
         $m_pay_log = new OPayLogModel();
         $m_house   = new GHouses();
         $redis_service = new RedisCacheService();
-
+        $m_o_img = new OImg();
 
         $field = 'id,agent_id,pay_log_id,order_id,bargain_id,intro,house_id,status';
         $pay_open_data = $m_pay_open->getFind($field, $this->params['open_id']);
@@ -5223,6 +5238,7 @@ class Finance extends Basic
             $pay_open_data['house_address'] = '';
         }
         $pay_open_data['check_log'] = $m_pay_open_log->getAllList('operation_name,create_time', $this->params['push_id']);
+        $pay_open_data['open_images'] = $m_o_img->getImgList(['img_id'=>$this->params['open_id'],'img_type'=>5]);
         return $this->response(200, '', $pay_open_data);
 
     }

application/model/OPayLogOpen.php

@@ -50,6 +50,7 @@ class OPayLogOpen extends BaseModel
     {
         return $this->db_->field($field)->alias('a')
             ->join('o_paylog_open_log b', 'a.id=b.open_id', 'left')
+            ->join('a_agents c', 'a.agent_id=c.id', 'left')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)
@@ -69,6 +70,7 @@ class OPayLogOpen extends BaseModel
     {
         return $this->db_->alias('a')
         ->join('o_paylog_open_log b', 'a.id=b.open_id', 'left')
+        ->join('a_agents c', 'a.agent_id=c.id', 'left')
         ->where($params)
         ->group('a.id')
         ->count($field);