亲密度，打字聊天扣费

application/api/controller/Intimacy.php

@@ -100,8 +100,11 @@ class Intimacy extends Api
 
         $level = 0; //当前等级
         $level_name = ''; //当前等级名称
+        $level_value = 0;//当前等级亲密度
         $qinmi_sum = 0; //当前亲密度
         $next_level_diff = 0; //距下一等级亲密度差值
+        $next_level_name = ''; //下一等级名称
+        $next_level_value = 0;//下一等级亲密度值
 
         //亲密度等级列表
         $list = Db::name('intimacy_level')->field('name,level,value')->order('value')->select();
@@ -113,19 +116,26 @@ class Intimacy extends Api
             $qinmi_sum = $user_intimacy_info['value'];
             if ($list) {
                 //当前等级信息
-                $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('id desc')->find();
+                $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('level desc')->find();
                 if ($level_info) {
                     $level = $level_info['level'];
                     $level_name = $level_info['name'];
+                    $level_value = $level_info['value'];
                 }
                 //下一等级信息
                 $next_level_info = Db::name('intimacy_level')->where(['value' => ['gt', $user_intimacy_info['value']]])->order('value')->find();
                 if ($next_level_info) {
+                    $next_level_name  = $next_level_info['name'];
+                    $next_level_value = $next_level_info['value'];
                     $next_level_diff = $next_level_info['value'] - $user_intimacy_info['value'];
                 }
             }
         } else {
-            $next_level_diff = Db::name('intimacy_level')->order('value')->value('value');
+
+            $next_level_info = Db::name('intimacy_level')->where('level',1)->find();
+            $next_level_diff = $next_level_info['value'];
+            $next_level_name = $next_level_info['name'];
+            $next_level_value = $next_level_info['value'];
         }
         if ($list) {
             foreach ($list as &$v) {
@@ -139,10 +149,16 @@ class Intimacy extends Api
             }
         }
 
+        $data['avatar'] = localpath_to_netpath($this->auth->avatar);
+        $data['other_avatar'] = localpath_to_netpath(Db::name('user')->where('id',$user_id)->value('avatar'));
+        $data['rate'] = $next_level_value == 0 ? 0 : bcdiv($qinmi_sum,$next_level_value,2)*100;
         $data['level'] = $level; //当前等级
         $data['level_name'] = $level_name; //当前等级名称
         $data['qinmi_sum'] = $qinmi_sum; //当前亲密度
         $data['next_level_diff'] = $next_level_diff; //距下一等级亲密度差值
+        $data['next_level_name'] = $next_level_name; //下一等级名称
+        $data['next_level_value'] = $next_level_value; //下一等级亲密度值
+
         $data['level_list'] = $list; //等级列表
 
         $this->success('亲密度等级信息', $data);

application/api/controller/Usercenter.php

@@ -469,7 +469,7 @@ class Usercenter extends Api
     //打字聊天每句话调用一次
     public function chat_once(){
         if ($this->auth->is_kefu == 1) { //我是客服或者对方是客服
-            $this->success('success',array('money'=>''));
+            $this->success('success',array('money'=>'free'));
         }
 
         if ($this->auth->gender == 0) { //女生不花钱
@@ -483,7 +483,7 @@ class Usercenter extends Api
             $this->error('不存在的用户');
         }
         if ($to_user_info['is_kefu'] == 1) { //我是客服或者对方是客服
-            $this->success('success',array('money'=>''));
+            $this->success('success',array('money'=>'free'));
         }
         if ($to_user_info['gender'] != 0) {
             $this->error('同性不能聊天~');
@@ -497,7 +497,7 @@ class Usercenter extends Api
         ];
         $is_friend = Db::name('user_follow')->where($where)->find();
         if($is_friend){
-            $this->success('success',array('money'=>''));
+            $this->success('success',array('money'=>'free'));
         }
 
         //验证金额
@@ -572,11 +572,11 @@ $resArray['money'] = $money;  //返回给前端的计算结果
         }
 
         //增加亲密度
-        /*$user_intimacy_rs = addintimacy($this->auth->id, $to_user_id, $price);
+        $user_intimacy_rs = addintimacy($this->auth->id, $to_user_id, $price);
         if (!$user_intimacy_rs['status']) {
             Db::rollback();
             $this->error('您的网络开小差啦~');
-        }*/
+        }
 
         //tag任务赠送金币
         //私信5名异性奖励