From 964bf7f26b2014b501a8359f5540d24645e04896 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Sat, 10 Dec 2022 23:26:26 +0800
Subject: [PATCH] market_groups_1210_3

---
 .../api/sylive/GroupsStatistics.php           | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/market/controllers/api/sylive/GroupsStatistics.php b/market/controllers/api/sylive/GroupsStatistics.php
index be68d11e..9f0cbbde 100644
--- a/market/controllers/api/sylive/GroupsStatistics.php
+++ b/market/controllers/api/sylive/GroupsStatistics.php
@@ -496,15 +496,20 @@ class GroupsStatistics extends BaseController
                     $map_groups = $this->mdSyliveGroups->map('groupsId', 'groupsName',
                         ["groupsId in({$str_groups})" => null, 'activityId' => $activityId, 'status>=' => 0]);
                     $str_user = $userIds ? implode(',', $userIds) : -1;
-                    $map_user = $this->mdSyliveUser->map('userId', 'uname', ["userId in({$str_user})" => null, 'status>=' => 0]);
+                    $map_user = $this->mdSyliveUser->map('userId', 'uname,nickname', ["userId in({$str_user})" => null, 'status>=' => 0]);
                     foreach ($res as $v) {
                         $cfUserId = intval($v['cfUserId']);
                         $bizName = $uname = '';
                         $map_groups[$v['levelId1']] && $bizName = $map_groups[$v['levelId1']] . ' ';
                         $map_groups[$v['levelId2']] && $bizName .= $map_groups[$v['levelId2']] . ' ';
                         $map_groups[$v['levelId3']] && $bizName .= $map_groups[$v['levelId3']] . ' ';
-                        $map_groups[$v['groupsId']] && $bizName .= $map_groups[$v['groupsId']] . ' ';
-                        $map_user[$cfUserId] && $uname = $map_user[$cfUserId];
+                        if ($map_groups[$v['groupsId']]) {
+                            $groupsName = $map_groups[$v['groupsId']] . ' ';
+                            if ($bizName != $groupsName) {
+                                $bizName .= $groupsName;
+                            }
+                        }
+                        $uname = $map_user[$cfUserId]['uname'] ? $map_user[$cfUserId]['uname'] : $map_user[$cfUserId]['nickname'];
                         $where_sort['cfUserId'] = $cfUserId;
                         if ($sort == 'browse') {
                             $browse = $v['total'];
@@ -572,15 +577,20 @@ class GroupsStatistics extends BaseController
                     $map_groups = $this->mdSyliveGroups->map('groupsId', 'groupsName',
                         ["groupsId in({$str_groups})" => null, 'activityId' => $activityId, 'status>=' => 0]);
                     $str_user = $userIds ? implode(',', $userIds) : -1;
-                    $map_user = $this->mdSyliveUser->map('userId', 'uname', ["userId in({$str_user})" => null, 'status>=' => 0]);
+                    $map_user = $this->mdSyliveUser->map('userId', 'uname,nickname', ["userId in({$str_user})" => null, 'status>=' => 0]);
                     foreach ($res as $v) {
                         $userId = intval($v['userId']);
                         $bizName = $uname = '';
                         $map_groups[$v['levelId1']] && $bizName = $map_groups[$v['levelId1']] . ' ';
                         $map_groups[$v['levelId2']] && $bizName .= $map_groups[$v['levelId2']] . ' ';
                         $map_groups[$v['levelId3']] && $bizName .= $map_groups[$v['levelId3']] . ' ';
-                        $map_groups[$v['groupsId']] && $bizName .= $map_groups[$v['groupsId']] . ' ';
-                        $map_user[$userId] && $uname = $map_user[$userId];
+                        if ($map_groups[$v['groupsId']]) {
+                            $groupsName = $map_groups[$v['groupsId']] . ' ';
+                            if ($bizName != $groupsName) {
+                                $bizName .= $groupsName;
+                            }
+                        }
+                        $uname = $map_user[$userId]['uname'] ? $map_user[$userId]['uname'] : $map_user[$userId]['nickname'];
                         if ($sort != 'order' && $itemId) {//有商品id，区分订单
                             $order = $this->mdSyliveActivityKpidata->count(['kpi' => 'order', 'cfUserId' => $userId, 'itemId' => $itemId, 'activityId' => $activityId]);
                         } else {