diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php index 614f079..d0fac35 100755 --- a/app/admin/controller/Base.php +++ b/app/admin/controller/Base.php @@ -83,7 +83,7 @@ class Base extends MyController return isset($config[$key]) ? $config[$key] : $default; } - + #获取菜单 public function getMyMenuList() @@ -108,10 +108,12 @@ class Base extends MyController } else { $new_menu[$k] = [ 'name' => $v['name'], - 'son' => [[ - 'url' => $so['url'], - 'name' => $so['name'], - ],], + 'son' => [ + [ + 'url' => $so['url'], + 'name' => $so['name'], + ], + ], ]; } @@ -256,17 +258,21 @@ class Base extends MyController if (empty($uid)) { return $uid; } - + // 检查是否为UID格式 $user_config = getConfig('user_config'); if (!empty($user_config) && isset($user_config['uid_type']) && $user_config['uid_type'] != 0) { + if (strlen($uid) < $user_config['uid_length'] && is_numeric($uid)) { + return $uid; + } + // 如果配置了非真实ID的UID类型，需要根据UID查找用户ID $real_user_id = \app\common\model\User::where('uid', '=', $uid)->value('id'); if ($real_user_id) { return $real_user_id; } } - + return $uid; // 如果未找到或未配置，返回原值 } diff --git a/app/admin/controller/CouponReceive.php b/app/admin/controller/CouponReceive.php index 66c948b..3d0f4f9 100755 --- a/app/admin/controller/CouponReceive.php +++ b/app/admin/controller/CouponReceive.php @@ -28,6 +28,7 @@ class CouponReceive extends Base $whe[] = ['title', 'like', '%' . $keyword . '%']; } if ($user_id) { + $user_id = $this->convertUidToUserId($user_id); $whe[] = ['user_id', '=', $user_id]; } if (!empty($status)) { @@ -43,8 +44,10 @@ class CouponReceive extends Base $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $data['list'][$key]['nickname'] = $user_info['nickname']; + $data['list'][$key]['uid'] = $user_info['uid']; // $val['user_id']= } View::assign('list', $data['list']); diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php index ab2b47f..e2e05b7 100755 --- a/app/admin/controller/Finance.php +++ b/app/admin/controller/Finance.php @@ -57,15 +57,17 @@ class Finance extends Base $data['count'] = $list->total(); $data['page'] = $page; foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where('id', '=', $value['user_id'])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where('id', '=', $value['user_id'])->find(); if (empty($user_info)) { $user_info['nickname'] =''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -102,15 +104,17 @@ class Finance extends Base } $data = ProfitMoney::getList($whe, '*', 'id desc', $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); if ($user_info != null) { $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } else { $value['nickname'] = ''; $value['headimg'] = ''; $value['mobile'] = ''; + $value['uid'] = ''; } } View::assign('list', $data['list']); @@ -149,15 +153,17 @@ class Finance extends Base } $data = ProfitIntegral::getList($whe, '*', 'id desc', $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { $user_info['nickname'] =''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -194,15 +200,17 @@ class Finance extends Base } $data = ProfitScore::getList($whe, '*', 'id desc', $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { $user_info['nickname'] =''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -243,24 +251,28 @@ class Finance extends Base } $data = ProfitDraw::getList($whe, '*', 'id desc', $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { $user_info['nickname'] =''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; - $share_info = User::field('nickname,headimg,mobile')->where(['id' => $value['share_uid']])->find(); + $value['uid'] = $user_info['uid'] ?: $value['user_id']; + $share_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['share_uid']])->find(); if (empty($share_info)) { $share_info['nickname'] = ''; $share_info['headimg'] = ''; $share_info['mobile'] = ''; + $share_info['uid'] = ''; } $value['share_nickname'] = $share_info['nickname']; $value['share_headimg'] = $share_info['headimg']; $value['share_mobile'] = $share_info['mobile']; + $value['share_uid_display'] = $share_info['uid'] ?: $value['share_uid']; } View::assign('list', $data['list']); View::assign('count', $data['count']); diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index acaa3c0..ba35284 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -62,10 +62,11 @@ class Order extends Base $order = 'id desc'; $data = OrderModel::getList($whe, $field, $order, $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -114,10 +115,11 @@ class Order extends Base $order = 'id desc'; $data = OrderModel::getList($whe, $field, $order, $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -200,15 +202,17 @@ class Order extends Base $order = 'id desc'; $data = OrderListRecovery::getList($whe, $field, $order, $this->page); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; + $user_info['uid'] = ''; } $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } View::assign('list', $data['list']); View::assign('count', $data['count']); @@ -301,17 +305,19 @@ class Order extends Base $whe[] = ['user_id', 'not in', $userList]; $all_goodslist_money_sum1 = OrderList::where('status', '=', 2)->where($whe)->sum('goodslist_money'); foreach ($data['list'] as &$value) { - $user_info = User::field('nickname,headimg,mobile,istest')->where(['id' => $value['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid,istest')->where(['id' => $value['user_id']])->find(); if ($user_info) { $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; $value['istest'] = $user_info['istest']; + $value['uid'] = $user_info['uid'] ?: $value['user_id']; } else { $value['nickname'] = ''; $value['headimg'] = ''; $value['mobile'] = ''; $value['istest'] = ''; + $value['uid'] = ''; } $goodslist_money = OrderList::where('send_num', '=', $value['send_num'])->sum('goodslist_money'); $value['goodslist_money'] = $goodslist_money; @@ -602,9 +608,9 @@ class Order extends Base try { $sheet->setCellValue('A' . $line, $value['order_num']); if ($value['user_info']) { - $sheet->setCellValue('B' . $line, 'ID：' . $value['user_id'] . ' 昵称：' . $value['user_info']['nickname'] . ' 手机号：' . $value['user_info']['mobile']); + $sheet->setCellValue('B' . $line, 'ID：' . $value['user_id'] . ' UID：' . ($value['user_info']['uid'] ?: $value['user_id']) . ' 昵称：' . $value['user_info']['nickname'] . ' 手机号：' . $value['user_info']['mobile']); } else { - $sheet->setCellValue('B' . $line, 'ID：' . $value['user_id'] . ' 昵称： 手机号：'); + $sheet->setCellValue('B' . $line, 'ID：' . $value['user_id'] . ' UID：' . $value['user_id'] . ' 昵称： 手机号：'); } $sheet->setCellValue('C' . $line, '盒子名称：' . $value['goods_title'] . ($value['num'] ? ' 箱号：' . $value['num'] : '')); $sheet->setCellValue('D' . $line, ['1' => '一番赏', '2' => '无限赏', '3' => '擂台赏', '4' => '抽卡机', '5' => '积分赏'][$value['order_type']] ?? ''); @@ -696,7 +702,7 @@ class Order extends Base $line = 2; foreach ($data as $value) { - $user_info = 'ID：' . ($value['user_id'] ?? '未知') . ' 昵称：' . ($value['user_info']['nickname'] ?? '未知') . ' 手机号：' . ($value['user_info']['mobile'] ?? '未知'); + $user_info = 'ID：' . ($value['user_id'] ?? '未知') . ' UID：' . ($value['user_info']['uid'] ?? $value['user_id']) . ' 昵称：' . ($value['user_info']['nickname'] ?? '未知') . ' 手机号：' . ($value['user_info']['mobile'] ?? '未知'); $addtime = date('Y-m-d H:i:s', $value['addtime']); $sheet->setCellValue('A' . $line, $user_info); @@ -787,7 +793,7 @@ class Order extends Base // 填充数据 $row = 2; foreach ($data as $value) { - $user_info = 'ID：' . $value['user_id'] . " 昵称：" . $value['user_info']['nickname'] . " 手机号：" . $value['user_info']['mobile']; + $user_info = 'ID：' . $value['user_id'] . " UID：" . ($value['user_info']['uid'] ?? $value['user_id']) . " 昵称：" . $value['user_info']['nickname'] . " 手机号：" . $value['user_info']['mobile']; $addtime = date('Y-m-d H:i:s', $value['addtime']); $goods = OrderList::where('send_num', $value['send_num']) diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 74e55c2..cf65328 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -692,6 +692,7 @@ class User extends Base $value['nick_name'] = $user['nickname']; $value['headimg'] = $user['headimg']; $value['openid'] = $user['openid']; + $value['uid'] = $user['uid'] ?: $user['id']; $value['num'] = $num; // $value['addtime'] =$user['addtime']; $num++; @@ -743,6 +744,15 @@ class User extends Base $data['list'] = $list->toArray()['data']; $data['count'] = $list->total(); $data['page'] = $page; + + // 获取用户UID + $user = UserModel::where('id', $id)->find(); + $uid = $user ? $user['uid'] : ''; + + foreach ($data['list'] as &$item) { + $item['uid'] = $uid ?: $item['user_id']; + } + View::assign('list', $data['list']); View::assign('count', $data['count']); View::assign('page', $data['page']); @@ -784,10 +794,10 @@ class User extends Base $index = 1; foreach ($list as $item) { $pid = $item['pid']; - $user_info = UserModel::field('nickname,headimg,mobile')->where('id', '=', $pid)->find(); + $user_info = UserModel::field('nickname,headimg,mobile,uid')->where('id', '=', $pid)->find(); if ($user_info != null) { - $user_list = UserModel::field('id,nickname,addtime,mobile')->where($whe1)->where('pid', '=', $pid)->order('addtime desc')->select(); + $user_list = UserModel::field('id,nickname,addtime,mobile,uid')->where($whe1)->where('pid', '=', $pid)->order('addtime desc')->select(); $u_index = 1; $u_price = 0; $u_order = 0; @@ -812,6 +822,7 @@ class User extends Base $data[] = [ 'index' => $index, 'user_id' => $pid, + 'uid' => $user_info['uid'] ?: $pid, 'invitenumber' => $item['n'], 'nickname' => $user_info['nickname'], 'headimg' => imageUrl($user_info['headimg']), diff --git a/app/admin/view/CouponReceive/index.html b/app/admin/view/CouponReceive/index.html index 0686612..d65bae2 100755 --- a/app/admin/view/CouponReceive/index.html +++ b/app/admin/view/CouponReceive/index.html @@ -46,7 +46,8 @@ ID - 用户id + 真实id + uid 会员昵称 名称 消费满价格 @@ -62,6 +63,7 @@ {$vo['id']} {$vo['user_id']} + {$vo['uid']} {$vo['nickname']} {$vo['title']} {$vo['man_price']} diff --git a/app/admin/view/Finance/draw_list.html b/app/admin/view/Finance/draw_list.html index c6a9f1b..d6b609e 100755 --- a/app/admin/view/Finance/draw_list.html +++ b/app/admin/view/Finance/draw_list.html @@ -51,7 +51,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

