cp 等级升级 装扮挂件和特效修改

application/api/model/UserCp.php

@@ -75,16 +75,19 @@ class UserCp extends Model
             Db::name('user_cp_gift_log')->insert($datas);
 
             $rees = Db::name('user_cp_zone')
-                ->whereOr(['user_id1' => $from_user_id,'status' => 1])
-                ->whereOr(['user_id2' => $from_user_id,'status' => 1])->find();
+                ->where(['status' => 1])
+                ->where('(user_id1 = '.$from_user_id.' OR user_id2 = '.$from_user_id.')')
+                ->find();
+
             if($rees && $re != $rees['id']){
                 //修改状态
                 Db::name('user_cp_zone')->where(['id' => $rees['id']])->update(['status' => 2]);
             }
 
             $ress = Db::name('user_cp_zone')
-                ->whereOr(['user_id1' => $to_user_id,'status' => 1])
-                ->whereOr(['user_id2' => $to_user_id,'status' => 1])->find();
+                ->where(['status' => 1])
+                ->where('(user_id1 = '.$to_user_id.' OR user_id2 = '.$to_user_id.')')
+                ->find();
             if($ress && $re != $ress['id']){
                 //修改状态
                 Db::name('user_cp_zone')->where(['id' => $ress['id']])->update(['status' => 2]);
@@ -108,8 +111,7 @@ class UserCp extends Model
             return 2;
         }else{//创建推送信息2：表达心动信号
             $ress = Db::name('user_cp_find')
-                ->where(['status' => 0])
-                ->where(['from_user_id' => $from_user_id])
+                ->where(['from_user_id' => $from_user_id,'status' => 0])
                 ->select();
             if($ress){
                 //把状态改为2 status：0-待回应，1-建交成功，2-已取消，