拒绝退回关系卡

application/api/controller/Relation.php

@@ -151,8 +151,8 @@ class Relation extends Api
         Db::startTrans();
 
         //扣掉一个关系卡
-        $use_card = Db::name('user_decorate_relation')->where('id',$cardnum['id'])->update(['is_using'=>1,'updatetime'=>time()]);
-        if($use_card === false){
+        $use_card = Db::name('user_decorate_relation')->where('user_id',$this->auth->id)->where('is_using',0)->update(['is_using'=>1,'updatetime'=>time()]);
+        if(!$use_card){
             Db::rollback();
             $this->error('关系申请失败');
         }
@@ -245,7 +245,10 @@ class Relation extends Api
             'updatetime' => time(),
         ];
 
-        Db::name('user_relation')->where('id',$id)->update($data);
+        $rs = Db::name('user_relation')->where('id',$id)->update($data);
+        if($rs === false){
+            $this->error('操作失败');
+        }
 
         if($status == 1){
             $remark = '您已同意建立关系';
@@ -253,6 +256,13 @@ class Relation extends Api
         }else{
             $remark = '已拒绝';
             $remark2 = '已拒绝';
+
+            //退回关系卡
+            $use_card = Db::name('user_decorate_relation')->where('user_id',$info['uid'])->where('is_using',1)->update(['is_using'=>0,'updatetime'=>time()]);
+            if(!$use_card){
+                Db::rollback();
+                $this->error('操作失败');
+            }
         }
 
         //给发起方一条消息

application/api/controller/Topichub.php

@@ -24,7 +24,7 @@ class Topichub extends Api
     public function info(){
         $id   = input('id',0);
         $info = Db::name('topic_hub')->where(['status'=>1,'id'=>$id])->find();
-        $info = info_domain_image($info,['image']);
+        $info = info_domain_image($info,['image','bg_image']);
 
         //是否关注
         $is_follow = Db::name('user_follow_topic')->where(['uid'=>$this->auth->id,'topic_id'=>$id])->find();