@@ -60,13 +61,12 @@
{notempty name="$vo['share_uid']"} -
+
- -

UID：{$vo['share_uid']}

+

真实ID：{$vo['share_uid']}

+

UID：{:isset($vo['share_uid_display']) ? $vo['share_uid_display'] : $vo['share_uid']}

{$vo['share_mobile']}

{$vo['share_nickname']}

-
{/notempty}
diff --git a/app/admin/view/Finance/integral_list.html b/app/admin/view/Finance/integral_list.html index cb04395..db93e4e 100755 --- a/app/admin/view/Finance/integral_list.html +++ b/app/admin/view/Finance/integral_list.html @@ -50,7 +50,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/money_list.html b/app/admin/view/Finance/money_list.html index 643b5d3..9f739d0 100755 --- a/app/admin/view/Finance/money_list.html +++ b/app/admin/view/Finance/money_list.html @@ -50,7 +50,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/record.html b/app/admin/view/Finance/record.html index 8f74f1e..7b43dc6 100755 --- a/app/admin/view/Finance/record.html +++ b/app/admin/view/Finance/record.html @@ -50,7 +50,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Finance/score_list.html b/app/admin/view/Finance/score_list.html index e0a8a5f..869faa9 100755 --- a/app/admin/view/Finance/score_list.html +++ b/app/admin/view/Finance/score_list.html @@ -50,7 +50,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/buy_order.html b/app/admin/view/Order/buy_order.html index d62d11b..d51a185 100755 --- a/app/admin/view/Order/buy_order.html +++ b/app/admin/view/Order/buy_order.html @@ -6,7 +6,7 @@
- +
@@ -58,7 +58,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/kadan_order.html b/app/admin/view/Order/kadan_order.html index 7d3ab29..099ee09 100755 --- a/app/admin/view/Order/kadan_order.html +++ b/app/admin/view/Order/kadan_order.html @@ -6,7 +6,7 @@
- +
@@ -56,7 +56,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/recovery_order.html b/app/admin/view/Order/recovery_order.html index 828b63f..7a0b951 100755 --- a/app/admin/view/Order/recovery_order.html +++ b/app/admin/view/Order/recovery_order.html @@ -6,7 +6,7 @@
- +
@@ -51,7 +51,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/Order/send_order.html b/app/admin/view/Order/send_order.html index 2c0229f..5873a62 100755 --- a/app/admin/view/Order/send_order.html +++ b/app/admin/view/Order/send_order.html @@ -7,7 +7,7 @@
-
@@ -79,7 +79,8 @@
-

