财务日志修改

application/index/controller/Finance.php

@@ -1258,8 +1258,8 @@ class Finance extends Basic
         }
 
         //商铺地址
-        if (!empty($this->params['house_address'])) {
-            $where['a.step_content'] = ['like', '%'.$this->params['house_address'].'%'];
+        if (!empty($this->params['internal_address'])) {
+            $where['a.step_content'] = ['like', '%'.$this->params['internal_address'].'%'];
         }
 
         //经纪人名字
@@ -1294,9 +1294,11 @@ class Finance extends Basic
      */
     public function editRecordLog(int $bargain_id, string $step_content = '', int $type = 1, string $house_number = '', int $is_open = 0) {
 
-        if (empty($house_number)) {
         $m_bargain = new OBargainModel();
-            $house_number = $m_bargain->getCheckBargain('house_number', (int)$bargain_id);
+        $house_number = $m_bargain->getCheckBargain('a.house_number,c.internal_address', (int)$bargain_id);
+        $step_content .= "[{$house_number['internal_address']}]";
+
+        if (empty($house_number)) {
             $house_number = $house_number['house_number'];
         }
 

application/index/controller/Remark.php

@@ -41,9 +41,6 @@ class Remark extends Basic
 
         $u_phone_follow = new UPhoneFollowPp();
 
-        $where['e.store_name'] = ['NULL'];
-        $where['f.district_name'] = ['NULL'];
-
         if (!empty($this->params['start_date']) && empty($this->params['end_date'])) {
             $where['a.create_time'] = ['> time', $this->params['start_date']. ' 00:00:00'];
         }

application/model/OBargainModel.php

@@ -943,9 +943,11 @@ class OBargainModel extends Model
      */
     public function getCheckBargain(string $field, int $id)
     {
-        return $this->field($field)
-            ->where('status', 'in', '10,11')
-            ->where('id', $id)
+        return $this->field($field)->alias('a')
+            ->join('o_order b', 'a.order_id=b.id', 'left')
+            ->join('g_houses c', 'b.house_id=c.id', 'left')
+            ->where('a.status', 'in', '10,11')
+            ->where('a.id', $id)
             ->find();
     }
 }
\ No newline at end of file