From 5a19da4c0d6abc481bbea7ed4e45498fa692a107 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 10 Nov 2022 19:51:33 +0800
Subject: [PATCH] edit-sylive-notify

---
 common/libraries/market/Sylive_entity.php    | 2 +-
 home/controllers/h5/market/sylive/Notify.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/libraries/market/Sylive_entity.php b/common/libraries/market/Sylive_entity.php
index 093e5361..9178e074 100644
--- a/common/libraries/market/Sylive_entity.php
+++ b/common/libraries/market/Sylive_entity.php
@@ -165,7 +165,7 @@ class Sylive_entity{
             }
             $re_a = $this->ci->market_sylive_activity_model->get(array("activityId" => $params['a_id'], "status" => 0));
             $now_time = time();
-            if(!in_array($params['kpi'],['subscribe','browse'])){ //无需活动开始
+            if(!in_array($params['kpi'],['subscribe','browse','order'])){ //无需活动开始
                 if ((!$re_a || $now_time < strtotime($re_a['timeStart']) || $now_time > strtotime($re_a['timeEnd']))) {
                     return array('code' => 0, 'msg' => '无活动或未在活动时间内');
                 }
diff --git a/home/controllers/h5/market/sylive/Notify.php b/home/controllers/h5/market/sylive/Notify.php
index 31b2b891..51a9fa7a 100644
--- a/home/controllers/h5/market/sylive/Notify.php
+++ b/home/controllers/h5/market/sylive/Notify.php
@@ -134,7 +134,7 @@ class Notify extends CI_Controller {
                     if($res){
                         $act_user = $this->act_user_model->get(['userId'=>$order['uid'],'activityId'=>$order['activityId']]);
                         $params = [
-                            'a_id' => $order['itemId'],
+                            'a_id' => $order['activityId'],
                             'uid' => $order['userId'],
                             'cf_uid' => $act_user['channelId'],
                             'kpi' => 'order',