财务-分红统计-合伙人分红记录-修改

app/controller/admin/user/User.php

@@ -1455,10 +1455,10 @@ class User extends BaseController
         if($nickname) $where[] = ['u.nickname','like','%'.$nickname.'%'];
         if($account) $where[] = ['u.account','=',$account];
 
-        $query = Db::name('old_user_weekaward')->alias('w')
+        $query = Db::name('partner_profit_records')->alias('w')
             ->leftJoin('user u','w.user_id=u.uid')
-            ->leftJoin('old_user_starlevel star','star.id=w.user_star_id')
-            ->field('w.*,u.uid,u.real_name,u.nickname,star.title')
+            ->leftJoin('user_identity identity','identity.user_group_id=w.user_group')
+            ->field('w.*,u.uid,u.real_name,u.nickname,identity.user_group_name')
             ->where($where);
 
         $data = $query->page($page)
@@ -1469,7 +1469,8 @@ class User extends BaseController
         if($data) {
             $data = $data->toArray();
             foreach ($data as $k => $v){
-                $data[$k]['award_num'] = bcadd($v['award_num'],$v['award_num_sm'],2);
+                // $data[$k]['award_num'] = bcadd($v['award_num'],$v['award_num_sm'],2);
+                $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
                 $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
                 $data[$k]['radio'] = $v['radio'] == 2 ? '已发放' : '未发放';
             }