admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

market_code_1109

Browse Source
This commit is contained in:
dengbw
2022-11-09 11:03:06 +08:00
parent cff48f852e
commit 35a3e718ac
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
market/controllers/api/sylive/Activity.php
+1 -2
View File
@@ -132,10 +132,9 @@ class Activity extends BaseController
}
$skey = $this->myencryption->base64url_encode("activityId=" . $activityId);
$url = http_host_com('home') . "/h5/market/sylive?skey=" . $skey;//活动连接
$urlItem = http_host_com('home') . "/h5/market/sylive/act/item?skey=" . $skey;//商品连接
$list[] = [
'activityId' => $activityId, 'title' => $v['title'], 'channelId' => $v['channelId'], 'bizIds' => $bizIds, 'teamIds' => $teamIds, 'pay' => $pay,
'introduction' => $v['introduction'], 'shareTitle' => $shareTitle, 'dateRange' => $dateRange, 'urlItem' => $urlItem, 'coupon' => $coupon,
'introduction' => $v['introduction'], 'shareTitle' => $shareTitle, 'dateRange' => $dateRange, 'coupon' => $coupon,
'bgImg' => $bgImg, 'channelImg' => $channelImg, 'sharePhoto' => $sharePhoto, 'shareImg' => $shareImg, 'item' => $item, 'url' => $url,
's_time' => $v['timeStart'], 'e_time' => $v['timeEnd'], 'status' => $status, 'createTime' => $v['createTime']];
}
market/controllers/api/sylive/Goods.php
+4 -1
View File
@@ -47,6 +47,8 @@ class Goods extends BaseController
$count = $this->mdSyliveItems->count($where);
$list = [];
if ($count) {
$this->load->library('MyEncryption');
$skey = $this->myencryption->base64url_encode("activityId=" . $activityId);
$res = $this->mdSyliveItems->select($where, $sort_order, $page, $limit);
foreach ($res as $v) {
$banner = [];
@@ -62,10 +64,11 @@ class Goods extends BaseController
$v['timeEnd'] != '0000-00-00 00:00:00' && $dateRange[] = $v['timeEnd'];
$v['useStart'] != '0000-00-00 00:00:00' && $useRange[] = $v['useStart'];
$v['useEnd'] != '0000-00-00 00:00:00' && $useRange[] = $v['useEnd'];
$url = http_host_com('home') . "/h5/market/sylive/item/detail?skey={$skey}&iid=" . $v['itemId'];//活动连接
$list[] = ['itemId' => $v['itemId'], 'activityId' => $v['activityId'], 'title' => $v['title'], 'banner' => $banner
, 'dateRange' => $dateRange, 'useRange' => $useRange, 'descrip' => $v['descrip'], 'price' => $v['price'], 'stock' => $v['stock']
, 'timeStart' => $timeStart, 'sort' => $v['sort'], 'status' => intval($v['status']), 'createTime' => $v['createTime']
, 'type' => intval($v['type']), 'typeName' => $this->mdSyliveItems->typeAry($v['type'])];
, 'type' => intval($v['type']), 'typeName' => $this->mdSyliveItems->typeAry($v['type']), 'url' => $url];
}
}
$date = ['list' => $list, 'count' => $count];
market/controllers/api/sylive/Order.php
+2 -2
View File
@@ -77,7 +77,7 @@ class Order extends BaseController
$status = 1;
}
$where['status'] = $status;
$activityId && $where['itemId'] = $activityId;
$activityId && $where['activityId'] = $activityId;
$uname && $where['uname LIKE "%' . trim($uname) . '%"'] = null;
$mobile && $where['mobile LIKE "%' . trim($mobile) . '%"'] = null;
strlen($cfrom) && $where['cfrom'] = $cfrom;
@@ -110,7 +110,7 @@ class Order extends BaseController
if ($count) {
$res = $this->mdSyliveOrder->select($where, $sort_order, $page, $limit);
foreach ($res as $v) {
$consultant = $this->consultantGet(['activityId' => $v['itemId'], 'userId' => $v['userId']
$consultant = $this->consultantGet(['activityId' => $v['activityId'], 'userId' => $v['userId']
, 'areaId' => $v['areaId'], 'bizId' => $v['bizId'], 'cfrom' => $v['cfrom'], 'cfUserId' => $v['cfUserId']]);
$list[] = [
'id' => $v['id'], 'sid' => $v['sid'], 'uname' => $v['uname'], 'mobile' => $v['mobile'], 'itemTitle' => $v['itemTitle']