Browse Source

后台收礼排行榜要显示公会名,公会角色

lizhen_gitee 1 year ago
parent
commit
51f69a7cf2

+ 6 - 4
application/admin/controller/UserGiftRank.php

@@ -41,11 +41,13 @@ class UserGiftRank extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
-            $list = model('GiftUserParty')->alias("gift_user_party")
-                ->field("gift_user_party.id,sum(gift_user_party.value) as total_price,gift_user_party.user_to_id,user.avatar as `user.avatar`,user.nickname as `user.nickname`,gift_user_party.createtime")
+            $list = model('GiftUserParty')->alias('gift_user_party')
+                ->field('gift_user_party.id,sum(gift_user_party.value) as total_price,gift_user_party.user_to_id,user.avatar as `user.avatar`,user.nickname as `user.nickname`,gift_user_party.createtime,gm.guild_id as `gm.guild_id`,gm.role as `gm.role`,guild.name as `guild.name`')
                 ->where($where)
-                ->join("hx_user user","user.id = gift_user_party.user_to_id")
-                ->group("gift_user_party.user_to_id")
+                ->join('hx_user user','user.id = gift_user_party.user_to_id','LEFT')
+                ->join('hx_guild_member gm','user.id = gm.user_id','LEFT')
+                ->join('hx_guild guild','gm.guild_id = guild.id','LEFT')
+                ->group('gift_user_party.user_to_id')
                 ->order('total_price',$order)
   //              ->select(false);echo $list;exit;
                 ->paginate($limit);

+ 3 - 0
public/assets/js/backend/user_gift_rank.js

@@ -32,6 +32,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user.avatar', title: __('User.avatar'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'total_price', title: __('Total_price'), operate: false, sortable: true},
+                        {field: 'gm.guild_id', title: '公会id',  sortable: false},
+                        {field: 'guild.name', title: '公会名',  sortable: false},
+                        {field: 'gm.role', title: '公会角色', searchList: {"0":'成员',"1":'副会长',"2":'会长'}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', visible:false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         //{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]