address

application/index/controller/OfficeBargain.php

@@ -24,6 +24,7 @@ use app\model\OfficeTAgentTotalModel;
 use app\model\TAgentTotalModel;
 use app\model\Users;
 use app\task\controller\ResultsSummaryNewTask;
+use app\task\controller\ResultsSummaryOfficeTask;
 use think\Request;
 
 class OfficeBargain extends Basic
@@ -483,10 +484,10 @@ class OfficeBargain extends Basic
      */
     public function editRecordLog(int $bargain_id, string $step_content = '', int $type = 1, string $house_number = '', $is_open = 0)
     {
-        $house_number_table = $this->m_bargain->getCheckBargain('a.house_number,c.internal_address', (int)$bargain_id, '10,11,12,13,20,21,30');
+        $house_number_table = $this->m_bargain->getCheckBargain('a.house_number,e.address', (int)$bargain_id, '10,11,12,13,20,21,30');
 
-        if (!empty($house_number_table['internal_address'])) {
-            $step_content .= "[{$house_number_table['internal_address']}]";
+        if (!empty($house_number_table['address'])) {
+            $step_content .= "[{$house_number_table['address']}]";
         }
 
         if (empty($house_number)) {
@@ -646,7 +647,7 @@ class OfficeBargain extends Basic
      */
     private function updatePerformanceData($id, $create_time, $store_id, $district_id) {
         //更新业绩统计
-        $sum = new ResultsSummaryNewTask();
+        $sum = new ResultsSummaryOfficeTask();
         $date = date('Y-m-d', strtotime($create_time));
         $sum->updateTotalByAgentId($id, $store_id, $district_id, $date, $this->siteId);  //被修改的人
     }

application/model/OfficeOBargainModel.php

@@ -1295,7 +1295,8 @@ class OfficeOBargainModel extends Model
     {
         return $this->field($field)->alias('a')
             ->join('office_o_order b', 'a.order_id=b.id', 'left')
-            ->join('g_houses c', 'b.house_id=c.id', 'left')
+            ->join('office_g_room c', 'b.house_id=c.id', 'left')
+            ->join('office_g_building e', 'c.building_id=e.id', 'left')
             ->join('a_agents d', 'a.agent_id=d.id','left')
             ->where('a.status', 'in', $status)
             ->where('a.id', $id)