UID：{$vo['user_id']}

+

真实ID：{$vo['user_id']}

+

UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

{$vo['mobile']}

{$vo['nickname']}

diff --git a/app/admin/view/User/detailed_flow.html b/app/admin/view/User/detailed_flow.html index bcbdc97..6e83a21 100755 --- a/app/admin/view/User/detailed_flow.html +++ b/app/admin/view/User/detailed_flow.html @@ -27,7 +27,7 @@ - + @@ -39,7 +39,10 @@ {volist name="list" id="vo"} - + diff --git a/app/admin/view/User/ip_list.html b/app/admin/view/User/ip_list.html index a3d9088..983589a 100755 --- a/app/admin/view/User/ip_list.html +++ b/app/admin/view/User/ip_list.html @@ -25,7 +25,8 @@ diff --git a/app/admin/view/User/user_invite.html b/app/admin/view/User/user_invite.html index f1f0f43..2878051 100755 --- a/app/admin/view/User/user_invite.html +++ b/app/admin/view/User/user_invite.html @@ -52,7 +52,11 @@ {volist name="data" id="vo"} - + @@ -62,11 +66,11 @@
  • - 序号 - 用户id - 昵称 - 注册时间 - 支付订单次数 - 支付金额 + 序号 - 真实ID/UID - 昵称 - 注册时间 - 支付订单次数 - 支付金额
    • {volist name="vo['info']" id="v1"}
  • - {$v1['index']} - {$v1['id']} - {$v1['nickname']} - {$v1['adddate']} - + {$v1['index']} - {$v1['id']}{:isset($v1['uid']) ? '/'.($v1['uid']) : ''} - {$v1['nickname']} - {$v1['adddate']} - {$v1['user_item_order']} - {$v1['user_item_price']}
    • {/volist} diff --git a/app/admin/view/User/user_team.html b/app/admin/view/User/user_team.html index 7e99c2c..0e4641d 100755 --- a/app/admin/view/User/user_team.html +++ b/app/admin/view/User/user_team.html @@ -59,7 +59,8 @@
    -

    UID：{$vo['id']}

    +

    真实ID：{$vo['id']}

    +

    UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['id']}

    {$vo['mobile']}

    {$vo['nickname']}

    diff --git a/app/common/model/OrderListSend.php b/app/common/model/OrderListSend.php index 2dc3789..f155928 100755 --- a/app/common/model/OrderListSend.php +++ b/app/common/model/OrderListSend.php @@ -55,7 +55,7 @@ class OrderListSend extends Base public function getUserInfoAttr($value, $data) { - $user_info = User::field('nickname,headimg,mobile')->where(['id' => $data['user_id']])->find(); + $user_info = User::field('nickname,headimg,mobile,uid')->where(['id' => $data['user_id']])->find(); return $user_info; }
    用户Id用户Id/UID 微信openid 微信昵称 微信头像
    {$vo['user_id']} +

    真实ID：{$vo['user_id']}

    +

    UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

    +     		{$vo['openid']} {$vo['nick_name']}
    -

    UID：{$vo['user_id']}

    +

    真实ID：{$vo['user_id']}

    +

    UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

    {$vo['index']}{$vo['nickname']}({$vo['user_id']}) + {$vo['nickname']} +

    真实ID：{$vo['user_id']}

    +

    UID：{:isset($vo['uid']) ? $vo['uid'] : $vo['user_id']}

    +