Merge branch '0910-v2.9.1' of https://gitee.com/zwyjjc/tl_estate into 0910-v2.9.1

application/model/GHouses.php

@@ -747,6 +747,12 @@ class GHouses extends BaseModel
             $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
         }
 
+        if (strpos($save_data['internal_address'], '路')) {
+            $save_data['external_address'] = $save_data['city'] . $save_data['disc']. substr($save_data['internal_address'], 0, strpos($save_data['internal_address'], '路')) . '路';
+        } else {
+            $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
+        }
+
         if (empty($data['id'])) {
             $save_data['upload_id']   = $agent_id; //上传人
             $save_data['create_time'] = date('Y-m-d H:i:s');
@@ -1350,8 +1356,8 @@ class GHouses extends BaseModel
         }
 
         //楼盘地址(对外)
-        if (empty($params['internal_address'])) {
-            $params['external_address'] = $params['city'] . $params['disc'];
+        if (strpos($params['internal_address'], '路')) {
+            $params['external_address'] = $params['city'] . $params['disc']. substr($params['internal_address'], 0, strpos($params['internal_address'], '路')) . '路';
         } else {
             $params['external_address'] = $params['city'] . $params['disc'];
         }

application/model/Users.php

@@ -444,7 +444,7 @@ class Users extends Model
     public function useraction_search_user_res($user_id, int $referrer = 0)
     {
         $field = 'id as user_id,agent_id,sex,user_nick,user_name,user_pic,user_status,user_phone,create_time,city,disc,user_label,
-        referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand,source,vip,first_login_time';
+        referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand,source,vip,first_login_time,source_intro';
         $data  = db('u_users')
             ->where('id', $user_id)
             ->field($field)

application/route.php

@@ -458,6 +458,7 @@ Route::group('task', [
 
     'updateShopTask'        => [ 'task/JobTask/updateShopTask', [ 'method' => 'post | get' ] ],   //默认跟进
     'updateShopImageIdTask' => [ 'task/JobTask/updateShopImageIdTask', [ 'method' => 'post | get' ] ],   //默认图片
+    'updateShopAddress' => [ 'task/JobTask/updateShopAddress', [ 'method' => 'get' ] ],   //默认图片
 
     'push' => [ 'task/PushMessageTask/push', [ 'method' => 'get' ] ]   //推送
 ]);

application/task/controller/JobTask.php

@@ -61,9 +61,31 @@ class JobTask
 
     public function updateShopImageIdTask()
     {
+//        set_time_limit(0); // 取消脚本运行时间的超时上限
+//        $image = new ImageDepotService();
+//        $field  = "id,industry_type,update_time";
+//        $params = [];
+//        $total     = $this->gHouseModel->getHouseListTotal($params);
+//        $pageSize  = 200;
+//        $pageTotal = ceil($total / $pageSize);
+//        for ($pageNo = 1; $pageNo <= $pageTotal; $pageNo++) {
+//            $houseList = $this->gHouseModel->getShopList($field, $params, $pageNo, $pageSize);
+//            $houseArr  = [];
+//            foreach ($houseList as $item) {
+//                $industry_type = explode(',', $item['industry_type']);
+//                $houseBin['external_image_id'] = $image->getImage($industry_type[0]);
+//                $houseBin["id"] = $item["id"];
+//                $houseBin["update_time"]   = $item["update_time"];
+//                array_push($houseArr, $houseBin);
+//            }
+//            $this->gHouseModel->updateHouse($houseArr);
+//        }
+
+    }
+
+    public function updateShopAddress() {
         set_time_limit(0); // 取消脚本运行时间的超时上限
-        $image = new ImageDepotService();
-        $field  = "id,industry_type,update_time";
+        $field  = "id,internal_address,city,disc,update_time";
         $params = [];
         $total     = $this->gHouseModel->getHouseListTotal($params);
         $pageSize  = 200;
@@ -72,14 +94,16 @@ class JobTask
             $houseList = $this->gHouseModel->getShopList($field, $params, $pageNo, $pageSize);
             $houseArr  = [];
             foreach ($houseList as $item) {
-                $industry_type = explode(',', $item['industry_type']);
-                $houseBin['external_image_id'] = $image->getImage($industry_type[0]);
-                $houseBin["id"] = $item["id"];
-                $houseBin["update_time"]   = $item["update_time"];
+                if (strpos($item['internal_address'], '路')) {
+                    $houseBin['external_address'] = $item['city'] . $item['disc'] . substr($item['internal_address'], 0, strpos($item['internal_address'], '路')) . '路';
+                } else {
+                    $houseBin['external_address'] = $item['city'] . $item['disc'];
+                }
+                $houseBin["id"]          = $item["id"];
+                $houseBin["update_time"] = $item["update_time"];
                 array_push($houseArr, $houseBin);
             }
             $this->gHouseModel->updateHouse($houseArr);
         }
-
     }
 }
\ No newline at end of file