1

application/api_broker/service/OrderLogService.php

@@ -131,7 +131,7 @@ class OrderLogService
             }
 
             $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $type, $site_id); //推送
+            $pushMarchIn->pushMarchInMessage($report_id, 2, $agent_id, $type, $site_id); //推送
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {

application/index/controller/Finance.php

@@ -3845,13 +3845,12 @@ class Finance extends Basic
                 $bargain_where['id']        = $pay_data['bargain_id'];
                 $price                      = $this->m_bargain->getFieldValue('price', $bargain_where);
                 $pay_data['price']          = empty($price) ? 0 : $price;
-
-                $m_order    = new OrderModel();
-                $house_data = $m_order->selectOrderByOrderId('b.id,b.internal_address,a.f_id', ['order_id' => $pay_data['order_id']]);
-
-                $pay_data['house_id'] = empty($house_data[0]['id']) ? '' : $house_data[0]['id'];
-                $pay_data['address']  = empty($house_data[0]['internal_address']) ? '' : $house_data[0]['internal_address'];
             }
+            $m_order    = new OrderModel();
+            $house_data = $m_order->selectOrderByOrderId('b.id,b.internal_address,a.f_id', ['order_id' => $pay_data['order_id']]);
+
+            $pay_data['house_id'] = empty($house_data[0]['id']) ? '' : $house_data[0]['id'];
+            $pay_data['address']  = empty($house_data[0]['internal_address']) ? '' : $house_data[0]['internal_address'];
 
             $m_pay_adjustment      = new OPayLogAdjustment();
             $source_id             = $m_pay_adjustment->getFieldColumn('id', ['paylog_id' => $pay_data['id']]);