bug

application/api/controller/TradeLog.php

@@ -7,6 +7,7 @@ use app\model\Evaluate;
 use app\model\HouseImgs;
 use app\model\HouseInfos;
 use app\model\JournalAccounts;
+use app\model\OrderModel;
 use app\model\SubletModel;
 
 /**
@@ -20,6 +21,7 @@ class TradeLog extends Basic
 {
 
     protected $journalAccountsMode;
+    protected $orderModel;
     protected $dbImg;
     protected $evaluateMode;
     protected $houseInfoModel;
@@ -29,6 +31,7 @@ class TradeLog extends Basic
     {
         parent::__construct($request);
         $this->journalAccountsMode = new JournalAccounts();
+        $this->orderModel = new OrderModel();
         $this->dbImg               = new HouseImgs();
         $this->houseInfoModel      = new HouseInfos();
         $this->evaluateMode        = new Evaluate();
@@ -89,4 +92,49 @@ class TradeLog extends Basic
 
     }
 
+    public function getTradeListV2(){
+        $params = $this->params;
+        /*       $params = array(
+                   "user_id" => "4",
+                   "pageNo" => 1,
+                   "pageSize" => 15,
+               );*/
+
+        $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
+        if (!isset($params["user_id"])) {
+            return $this->response("101", "userId不能为空");
+        }
+        $order_ = 'a.created desc';
+
+        $field = "min(a.id) as id,a.tradecode,a.created as singntime,b.phpone,b.house_id,b.agent_id";
+
+        $result = $this->journalAccountsMode->getJournalAccountsList($pageNo, $pageSize, $order_, $field, $params);
+        if (count($result) <= 0) {
+            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"] ));
+            $result[$key]["room_num_left"] = $houseInfo["room_num_left"];
+            $result[$key]["foreign_name"]  = $houseInfo["foreign_name"];
+            $result[$key]["api_path"]      = IMG_PATH;
+            $imgParam["house_id"]          = $val["house_id"];
+            $imgParam["imgtype"]           = 1; //默认主图
+            $result[$key]["images"]        = $this->dbImg->getHouseImages($imgParam, 1);
+            $evaluateResult                = $this->evaluateMode->getIsEvaluate(20, $val["id"], $params["user_id"]);
+            $result[$key]["is_evaluate"]   = count($evaluateResult) > 0 ? 1 : 0;
+            //todo 是否以上架
+            $subParam["user_id"]  = $params["user_id"];
+            $subParam["house_id"] = $val["house_id"];
+            $subletResult         = $this->subletModel->getSubletByHoseId($subParam);
+            if (count($subletResult) > 0) {
+                $result[$key]["is_added"] = $subletResult[0]["status"];
+            } else {
+                $result[$key]["is_added"] = -1;
+            }
+        }
+        return $this->response("200", "request", $result);
+
+    }
+
 }
\ No newline at end of file

application/api_broker/controller/Performance.php

@@ -35,6 +35,7 @@ class Performance extends Basic
      */
     public function selectPerformanceByTime()
     {
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
         /*  $params = array(
               "agent_id" => 1,
@@ -99,6 +100,7 @@ class Performance extends Basic
      */
     public function storePerformanceBySearch()
     {
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
      /*   $params = array(
             "agent_id" => 1,
@@ -120,6 +122,7 @@ class Performance extends Basic
      */
     public function orderNoList()
     {
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
      /*   $params = array(
             "agent_id"   => 1,
@@ -152,6 +155,7 @@ class Performance extends Basic
      * @return \think\Response
      */
     public function storeOrAgentSort(){
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
       /*  $params = array(
             "agent_id"   => 1,

application/model/OrderModel.php

@@ -150,4 +150,6 @@ class OrderModel extends Model
             ->where('id',$order_id)
             ->find();
     }
+
+   // public function getOrder
 }
\ No newline at end of file