From dc40d15c2f057938190c2fb6873b435d74b0d8f3 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Mon, 7 Nov 2022 23:06:45 +0800
Subject: [PATCH] market_statistics_1107_2

---
 market/controllers/api/sylive/Statistics.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/market/controllers/api/sylive/Statistics.php b/market/controllers/api/sylive/Statistics.php
index e8a0664c..927bf18e 100644
--- a/market/controllers/api/sylive/Statistics.php
+++ b/market/controllers/api/sylive/Statistics.php
@@ -39,7 +39,7 @@ class Statistics extends BaseController
             $this->return_json('参数错误');
         }
         $title = '';
-        $activityData1 = $activityData2  = $areaAry = $funnel = $allOrganizationIds = [];
+        $activityData1 = $activityData2 = $areaAry = $funnel = $allOrganizationIds = [];
         $days[] = ['name' => '全部日期', 'value' => ''];
         $re = $this->mdSyliveActivity->get(['activityId' => $activityId]);
         if ($re) {
@@ -139,7 +139,7 @@ class Statistics extends BaseController
         $funnel_subscribe = ['title' => '浏览转化漏斗(直播阶段)', 'expected_data' => $right_expected_data, 'actual_data' => $right_actual_data];
 
         $data = ['activityId' => $activityId, 'title' => $title, 'activityData1' => ['list' => $activityData1, 'style' => 'width: 33.3%'], 'activityData2' => ['list' => $activityData2, 'style' => 'width: 11.1%']
-            ,  'funnelBrowse' => $funnel_browse, 'funnelSubscribe' => $funnel_subscribe, 'days' => $days];
+            , 'funnelBrowse' => $funnel_browse, 'funnelSubscribe' => $funnel_subscribe, 'days' => $days];
         $this->return_response($data);
     }
 
@@ -159,7 +159,6 @@ class Statistics extends BaseController
         !$page && $page = 1;
         !$limit && $limit = 10;
         $list = [];
-        $count = 0;
         $re = $this->mdSyliveActivity->get(['activityId' => $activityId]);
         if ($re) {
             $areaAry = [];
@@ -185,7 +184,7 @@ class Statistics extends BaseController
                         $browse = $this->mdSyliveActivityKpidata->count(['kpi' => 'browse', 'areaId' => $areaId, 'type' => 0, 'day' => $day, 'activityId' => $activityId]);
                         $subscribe = $this->mdSyliveActivityKpidata->count(['kpi' => 'subscribe', 'areaId' => $areaId, 'type' => 0, 'day' => $day, 'activityId' => $activityId]);
                         $watch = $this->mdSyliveActivityKpidata->count(['kpi' => 'watch', 'areaId' => $areaId, 'type' => 0, 'day' => $day, 'activityId' => $activityId]);
-                        $order = $this->mdSyliveActivityKpidata->count(['kpi' => 'order', 'areaId' => $areaId, 'type' => 0, 'day' => $day, 'activityId' => $activityId]);
+                        $orderTotal = $this->mdSyliveActivityKpidata->count(['kpi' => 'order', 'areaId' => $areaId, 'type' => 0, 'day' => $day, 'activityId' => $activityId]);
                         $livePV = $watchDuration = 0;
                         if ($channelId) {
                             $res_watch = $this->mdSyliveActivityKpidata->db->select('b.unionid')
@@ -214,7 +213,7 @@ class Statistics extends BaseController
                         }
                         $consultant > $allConsultant && $allConsultant = $consultant;
                         $list[] = ['areaName' => $re_area['organizationName'], 'biz' => count($v['biz']), 'consultant' => $consultant . '/' . $allConsultant
-                            , 'browse' => $browse, 'subscribe' => $subscribe, 'watch' => $watch, 'order' => $order
+                            , 'browse' => $browse, 'subscribe' => $subscribe, 'watch' => $watch, 'order' => $orderTotal
                             , 'livePV' => $livePV, 'watchDuration' => $watchDuration];
                     }
                 }
@@ -264,9 +263,9 @@ class Statistics extends BaseController
                 }
             }
         }
-        $order = $order == 'asc' ? SORT_ASC : SORT_DESC;
-        $edit = array_column($list, $sort);
-        array_multisort($edit, $order, $list);
+        $order = $order == 'desc' ? SORT_DESC : SORT_ASC;
+        $sortKey = array_column($list, $sort);
+        array_multisort($sortKey, $order, $list);
         $count = count($list);
         $list = array_splice($list, 0, $limit);
         $date = ['list' => $list, 'count' => $count];
@@ -858,7 +857,7 @@ class Statistics extends BaseController
 
         } else {
             //大区排名
-            $res = $this->mdSyliveActivityBiz->select(['activityId' => $activityId, 'status>=' => 0], "id desc", 0, 0, 'distinct(areaId)');
+            $res = $this->mdSyliveActivityBiz->select(['activityId' => $activityId, 'status>=' => 0, 'bizId>=' => 0], "id desc", 0, 0, 'distinct(areaId)');
             foreach ($res as $k => $v) {
                 $areaId = intval($v['areaId']);
                 $re = $this->mdSyliveOrganization->get(['organizationId' => $areaId]);
@@ -874,6 +873,7 @@ class Statistics extends BaseController
                     $percent = ceil(($v['value'] / $areaMax) * 100);
                     $area[$k]['percent'] = $percent;
                 }
+                $area = array_splice($area, 0, 10);
             }
             //门店排名
             $res = $this->mdSyliveActivityBiz->select(['activityId' => $activityId, 'status>=' => 0]