收送礼物的备注，亲密度攻略

application/api/controller/Gift.php

@@ -95,7 +95,7 @@ class Gift extends Api
 
         if($giftvalue > 0){
             // 扣除当前用户金币
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'gold',-$giftvalue,53,'赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'gold',-$giftvalue,53,'给['.$touserinfo['nickname'].']赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);
@@ -103,7 +103,7 @@ class Gift extends Api
         }
         if($data['getmoney'] > 0){
             // 添加获赠用户收益
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,$this->auth->id,'money',$data['getmoney'],54,'获得礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing',$log_id,2);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,$this->auth->id,'money',$data['getmoney'],54,'获得['. $this->auth->nickname .']的礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_typing',$log_id,2);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);

application/api/controller/Intimacy.php

@@ -161,6 +161,8 @@ class Intimacy extends Api
 
         $data['level_list'] = $list; //等级列表
 
+        $data['intimacyrule'] = config('site.intimacyrule'); //亲密度攻略
+
         $this->success('亲密度等级信息', $data);
     }
 

application/api/controller/Topicdongtai.php

@@ -754,7 +754,7 @@ class Topicdongtai extends Api
 
         if($giftvalue > 0){
             // 扣除当前用户余额
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'gold',-$giftvalue,59,'赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_dongtai',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,$user_id,'gold',-$giftvalue,59,'给['.$touserinfo['nickname'].']赠送礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_dongtai',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);
@@ -762,7 +762,7 @@ class Topicdongtai extends Api
         }
         if($data['getmoney'] > 0){
             // 添加获赠用户收益
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,$this->auth->id,'money',$data['getmoney'],60,'获得礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_dongtai',$log_id,2);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,$this->auth->id,'money',$data['getmoney'],60,'获得['. $this->auth->nickname .']的礼物:'.$giftinfo["name"] . '*' . $number,'gift_user_dongtai',$log_id,2);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);