diff --git a/api/controllers/wxapp/licheb/User.php b/api/controllers/wxapp/licheb/User.php index 44876d40..7ca914e3 100644 --- a/api/controllers/wxapp/licheb/User.php +++ b/api/controllers/wxapp/licheb/User.php @@ -331,7 +331,7 @@ class User extends Wxapp $where_month_xs = ['biz_id' => $biz_id, 'cs_biz_id<>' => -1, 'status>=' => 0, 'c_time>=' => strtotime($s_month), 'c_time<=' => strtotime($e_month)]; //企微 $where_today_qy = ['change_type' => 'add_external_contact', 'c_time>=' => strtotime($s_today), 'c_time<=' => strtotime($e_today)]; - $where_month_qy = ['change_type' => 'add_external_contact', 'c_time>=' => strtotime($s_today), 'c_time<=' => strtotime($e_today)]; + $where_month_qy = ['change_type' => 'add_external_contact', 'c_time>=' => strtotime($s_month), 'c_time<=' => strtotime($e_month)]; //到店 $where_today_dd = ['type' => 4, 'c_time>=' => strtotime($s_today), 'c_time<=' => strtotime($e_today)]; $where_month_dd = ['type' => 4, 'c_time>=' => strtotime($s_month), 'c_time<=' => strtotime($e_month)]; @@ -359,11 +359,11 @@ class User extends Wxapp $where_today_qy = ''; } } else { - $res_user = $this->app_user_model->select(['biz_id' => $biz_id, 'group_id <' => 4, 'status' => 1, 'userid!=' => ''], 'id asc', 0, 0, 'userid'); + $res_user = $this->app_user_model->select(['biz_id' => $biz_id, 'group_id <' => 4, 'status' => 1, 'userid<>' => ''], 'id asc', 0, 0, 'userid'); if ($res_user) { $str_userids = implode("','", array_column($res_user, 'userid')); - $where_today_qy["userid in ('" . $str_userids . "')"] = null; - $where_month_qy["userid in ('" . $str_userids . "')"] = null; + $where_today_qy["userid in('{$str_userids}')"] = null; + $where_month_qy["userid in('{$str_userids}')"] = null; } else { $where_today_qy = ''; } @@ -406,6 +406,7 @@ class User extends Wxapp 'deallist' => $deallist, 'customer_op_list' => $customer_op_list, 'levelSt' => $levelSt, + 'where_today_qy' => $where_today_qy, 'statistics' => $statistics ]; return $data; diff --git a/market/controllers/api/sylive/Activity.php b/market/controllers/api/sylive/Activity.php index aaeadeed..57b1ba3e 100644 --- a/market/controllers/api/sylive/Activity.php +++ b/market/controllers/api/sylive/Activity.php @@ -512,7 +512,7 @@ class Activity extends BaseController $browse_actual_data = [['name' => '浏览人数', 'value' => $browse], ['name' => '观看人数', 'value' => $watch], ['name' => '订单数', 'value' => $order]]; $funnel_browse = ['title' => '浏览转化漏斗', 'expected_data' => $browse_expected_data, 'actual_data' => $browse_actual_data]; - $id_in = "id in(select id from lc_market_sylive_activity_kpidata where a_id = {$activityId} AND kpi = 'subscribe')"; + $id_in = "uid in(select uid from lc_market_sylive_activity_kpidata where a_id = {$activityId} AND kpi = 'subscribe')"; $watch_subscribe = $this->mdSyliveActivityKpidata->count(['a_id' => $activityId, 'kpi' => 'watch', $id_in => null]); $order_subscribe = $this->mdSyliveActivityKpidata->count(['a_id' => $activityId, 'kpi' => 'order', $id_in => null]); $subscribe_per = number_format_com($subscribe / $browse * 100, 1, '');