Merge branch 'test'

application/api/controller/Index.php

 <?php
+
 namespace app\api\controller;
+
 /**
  * Created by PhpStorm.
  * User : zw
@@ -14,26 +16,31 @@ use app\model\GHouses;
 use app\model\HouseInfos;
 use app\model\JournalAccounts;
 use app\model\OrderModel;
+use app\model\Users;
 
 class Index extends Basic
 {
-  public function banner(){
+    public function banner()
+    {
 
     }
 
     /**
-     * 月均价 上周成交量 ==>修改为日均价了
+     * 月均价 上周成交量 ==>修改为日均价了==》改成求租人
      */
-  public function averagePriceAndTurnover(){
+    public function averagePriceAndTurnover()
+    {
 
-      $houseInfos = new GHouses();
-      $averagePrice = $houseInfos->getAveragePrice();
+        /* $houseInfos = new GHouses();
+         $averagePrice = $houseInfos->getAveragePrice();*/
+        $userModel  = new Users();
+        $user_count = $userModel->countUser();
         // $journalAccounts = new JournalAccounts();
         $journalAccounts        = new OrderModel();
-      $turnover     = $journalAccounts ->getTurnover();
-      $result['averagePrice'] = $averagePrice;
-      $result['turnover'] = $turnover;
-      return $this->response("request success","200",$result);
+        $turnover               = $journalAccounts->getTurnover();
+        $result['averagePrice'] = $user_count;
+        $result['turnover']     = $turnover * 9;//不要问为什么乘以9，产品说怎么搞就怎么搞
+        return $this->response("request success", "200", $result);
 
     }
 
@@ -42,7 +49,8 @@ class Index extends Basic
      *
      * @return type
      */
-  public function miss() {
-      return $this->response('101','URL is error');
+    public function miss()
+    {
+        return $this->response('101', 'URL is error');
     }
 }

application/model/Users.php

@@ -481,4 +481,13 @@ class Users extends Model
     public function updateUserAll($data) {
         return $this->saveAll($data);
     }
+
+    public function countUser(){
+        $result = $this
+            ->field("id")
+            ->where(["user_status"=>0])
+            ->count("id");
+        echo $this->getLastSql();
+        return $result;
+    }
 }