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

market_goods_1109

Browse Source
This commit is contained in:
dengbw
2022-11-09 09:41:08 +08:00
committed by lccsw
parent 3832624da0
commit 96ea4d95bf
3 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/models/market/Market_sylive_items_model.php
+17
View File
@@ -8,4 +8,21 @@ class Market_sylive_items_model extends HD_Model
public function __construct(){
parent::__construct($this->table_name, 'default');
}
/**
* Notes:订单类型
* Created on: 2022/11/07 14:46
* Created by: dengbw
* @param string $type
* @return array|mixed
*/
public function typeAry($type = '')
{
$arr = [0 => '权益', 1 => '商品'];
if (strlen($type)) {
return $arr[$type];
} else {
return $arr;
}
}
}
common/models/market/Market_sylive_order_model.php
+1 -1
View File
@@ -51,7 +51,7 @@ class Market_sylive_order_model extends HD_Model
/**
* Notes:订单类型
* Created on: 2022/11/07 14:46
* Created on: 2022/11/08 14:46
* Created by: dengbw
* @param string $type
* @return array|mixed
market/controllers/api/sylive/Goods.php
+29 -12
View File
@@ -29,22 +29,28 @@ class Goods extends BaseController
$title = $this->input_param('title');
$sort = $this->input_param('sort');
$order = $this->input_param('order');
$type = $this->input_param('type');
!$page && $page = 1;
!$limit && $limit = 10;
$sort_order = 'itemId desc';
if ($sort && $order) {
$sort_order = $sort . ' ' . $order;
if ($sort == 'typeName') {
$sort_order = 'type ' . $order;
} else {
$sort_order = $sort . ' ' . $order;
}
}
$where['status>='] = 0;
$title && $where['title LIKE "%' . trim($title) . '%"'] = null;
$activityId && $where['activityId'] = $activityId;
strlen($type) && $where['type'] = $type;
$count = $this->mdSyliveItems->count($where);
$list = [];
if ($count) {
$res = $this->mdSyliveItems->select($where, $sort_order, $page, $limit);
foreach ($res as $v) {
$banner = [];
$dateRange = '';
$dateRange = $useRange = '';
$imgs = $v['imgs'] ? json_decode($v['imgs'], true) : [];
if ($imgs['banner']) {
foreach ($imgs['banner'] as $k2 => $v2) {
@@ -52,11 +58,14 @@ class Goods extends BaseController
}
}
$timeStart = $v['timeStart'] != '0000-00-00 00:00:00' ? $v['timeStart'] : '';
$v['timeStart'] && $dateRange[] = $v['timeStart'];
$v['timeEnd'] && $dateRange[] = $v['timeEnd'];
$v['timeStart'] != '0000-00-00 00:00:00' && $dateRange[] = $v['timeStart'];
$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'];
$list[] = ['itemId' => $v['itemId'], 'activityId' => $v['activityId'], 'title' => $v['title'], 'banner' => $banner
, 'dateRange' => $dateRange, 'descrip' => $v['descrip'], 'price' => $v['price'], 'stock' => $v['stock']
, 'timeStart' => $timeStart, 'sort' => $v['sort'], 'status' => intval($v['status']), 'createTime' => $v['createTime']];
, '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'])];
}
}
$date = ['list' => $list, 'count' => $count];
@@ -78,6 +87,8 @@ class Goods extends BaseController
$stock = $this->input_param('stock');
$sort = $this->input_param('sort');
$dateRange = $this->input_param('dateRange');
$useRange = $this->input_param('useRange');
$type = intval($this->input_param('type'));
if (!$activityId) {
$this->return_json('参数错误');
}
@@ -85,9 +96,11 @@ class Goods extends BaseController
$this->return_json('请输入商品标题');
}
$addDate = ['activityId' => $activityId, 'title' => $title, 'price' => $price, 'stock' => $stock, 'sort' => $sort
, 'descrip' => $descrip, 'createTime' => date('Y-m-d H:i:s')];
$dateRange[0] && $addDate['timeStart'] = $dateRange[0];
$dateRange[1] && $addDate['timeEnd'] = $dateRange[1];
, 'descrip' => $descrip, 'type' => $type, 'createTime' => date('Y-m-d H:i:s')];
$addDate['timeStart'] = $dateRange[0] ? $dateRange[0] : '0000-00-00 00:00:00';
$addDate['timeEnd'] = $dateRange[1] ? $dateRange[1] : '0000-00-00 00:00:00';
$addDate['useStart'] = $useRange[0] ? $useRange[0] : '0000-00-00 00:00:00';
$addDate['useEnd'] = $useRange[1] ? $useRange[1] : '0000-00-00 00:00:00';
$imgs = [];
if ($banner) {
$imgs_banner = [];
@@ -119,6 +132,8 @@ class Goods extends BaseController
$stock = $this->input_param('stock');
$sort = $this->input_param('sort');
$dateRange = $this->input_param('dateRange');
$useRange = $this->input_param('useRange');
$type = intval($this->input_param('type'));
if (!$itemId) {
$this->return_json('参数错误');
}
@@ -126,9 +141,11 @@ class Goods extends BaseController
$this->return_json('请输入商品标题');
}
$upDate = ['title' => $title, 'price' => $price, 'stock' => $stock, 'sort' => $sort
, 'descrip' => $descrip];
$dateRange[0] && $addDate['timeStart'] = $dateRange[0];
$dateRange[1] && $addDate['timeEnd'] = $dateRange[1];
, 'descrip' => $descrip, 'type' => $type];
$upDate['timeStart'] = $dateRange[0] ? $dateRange[0] : '0000-00-00 00:00:00';
$upDate['timeEnd'] = $dateRange[1] ? $dateRange[1] : '0000-00-00 00:00:00';
$upDate['useStart'] = $useRange[0] ? $useRange[0] : '0000-00-00 00:00:00';
$upDate['useEnd'] = $useRange[1] ? $useRange[1] : '0000-00-00 00:00:00';
$imgs = [];
if ($banner) {
$imgs_banner = [];