diff --git a/market/controllers/api/sylive/Activity.php b/market/controllers/api/sylive/Activity.php index dbc7ee27..8fedafb4 100644 --- a/market/controllers/api/sylive/Activity.php +++ b/market/controllers/api/sylive/Activity.php @@ -139,7 +139,8 @@ class Activity extends BaseController 'activityId' => $activityId, 'title' => $v['title'], 'channelId' => $v['channelId'], 'bizIds' => $bizIds, 'teamIds' => $teamIds, 'pay' => $pay, 'introduction' => $v['introduction'], 'shareTitle' => $shareTitle, 'dateRange' => $dateRange, 'coupon' => $coupon, 'drawCode' => $v['drawCode'], 'bgImg' => $bgImg, 'channelImg' => $channelImg, 'banner' => $banner, 'sharePhoto' => $sharePhoto, 'shareImg' => $shareImg, 'item' => $item, 'url' => $url, - 's_time' => $v['timeStart'], 'e_time' => $v['timeEnd'], 'status' => $status, 'createTime' => $v['createTime']]; + 'mchId' => $v['mchId'], 'protocolTitle' => $v['protocolTitle'], 'protocol' => $v['protocol'] + , 's_time' => $v['timeStart'], 'e_time' => $v['timeEnd'], 'status' => $status, 'createTime' => $v['createTime']]; } } $date = ['list' => $list, 'count' => $count]; @@ -167,6 +168,9 @@ class Activity extends BaseController $pay = $this->input_param('pay'); $drawCode = $this->input_param('drawCode'); $banner = $this->input_param('banner'); + $mchId = $this->input_param('mchId'); + $protocolTitle = $this->input_param('protocolTitle'); + $protocol = $this->input_param('protocol'); if (!$title) { $this->return_json('请输入活动标题'); } @@ -209,7 +213,8 @@ class Activity extends BaseController $jsondata['banner'] = $banner; $jsondata = json_encode($jsondata, JSON_UNESCAPED_UNICODE); $addDate = ['title' => $title, 'bgImg' => $bgImg, 'channelImg' => $channelImg, 'channelId' => $channelId, 'jsondata' => $jsondata - , 'introduction' => $introduction, 'shareTitle' => $shareTitle, 'sharePhoto' => $sharePhoto, 'shareImg' => $setShareImg, 'drawCode' => $drawCode + , 'introduction' => $introduction, 'shareTitle' => $shareTitle, 'sharePhoto' => $sharePhoto, 'shareImg' => $setShareImg + , 'drawCode' => $drawCode, 'mchId' => $mchId, 'protocolTitle' => $protocolTitle, 'protocol' => $protocol , 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1], 'status' => 1, 'createTime' => date('Y-m-d H:i:s')]; $activityId = $this->mdSyliveActivity->add($addDate); if (!$activityId) { @@ -302,6 +307,9 @@ class Activity extends BaseController $pay = $this->input_param('pay'); $drawCode = $this->input_param('drawCode'); $banner = $this->input_param('banner'); + $mchId = $this->input_param('mchId'); + $protocolTitle = $this->input_param('protocolTitle'); + $protocol = $this->input_param('protocol'); if (!$activityId) { $this->return_json('参数错误'); } @@ -406,7 +414,8 @@ class Activity extends BaseController $jsondata = json_encode($jsondata, JSON_UNESCAPED_UNICODE); $organizationIds = $organizationIds ? ',' . implode(',', $organizationIds) . ',' : ''; $upDate = ['title' => $title, 'bgImg' => $bgImg, 'channelImg' => $channelImg, 'channelId' => $channelId, 'introduction' => $introduction, - 'shareTitle' => $shareTitle, 'sharePhoto' => $sharePhoto, 'shareImg' => $setShareImg, 'jsondata' => $jsondata, 'drawCode' => $drawCode, + 'shareTitle' => $shareTitle, 'sharePhoto' => $sharePhoto, 'shareImg' => $setShareImg, 'jsondata' => $jsondata, + 'drawCode' => $drawCode, 'mchId' => $mchId, 'protocolTitle' => $protocolTitle, 'protocol' => $protocol, 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1], 'organizationIds' => $organizationIds]; $this->mdSyliveActivity->update($upDate, ['activityId' => $activityId]); $this->return_response();