报备时间轴和数据转换

application/api/extend/Basic.php

@@ -48,7 +48,8 @@ class Basic extends Controller
         "api/getBroker",
         "api/brokerDetail",
         "api/commentAndDeal",
-        "api/check_code"
+        "api/check_code",
+        "api/convertOrderByTime",
     );
 
     /**

application/api_broker/service/OrderLogService.php

@@ -205,7 +205,8 @@ class OrderLogService
         $oBargainModel    = new OBargainModel();
 
 
-        $orderData = $orderModel->selectOrderByOrderId("f_id,house_title", [ "id" => $order_id ]);
+        $orderData = $orderModel->selectOrderByOrderId("f_id,house_title", [ "order_id" => $order_id ]);
+        //dump($orderData);
         if (count($orderData) == 0) {
             return [ "101", "找不到此订单编号" ];
         }

application/model/Applies.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use Think\Db;
 use think\Model;
 
 class Applies extends Model
@@ -23,4 +24,26 @@ class Applies extends Model
             ->select();
     }
 
+    public function getApplies($pageNo, $pageSize, $field)
+    {
+
+        return Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join('houseinfos b', 'a.house_id = b.id', 'LEFT')
+            ->join('agents c', 'a.agent_id = c.id', 'LEFT')
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+    }
+    public function getAppliesCount()
+    {
+
+        return $this
+            ->field("a.id")
+            ->alias("a")
+            ->join('houseinfos b', 'a.house_id = b.id', 'LEFT')
+            ->count();
+    }
+
 }

application/model/OrderModel.php

@@ -41,7 +41,7 @@ class OrderModel extends Model
     {
         $where_ = [];
         if (isset($params["order_id"])) {
-            $where_["order_id"] = $params["order_id"];
+            $where_["id"] = $params["order_id"];
         }
         if (isset($params["f_id"])) {
             $where_["f_id"] = $params["f_id"];
@@ -49,10 +49,12 @@ class OrderModel extends Model
         if (isset($params["house_id"])) {
             $where_["house_id"] = $params["house_id"];
         }
-        return $this->db_
+        $result = $this->db_
             ->field($filed)
             ->where($where_)
             ->select();
+        //echo $this->db_->getLastSql();
+        return $result;
     }
 
     /**

application/model/Users.php

@@ -368,4 +368,35 @@ class Users extends Model
             ->field('id as user_id,sex,user_nick,user_phone,user_status,agent_id,create_time')
             ->select();
     }
+
+    /**
+     * 数据转换 返回用户信息
+     * @param $params
+     * @return false|mixed|\PDOStatement|string|\think\Collection
+     */
+    public function insertUserConvert($params){
+        $where_ = [];
+        if(isset($params["user_phone"])){
+            $where_ ["user_phone"] = $params ["user_phone"];
+        }
+        $model = Db::table($this->table);
+
+       $list = $model
+            ->field("id,user_name,user_phone")
+            ->where($where_)
+             ->limit(1)
+            ->select();
+        if(count($list) > 0){
+            return $list[0];
+        }else{
+           $id = $model->insertGetId($params);
+           if($id > 0){
+               $list["id"] = $id;
+               $list["user_name"] = $params["user_name"];
+               $list["user_phone"] = $params["user_phone"];
+               return $list;
+           }
+        }
+
+    }
 }

application/route.php

@@ -274,6 +274,9 @@ Route::group('api', [
     'getULabelsListApp' => [ 'api_broker/Client/getULabelsListApp', [ 'method' => 'get' ] ],//客户标签
     'all_user' => [ 'api_broker/Client/all_user', [ 'method' => 'post|get' ]  ],//全部客户 朱伟
 
+
+
+    'convertOrderByTime' => [ 'api/ConvertOrder/convertOrderByTime', [ 'method' => 'post|get' ]  ],
 ]);
 
 Route::group('chat', [