app\model\HouseInfos

application/api/controller/AppointmentTime.php

@@ -11,7 +11,6 @@ use app\model\GHouses;
 use app\model\GHousesImgs;
 use app\model\GHousesToAgents;
 use app\model\GImageDepot;
-use app\model\HouseInfos;
 use app\model\OReportModel;
 use app\model\Users;
 
@@ -38,7 +37,6 @@ class AppointmentTime extends Basic
     {
         parent::__construct($request);
         $this->appointmentTimeModel = new AppointWatchShop();
-        //$this->houseInfoModel       = new HouseInfos();
         $this->houseInfoModel = new GHouses();
         $this->dbImg          = new GHousesImgs();
         $this->appliesModel   = new Applies();

application/api/controller/Index.php

@@ -13,8 +13,6 @@ namespace app\api\controller;
 
 use app\api\extend\Basic;
 use app\model\GHouses;
-use app\model\HouseInfos;
-use app\model\JournalAccounts;
 use app\model\OrderModel;
 use app\model\Users;
 

application/api/controller/TradeLog.php

@@ -4,8 +4,8 @@ namespace app\api\controller;
 
 use app\api\extend\Basic;
 use app\model\Evaluate;
+use app\model\GHouses;
 use app\model\HouseImgs;
-use app\model\HouseInfos;
 use app\model\JournalAccounts;
 use app\model\OrderModel;
 use app\model\SubletModel;
@@ -33,7 +33,7 @@ class TradeLog extends Basic
         $this->journalAccountsMode = new JournalAccounts();
         $this->orderModel = new OrderModel();
         $this->dbImg               = new HouseImgs();
-        $this->houseInfoModel      = new HouseInfos();
+        $this->houseInfoModel      = new GHouses();
         $this->evaluateMode        = new Evaluate();
         $this->subletModel         = new SubletModel();
     }
@@ -69,9 +69,9 @@ class TradeLog extends Basic
             return $this->response("200", "请求数据为空");
         }
         foreach ($result as $key => $val) {
-            $houseInfo                     = $this->houseInfoModel->getHouseDetails("a.room_num_left,b.foreign_name", array( "a.id" => $val["house_id"] ));
+            $houseInfo                     = $this->houseInfoModel->getHouseInfo("residue_num,external_title", array( "id" => $val["house_id"] ));
             $result[$key]["room_num_left"] = $houseInfo["room_num_left"];
-            $result[$key]["foreign_name"]  = $houseInfo["foreign_name"];
+            $result[$key]["foreign_name"]  = $houseInfo["external_title"];
             $result[$key]["api_path"]      = IMG_PATH;
             $imgParam["house_id"]          = $val["house_id"];
             $imgParam["imgtype"]           = 1; //默认主图
@@ -114,9 +114,9 @@ class TradeLog extends Basic
             return $this->response("200", "请求数据为空");
         }
         foreach ($result as $key => $val) {
-            $houseInfo                     = $this->houseInfoModel->getHouseDetails("a.room_num_left,b.foreign_name", array( "a.id" => $val["house_id"] ));
+            $houseInfo                     = $this->houseInfoModel->getHouseInfo("residue_num,external_title", array( "id" => $val["house_id"] ));
             $result[$key]["room_num_left"] = $houseInfo["room_num_left"];
-            $result[$key]["foreign_name"]  = $houseInfo["foreign_name"];
+            $result[$key]["foreign_name"]  = $houseInfo["external_title"];
             $result[$key]["api_path"]      = IMG_PATH;
             $imgParam["house_id"]          = $val["house_id"];
             $imgParam["imgtype"]           = 1; //默认主图

application/api_broker/service/ReportService.php

@@ -5,7 +5,6 @@ namespace app\api_broker\service;
 use app\api\untils\GeTuiUntils;
 use app\model\GHouses;
 use app\model\GHousesToAgents;
-use app\model\HouseInfos;
 use app\model\OrderModel;
 use app\model\OReportModel;
 use app\model\Users;

application/app_broker/controller/Index.php

@@ -5,7 +5,6 @@ namespace app\app_broker\controller;
 use app\api\untils\WxCallbackUntils;
 use app\model\AppVersion;
 use app\model\HouseImgs;
-use app\model\HouseInfos;
 use app\model\Users;
 use app\model\UWxInfo;
 use think\Controller;

application/chat/controller/AppChat.php

@@ -17,11 +17,7 @@ use app\chat\utils\RPush;
 use app\extra\RedisPackage;
 use app\model\ChatMsg;
 use app\model\GHouses;
-use app\model\GHousesExt;
 use app\model\GHousesImgs;
-use app\model\HouseImgs;
-use app\model\HouseinfoExts;
-use app\model\HouseInfos;
 use app\model\MPushMessage;
 use app\model\Users;
 use think\Cache;

application/task/controller/Exclusive.php

-<?php
-
-/**
- * Description of Autoexec
- *
- * @author : hujun
- * @date   :   2018-1-9 14:39:26
- * @internal :  自动执行
- */
-namespace app\task\controller;
-use app\model\HouseInfos;
-use think\Log;
-
-class Exclusive {
-
-    /**
-     * 独家时间过期下架商铺
-     *
-     * @return string
-     * @throws \Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function exclusiveExpirationTime() {
-        $house = new HouseInfos();
-        $house_data = $house->field('id,room_num_left,exclusive_end')
-            ->where('exclusive_type', 1)
-            ->where('is_delete', 0)
-            ->where('room_num_left','<>', 0)
-            ->select();
-
-        $result = array();
-        if ($house_data) {
-            $insert = array();
-            foreach ($house_data as $k => $v) {
-                if ((strtotime($v['exclusive_end'] . ' 23:59:59') > time()) && ($v['exclusive_end'] != NULL)) {
-                    continue;
-                }
-                $insert[$k]['id'] = $v['id'];
-                $insert[$k]['room_num_left'] = 0;
-            }
-            $result = $house->saveAll($insert);
-        }
-        Log::record('exclusiveExpirationTime:'.json_encode($result),'TASK');
-        return ;
-    }
-}