Merge branch 'test'

application/api_broker/controller/CollectHouse.php

@@ -53,21 +53,24 @@ class CollectHouse extends Basic
         $get_params['house_id']      = $params["house_id"];
         $res = $this->aCollectHouse->getCollectHouse($field,$get_params);
 
-        if($res){//如果存在
-            if($res[0]['status'] != $params["status"] ){//如果存在-并且状态一致   不作处理 不一致则更新状态
-                $insert["id"]       = $res[0]['id'];
-                $insert["status"]   = $params["status"];
-
+        if ($res) {
+            if (count($res) > 1) {
+                //数据大于1，全部重置为2
+                $this->aCollectHouse->updateStatus($params["agents_id"], $params["house_id"]);
+            }
+            if ($res[0]['status'] != $params["status"]) {
+                //状态不一致 更新状态
+                $insert["id"] = $res[0]['id'];
+                $insert["status"] = $params["status"];
                 $res = $this->aCollectHouse->updateCollectHouse($insert);//int(1)
-
-            }else{
-                $res = true ;
+            } else {
+                //状态一致 不作处理
+                $res = true;
             }
-        }else{//不存在则新增数据
-            $insert["agents_id"]    = $params['agents_id'];
-            $insert["house_id"]     = $params['house_id'];
-            $insert["status"]       = 1;
-
+        } else {
+            $insert["agents_id"] = $params['agents_id'];
+            $insert["house_id"] = $params['house_id'];
+            $insert["status"] = 1;
             $res = $this->aCollectHouse->saveCollectHouse($insert);//int(1)
         }
 

application/api_broker/controller/CollectUser.php

@@ -61,7 +61,10 @@ class CollectUser extends Basic
         $get_params['user_id']      = $params["user_id"];
         $res = $this->aCollectUser->getCollectUser($field,$get_params);
 
-        if($res && (count($res) == 1)){//如果存在
+        if($res){//如果存在
+            if(count($res) > 1){
+                $this->aCollectUser->updateStatus($params["agents_id"],$params["user_id"]);
+            }
             if($res[0]['status'] != $params["status"] ){//如果存在-并且状态一致   不作处理 不一致则更新状态
                 $insert["id"]       = $res[0]['id'];
                 $insert["status"]   = $params["status"];
@@ -70,9 +73,6 @@ class CollectUser extends Basic
                 $res = true ;
             }
         }else{//不存在则新增数据
-            if(count($res) > 1){
-                $this->aCollectUser->updateStatus($params["agents_id"],$params["user_id"]);
-            }
             $insert["agents_id"]    = $params['agents_id'];
             $insert["user_id"]     = $params['user_id'];
             $insert["status"]       = 1;

application/model/ACollectHouse.php

@@ -99,4 +99,12 @@ class ACollectHouse extends Model
         return $result;
     }
 
+    public function updateStatus($agents_id,$house_id)
+    {
+        $result = $this->where(['agents_id'=>$agents_id,'house_id'=>$house_id])->update(['status'=>2]);
+        //dump($this->getLastSql());
+        // big_log($this->getLastSql());
+        return $result;
+    }
+
 }