财务确认时间

application/index/controller/PayLogOpen.php

@@ -163,7 +163,7 @@ class PayLogOpen extends Basic
         }
 
         $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.status,a.house_address,b.create_time as disc_time,max(b.id) as two_id';
+        $fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.status,a.house_address,c.name';
 
         $redis_service = new RedisCacheService();
         $m_pay_log = new OPayLogModel();
@@ -174,17 +174,16 @@ class PayLogOpen extends Basic
                 $log_where['open_id'] = $v['id'];
                 $log_where['is_del'] = 0;
                 $log_where['status'] = 1;
-                $list[$k]['disc_time'] = $this->m_pay_open_log->getFieldOneValue('create_time', $log_where);
+                $disc_time = $this->m_pay_open_log->getFieldOneValue('create_time', $log_where);
+                $list[$k]['disc_time'] = empty($disc_time) ? '':$disc_time;
 
-                if ($v['status'] == 3) {
-                    $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'] : '';
+                if ($v['status'] > 1) {
+                    $pay_log_data = $this->m_pay_open_log->getFind('create_time', 0, ['open_id'=>$v['id'],'status'=>3]);
+                    $list[$k]['check_time'] = isset($pay_log_data['create_time']) ? $pay_log_data['create_time'] : '';
                 } else {
                     $list[$k]['check_time'] = '';
                 }
-
-                $agent_name = $redis_service->getRedisCache(2, $v['agent_id']);
-                $list[$k]['agent_name'] = $agent_name['name'];
+                $list[$k]['agent_name'] = $v['name'];
                 unset($list[$k]['two_id']);
             }
             $data['list'] = $list;

application/model/OPayLogOpenLog.php

@@ -57,4 +57,25 @@ class OPayLogOpenLog extends BaseModel
             ->where($params)
             ->select();
     }
+
+    /**
+     * @param $field
+     * @param $id
+     * @param array $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * User HuJun
+     * Date 19-5-17 上午10:30
+     */
+    public function getFind($field, $id, $params = []) {
+        if ($id) {
+            $params['id'] = $id;
+        }
+        $params['is_del'] = 0;
+        return $this->db_->field($field)
+            ->where($params)
+            ->find();
+    }
 }
\ No newline at end of file

public/resource/template/open_check_template_tpl.html

@@ -20,8 +20,8 @@
         [% }else if (it[item]['status'] == 0) { %]	
          	<td>未审核</td>
         [% } %]	
-        <td>[%= it[item]['check_time'] %]</td>
         <td>[%= it[item]['disc_time'] %]</td>
+        <td>[%= it[item]['check_time'] %]</td>
         <td>
             <a class="btn1 btn-success rejected" href="#modal-check" data-toggle="modal" data-id='[%= it[item]["id"] %]'>开业审核</a>
         	<a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>成交报告</a>