分销来源显示

public/themes/admin_simpleboot3/admin/market/marketrecord.html

@@ -39,7 +39,7 @@
              
              <tbody>
 				<php>$user_statuses=array("0"=>lang('USER_STATUS_BLOCKED'),"1"=>lang('USER_STATUS_ACTIVATED'),"2"=>lang('USER_STATUS_UNVERIFIED'));</php>
-				<foreach name="account_logs" item="vo">
+				<foreach name="balance_logs" item="vo">
 				<tr>
 
 					 <td>
@@ -50,7 +50,7 @@
 					<td>{$vo.id}</td>
 					<td>{$vo.user_nickname}</td>
 					<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
-					<td>{$vo.source_uid}</td>
+					<td>{$vo.source_username.user_nickname}</td>
 					<td>{$vo.balance}</td>
 					
 					<td>

public/themes/admin_simpleboot3/admin/market/markettrans.html

@@ -28,6 +28,7 @@
 					<th width="50">ID</th>
                     <th>昵称</th>
 					<th>交易日期</th>
+					<th>来源</th>
 					<th>金额</th>
 					<th>变动类型</th>
                     <th>操作类型</th>
@@ -49,6 +50,7 @@
 					<td>{$vo.id}</td>
 					<td>{$vo.user_nickname}</td>
 					<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
+					<td>{$vo.source_username.user_nickname}</td>
 					<td>{$vo.balance}</td>
 					<td>
 						<switch name="vo.type">

vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

@@ -763,7 +763,17 @@ class MarketController extends AdminBaseController
             })
             ->field('blog.*,u.user_nickname')
             ->order("blog.id DESC")
-            ->paginate(10,false,['query'=>request()->param()]);
+            ->paginate(10,false,['query'=>request()->param()])
+            ->each(function($item,$key){
+
+               $item['source_username'] = Db::name('user')->where(['id'=> $item['source_uid'], 'user_type'=> 2])->field('user_nickname')->find();
+
+          
+               return $item;
+
+
+            })
+            ;
 
        //echo  Db::name('user_balance_log')->getLastSql();die();
 
@@ -809,13 +819,14 @@ class MarketController extends AdminBaseController
      */
 
     public function marketrecord(){
-
+     
+    // echo Db::name('user')->getLastSql().var_dump( $result);die();
          /**搜索条件**/
         $trans_name = $this->request->param('user_nickname'); 
         $money = $this->request->param('money'); 
         //$userEmail = trim($this->request->param('user_email'));
         //账户明细表（包含用户名称,爱心，余额） 
-        $account_logs = Db::name('user_balance_log')
+        $balance_logs = Db::name('user_balance_log')
             ->alias('blog')
             ->join('user u','blog.user_id=u.id','left')
             ->whereIn('blog.type',[31,32])
@@ -833,23 +844,24 @@ class MarketController extends AdminBaseController
             ->paginate(10,false,['query'=>request()->param()])
             ->each(function($item,$key){
 
-               $userarray = Db::name('user')->where(['id'=> $item['source_uid'], 'user_type'=> 2])->field('real_name,user_nickname');
+               $item['source_username'] = Db::name('user')->where(['id'=> $item['source_uid'], 'user_type'=> 2])->field('user_nickname')->find();
 
-               return $userarray;
+          
+               return $item;
 
 
             })
             ;
 
-       //echo  Db::name('user_balance_log')->getLastSql();die();
+        //echo  Db::name('user_balance_log')->getLastSql();die();
 
-        $account_logs->appends(['title' => $trans_name]);
+        $balance_logs->appends(['title' => $trans_name]);
         // 获取分页显示
-        $page = $account_logs->render();
+        $page = $balance_logs->render();
 
-       
+     // var_dump($balance_logs);die();
         $this->assign("page", $page);
-        $this->assign("account_logs", $account_logs);
+        $this->assign("balance_logs", $balance_logs);
         return $this->fetch();
 
     }