diff --git a/api/controllers/plan/Plan.php b/api/controllers/plan/Plan.php
index 2e046b66..9ee3fce7 100644
--- a/api/controllers/plan/Plan.php
+++ b/api/controllers/plan/Plan.php
@@ -51,7 +51,7 @@ class Plan extends CI_Controller
$plan[] = array('url' => base_url(array('plan', 'order', 'up_old_status')), 'interval' => 30); //更新旧订单状态
$plan[] = array('url' => base_url(array('plan', 'order', 'out_time')), 'interval' => 10); //未支付订单过期
- $plan[] = array('url' => base_url(array('plan', 'syt', 'subscribemsg')), 'interval' => 1); //私域通模板消息
+// $plan[] = array('url' => base_url(array('plan', 'syt', 'subscribemsg')), 'interval' => 1); //私域通模板消息
$plan[] = array('url' => base_url(array('plan', 'syt', 'syn_polyv')), 'interval' => 60); //私域通直播间数据同步
$plan[] = array('url' => base_url(array('plan', 'syt', 'api_viewlog')), 'interval' => 5); //私域通直播间播放日志数据同步
$plan[] = array('url' => base_url(array('plan', 'syt', 'out_time')), 'interval' => 1); //订单过期
diff --git a/api/controllers/plan/Syt.php b/api/controllers/plan/Syt.php
index 0fc2db4c..948e8e82 100644
--- a/api/controllers/plan/Syt.php
+++ b/api/controllers/plan/Syt.php
@@ -337,8 +337,8 @@ class Syt extends CI_Controller
if($p_user['organizationId']){
$addData['type'] = 0;
$team_lists = $this->sylive_entity->get_level_lists($p_user['organizationId']);
- $area_id = $team_lists[0]['teamId']; //大团长id
- $biz_id = $team_lists[1]['teamId']; //团长id
+ $area_id = $team_lists[0]['organizationId']; //大团长id
+ $biz_id = $team_lists[1]['organizationId']; //团长id
$addData['cfUserId'] = $p_user['userId'];
}
$area_id && $addData['areaId'] = $area_id;
@@ -492,4 +492,50 @@ class Syt extends CI_Controller
echo "更新成功,黑名单列表:".json_encode($mobile_list,JSON_UNESCAPED_UNICODE);
}
+ public function up_order(){
+ $this->load->model('market/market_sylive_activity_user_model', 'act_user_model');
+ $this->load->model('market/market_sylive_order_model','order_model');
+ $this->load->model('market/market_sylive_activity_model');
+ $this->load->model('market/market_sylive_activity_orders_model','mdSytActivityOrders');
+ $this->load->model('market/market_sylive_activity_kpidata_model','mdSytActivityKpiData');
+ $this->load->library('market/sylive_entity');
+ $id = $this->input->get('id');
+ $page = $this->input->get('page');
+ $size = $this->input->get('size');
+ !$page && $page = 1;
+ !$size && $size = 20;
+ $where = [
+ 'activityId' => 4,
+ 'status' => 1
+ ];
+ $id && $where['id'] = $id;
+ $rows = $this->order_model->select($where,'id asc',$page,$size);
+ if($rows){
+ foreach ($rows as $item) {
+ $where = [
+ "activityId" => 4,
+ 'kpi' => 'order',
+ 'tagId' => $item['id']
+ ];
+ $is_add = $this->mdSytActivityKpiData->get($where);
+ if($is_add){
+ echo "订单id:{$item['id']},已添加过
";
+ }else{
+ $act_user = $this->act_user_model->get(['userId'=>$item['userId'],'activityId'=>$item['activityId']]);
+ $params = [
+ 'a_id' => $item['activityId'],
+ 'uid' => $item['userId'],
+ 'cf_uid' => $act_user['channelId'],
+ 'kpi' => 'order',
+ 'tagId' => $item['id'],
+ 'jsondata'=> ['order_id'=>$item['id'],'sid'=>$item['sid']]
+ ];
+ $sy_res = $this->sylive_entity->kpi_log($params);
+ echo "订单id:{$item['id']},执行结果:".json_encode($sy_res,JSON_UNESCAPED_UNICODE)."
";
+ }
+ }
+ }else{
+ echo '更新完毕';
+ }
+ }
}
diff --git a/common/libraries/market/Sylive_entity.php b/common/libraries/market/Sylive_entity.php
index ce9ca42a..0333e283 100644
--- a/common/libraries/market/Sylive_entity.php
+++ b/common/libraries/market/Sylive_entity.php
@@ -202,6 +202,7 @@ class Sylive_entity{
'createTime' => time(),
'day' => date('Y-m-d')
];
+ $params['tagId'] && $addData['tagId'] = $params['tagId'];
$area_id && $addData['areaId'] = $area_id;
$biz_id && $addData['bizId'] = $biz_id;
$jsondata = $params['jsondata'] ? $params['jsondata'] : [];
diff --git a/home/controllers/h5/market/sylive/Notify.php b/home/controllers/h5/market/sylive/Notify.php
index 51a9fa7a..6f01adaa 100644
--- a/home/controllers/h5/market/sylive/Notify.php
+++ b/home/controllers/h5/market/sylive/Notify.php
@@ -54,7 +54,7 @@ class Notify extends CI_Controller {
}else{ //支付成功
$res = $this->order_model->update(['status'=>1,'payTime'=>date('Y-m-d H:i:s')],['id'=>$order['id']]);
if($res){
- $act_user = $this->act_user_model->get(['userId'=>$order['uid'],'activityId'=>$order['itemId']]);
+ $act_user = $this->act_user_model->get(['userId'=>$order['userId'],'activityId'=>$order['itemId']]);
$params = [
'a_id' => $order['itemId'],
'uid' => $order['userId'],
@@ -132,12 +132,13 @@ class Notify extends CI_Controller {
}else{ //支付成功
$res = $this->order_model->update(['status'=>1,'payTime'=>date('Y-m-d H:i:s')],['id'=>$order['id']]);
if($res){
- $act_user = $this->act_user_model->get(['userId'=>$order['uid'],'activityId'=>$order['activityId']]);
+ $act_user = $this->act_user_model->get(['userId'=>$order['userId'],'activityId'=>$order['activityId']]);
$params = [
'a_id' => $order['activityId'],
'uid' => $order['userId'],
'cf_uid' => $act_user['channelId'],
'kpi' => 'order',
+ 'tagId' => $order['id'],
'jsondata'=> ['order_id'=>$order['id'],'sid'=>$sid]
];
$sy_res = $this->sylive_entity->kpi_log($params);