工会微调整

application/api/controller/Guild.php

@@ -594,7 +594,7 @@ class Guild extends Api
     public function guildMember() {
         $guild_id = input("guild_id",0,"intval"); //公会ID
         $page = input('page',1); // 分页
-        $pageNum = input('pageNum',10); // 分页
+        $pageNum = input('listrow',10); // 分页
         // 分页搜索构建
         $pageStart = ($page-1)*$pageNum;
         if($guild_id <= 0) $this->error("参数错误！");
@@ -612,7 +612,9 @@ class Guild extends Api
             ->limit($pageStart,$pageNum)
             ->order("a.role","desc")
             ->select();
-        $role = [0=>'成员',1=>'副族长',2=>'族长'];
+
+        $role = [0=>'成员',1=>'副会长',2=>'会长'];
+
         if($guildMemberList) {
             foreach($guildMemberList as $k => &$v) {
                 $v["role_text"] = $role[$v["role"]];
@@ -629,6 +631,7 @@ class Guild extends Api
                 $v['online_text'] = $onlineText;
             }
         }
+
         $res = [];
         $res["memberCount"] = $guildMemberCount;
         $res["memberList"] = $guildMemberList;
@@ -642,18 +645,26 @@ class Guild extends Api
     public function getGuildMemberInfo() {
         $member_id = input("member_id",0,"intval"); //公会成员ID
         if($member_id <= 0) $this->error("参数错误！");
+
+        //成员信息
         $memberData = model('GuildMember')->field('id,user_id')->find($member_id);
+
+        //更新成员的 财富值 ，魅力值，收到的礼物数量
         $userService = new UserService();
         $userService->updateGuildMember(['user_id'=>$memberData['user_id']]);
+
+        //从user表拿一些用户信息
         $memberInfo = model('GuildMember')
             ->field('id,user_id,wealth,charm,gift_num,role,guild_id,createtime')
             ->with(['user'=>function($uQuery){
                 $uQuery->field('id,avatar,nickname,gender,age,logintime,age_id,constellation_id,province_id,city_id');
             }])->find($member_id);
         if(!$memberInfo) $this->error("用户信息获取失败！");
+
         $userData  = isset($memberInfo['user']) ? $memberInfo['user'] : [];
         $gender    = isset($userData['gender']) ? $userData['gender'] : 1;
         $logintime = isset($userData['logintime']) ? $userData['logintime'] : 0;
+
         $userFieldInt = ['age'];
         $userFieldStr = ['avatar','nickname','age_text','constellation_text','province_text','city_text'];
         foreach ($userFieldInt as $keyInt => $valInt) {
@@ -666,42 +677,24 @@ class Guild extends Api
                 $memberInfo[$valStr] = isset($userData[$valStr]) ? $userData[$valStr] : '';
             }
         }
+
         unset($memberInfo['user']);
         $memberInfo['gender_text'] = $gender == 1 ? '男' : '女';
         $memberInfo["createtime"] = !empty($memberInfo["createtime"]) ? date("Y-m-d", $memberInfo["createtime"]) : '';
         $memberInfo["logintime"] = !empty($logintime) ? date("Y-m-d", $logintime) : '';
+
+        //我在这个工会的角色
         $myGuildMember = model('GuildMember')->field('role')->where(["user_id"=>$this->auth->id,"guild_id"=>$memberInfo->guild_id])->find();
         $memberInfo["my_role"] = !empty($myGuildMember) ? $myGuildMember['role'] : -1;
+
+        //几个比较大的值，改w单位
         $fieldArr = ['wealth','charm','gift_num'];
         foreach ($fieldArr as $fkey => $fval) {
             if ($memberInfo[$fval] > 10000) {
                 $memberInfo[$fval] = bcdiv($memberInfo[$fval],10000,2).'w';
             }
         }
-        /*$userJewelLogWhere["type"] = ["in",[0,2,3,5,6,13]];//查看wallet.php文件
-        $userJewelLogWhere["user_id"] = $userData['id'];
-        $userJewelLogPay = model('UserJewelLog')
-            ->field("sum(value) as total_price")
-            ->where($userJewelLogWhere)
-            ->select();
-        $memberInfo['wealth'] = isset($userJewelLogPay[0]['total_price']) ? (int)$userJewelLogPay[0]['total_price'] : 0;
-        if ($memberInfo['wealth'] > 10000) {
-            $memberInfo['wealth'] = bcdiv($memberInfo['wealth'],10000,2).'w';
-        }
-        $userGiftWhere = [];
-        $userGiftWhere["user_to_id"] = $userData['id'];
-        $userGift = model('GiftUserParty')
-            ->field("sum(value) as total_price,sum(number)as gift_total_num")
-            ->where($userGiftWhere)
-            ->select();
-        $memberInfo['charm'] = isset($userGift[0]['total_price']) ? (int)$userGift[0]['total_price'] : 0;
-        $memberInfo['gift_num'] = isset($userGift[0]['gift_total_num']) ? (int)$userGift[0]['gift_total_num'] : 0;
-        if ($memberInfo['charm'] > 10000) {
-            $memberInfo['charm'] = bcdiv($memberInfo['charm'],10000,2).'w';
-        }
-        if ($memberInfo['gift_num'] > 10000) {
-            $memberInfo['gift_num'] = bcdiv($memberInfo['gift_num'],10000,2).'w';
-        }*/
+
         $this->success("获取成功！",$memberInfo);
     }
 

application/common/service/UserService.php

@@ -359,6 +359,8 @@ class UserService
                 $guildMember = model('GuildMember')->where($guildMemberWhere)->count();
                 if (!empty($guildMember)) {
                     $wealth = $charm = $gift_num = 0;
+
+                    //消费
                     $userJewelLogWhere["type"] = ["in",[0,2,3,5,6,13]];//查看wallet.php文件
                     $userJewelLogWhere["user_id"] = $userId;
                     $userJewelLogPay = model('UserJewelLog')
@@ -366,6 +368,8 @@ class UserService
                         ->where($userJewelLogWhere)
                         ->select();
                     $wealth = isset($userJewelLogPay[0]['total_price']) ? (int)$userJewelLogPay[0]['total_price'] : 0;
+
+                    //礼物
                     $userGiftWhere = [];
                     $userGiftWhere["user_to_id"] = $userId;
                     $userGift = model('GiftUserParty')