用户信息接口调整

application/api/controller/Usercenter.php

@@ -97,11 +97,16 @@ class UserCenter extends Common
             $userInfo['memberinfo'] = $memberinfo;
         }
         //家族信息
-        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member';
+        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
         $guildWhere['status'] = 1;
         $guildWhere['user_id'] = $user_id;
         $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
         $userInfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
+        $guildStatus = -2;
+        if (!empty($guildInfo)) {
+            $guildStatus = $guildInfo['status'];
+        }
+        $userInfo['guild_status'] = $guildStatus;//家族状态:公会状态:0=待审核,1=正常,-1=已解散,-2无公会
         //动态
         //技能
         //礼物
@@ -1095,4 +1100,49 @@ class UserCenter extends Common
             $this->error($e->getMessage());
         }
     }
+    
+    /**
+     * 钻石兑换记录
+     * @return void
+     */
+    public function exchangeList()
+    {
+        try {
+            $field = 'id,sound_coin,createtime';
+            $where['user_id'] = $this->auth->id;
+            $result = model('UserExchangeLog')->field($field)->where($where)->autopage()->order('createtime desc')->select();
+            if (!empty($result)) {
+                foreach ($result as $key => &$value) {
+                    $value['jewel'] = '+'.$value['sound_coin'];
+                    $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i',$value['createtime']) : '';
+                    unset($value['sound_coin']);
+                }
+            }
+            $this->success('获取成功',$result);
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 钻石充值记录
+     * @return void
+     */
+    public function rechargeList()
+    {
+        try {
+            $field = 'id,detail,value,createtime';
+            $where['user_id'] = $this->auth->id;
+            $result = model('UserJewelLog')->field($field)->where($where)->autopage()->order('createtime desc')->select();
+            if (!empty($result)) {
+                foreach ($result as $key => &$value) {
+                    $value['value'] = '+'.$value['value'];
+                    $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i',$value['createtime']) : '';
+                }
+            }
+            $this->success('获取成功',$result);
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
 }

application/common/library/Auth.php

@@ -491,6 +491,17 @@ class Auth
         $userinfo['bind_wechat'] = !empty($user['openid']) ? 1 : 0;
         $userinfo['bind_alipay'] = !empty($userAlipay) ? 1 : 0;
         $userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
+        //家族信息
+        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
+        $guildWhere['status'] = 1;
+        $guildWhere['user_id'] = $this->_user->id;
+        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
+        $userinfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
+        $guildStatus = -2;
+        if (!empty($guildInfo)) {
+            $guildStatus = $guildInfo['status'];
+        }
+        $userinfo['guild_status'] = $guildStatus;//家族状态:公会状态:0=待审核,1=正常,-1=已解散,-2无公会
 
         //消费额是否能开箱子和大转盘
         $userinfo['can_egggift'] = 0;