From b9aab9d9afa1cf13e8ecf7243b4ba5a887ef9a1e Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Sun, 6 Nov 2022 19:08:57 +0800
Subject: [PATCH] market_statistics_1106

---
 market/controllers/api/sylive/Goods.php      | 3 +++
 market/controllers/api/sylive/Statistics.php | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/market/controllers/api/sylive/Goods.php b/market/controllers/api/sylive/Goods.php
index b9204112..e7261631 100644
--- a/market/controllers/api/sylive/Goods.php
+++ b/market/controllers/api/sylive/Goods.php
@@ -64,6 +64,7 @@ class Goods extends BaseController
         $price = $this->input_param('price');
         $stock = $this->input_param('stock');
         $sort = $this->input_param('sort');
+        $dateRange = $this->input_param('dateRange');
         if (!$activityId) {
             $this->return_json('参数错误');
         }
@@ -72,6 +73,8 @@ class Goods extends BaseController
         }
         $addDate = ['activityId' => $activityId, 'title' => $title, 'price' => $price, 'stock' => $stock, 'sort' => $sort
             , 'descrip' => $descrip, 'c_time' => time()];
+        $dateRange[0] && $addDate['timeStart'] = $dateRange[0];
+        $dateRange[1] && $addDate['timeEnd'] = $dateRange[1];
         $imgs = [];
         if ($banner) {
             $banner = [];
diff --git a/market/controllers/api/sylive/Statistics.php b/market/controllers/api/sylive/Statistics.php
index 1b034c38..60253a90 100644
--- a/market/controllers/api/sylive/Statistics.php
+++ b/market/controllers/api/sylive/Statistics.php
@@ -294,10 +294,11 @@ class Statistics extends BaseController
                 $res = $this->mdSyliveActivityUser->select_groupby('userId', $where, $sort_order, $page, $limit, $filed);
                 foreach ($res as $v) {
                     $userId = intval($v['userId']);
-                    $re_user = $this->mdSyliveUser->get(['userId' => $userId, 'status>=' => 0]);
-                    $consultantName = $re_user['uname'] ? $re_user['uname'] : $re_user['nickname'];
                     $re_org = $this->mdSyliveOrganization->get(['organizationId' => $v['bizId'], 'status>=' => 0]);
-                    $re_org && $consultantName .= "({$re_org['organizationName']})";
+                    $organizationName = $re_org['organizationName'] ? $re_org['organizationName'] : '-';
+                    $re_user = $this->mdSyliveUser->get(['userId' => $userId, 'status>=' => 0]);
+                    $uname = $re_user['uname'] ? $re_user['uname'] : $re_user['nickname'];
+                    $consultantName = $organizationName . ' ' . $uname;
                     $livePV = $watchDuration = 0;
                     if ($channelId) {
                         $res_watch = $this->mdSyliveActivityKpidata->db->select('b.unionid')