科普视频点赞优化

application/api/controller/User.php

@@ -230,7 +230,6 @@ class User extends Api
             $this->error('验签失败');
         }
         if(time() - $tv_signtime > 300){
-            //测试临时屏蔽
             $this->error('验签过期');
         }
 

application/api/controller/Video.php

@@ -62,7 +62,7 @@ class Video extends Api
         $info['is_good'] = 0;
 
         if($this->auth->isLogin()){
-            $is_good = Db::name('video_good')->where('user_id',$this->auth->id)->where('video_id',$id)->find();
+            $is_good = Db::name('video_good')->where('video_id',$id)->where('user_id',$this->auth->id)->find();
             if($is_good){
                 $info['is_good'] = 1;
             }
@@ -101,8 +101,20 @@ class Video extends Api
         $check = Db::name('video_good')->where($where)->find();
 
         if($check){
-            Db::name('video_good')->where($where)->delete();
+            Db::startTrans();
+            $rs = Db::name('video_good')->where($where)->delete();
+            if(!$rs){
+                Db::rollback();
+                $this->success('已取消点赞');
+            }
+
             $down = Db::name('video')->where('id',$id)->setDec('goodnum');
+            if($down === false){
+                Db::rollback();
+                $this->success('已取消点赞');
+            }
+
+            Db::commit();
             $this->success('已取消点赞');
         }else{
 
@@ -111,13 +123,13 @@ class Video extends Api
             $rs = Db::name('video_good')->insertGetId($where);
             if(!$rs){
                 Db::rollback();
-                $this->error('点赞失败');
+                $this->success('点赞成功');
             }
 
             $up = Db::name('video')->where('id',$id)->setInc('goodnum');
             if($up === false){
                 Db::rollback();
-                $this->error('点赞失败');
+                $this->success('点赞成功');
             }
 
             Db::commit();