|
|
@@ -71,7 +71,7 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
|
|
|
})
|
|
|
- ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock','g.spec', 'g.price', 'g.specs','g.cartoon_num', 'g.thumb', 'g.status', 'g.create_time', 'g.update_time', 'g.description', 'g.sort', 'g.view_num','g.albums','g.content','g.is_recommand'])
|
|
|
+ ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock', 'g.spec', 'g.price', 'g.specs', 'g.cartoon_num', 'g.thumb', 'g.status', 'g.create_time', 'g.update_time', 'g.description', 'g.sort', 'g.view_num', 'g.albums', 'g.content', 'g.is_recommand'])
|
|
|
->orderBy('g.update_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
|
|
|
@@ -80,10 +80,10 @@ class GoodsService extends BaseService
|
|
|
foreach ($dataList['data'] as &$item) {
|
|
|
$item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
|
|
|
$item['albums'] = isset($item['albums']) && $item['albums'] ? json_decode($item['albums'], true) : [];
|
|
|
- $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
|
|
|
- if($item['albums']){
|
|
|
- foreach ($item['albums'] as &$v){
|
|
|
- $v['url'] = isset($v['url']) && $v['url']? get_image_url($v['url']) : '';
|
|
|
+ $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
+ if ($item['albums']) {
|
|
|
+ foreach ($item['albums'] as &$v) {
|
|
|
+ $v['url'] = isset($v['url']) && $v['url'] ? get_image_url($v['url']) : '';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -93,7 +93,7 @@ class GoodsService extends BaseService
|
|
|
|
|
|
return [
|
|
|
'code' => 0,
|
|
|
- 'success'=> true,
|
|
|
+ 'success' => true,
|
|
|
'msg' => '操作成功',
|
|
|
'count' => isset($dataList['total']) ? $dataList['total'] : 0,
|
|
|
'data' => isset($dataList['data']) ? $dataList['data'] : 0,
|
|
|
@@ -115,23 +115,23 @@ class GoodsService extends BaseService
|
|
|
$dataList = $this->model::from('goods as g')
|
|
|
->leftJoin('goods_cates as c', 'g.cate_id', '=', 'c.id')
|
|
|
->where(function ($query) use ($params) {
|
|
|
- $query->where(['g.mark'=>1,'g.status'=> 1]);
|
|
|
+ $query->where(['g.mark' => 1, 'g.status' => 1]);
|
|
|
$cateId = isset($params['cate_id']) ? intval($params['cate_id']) : 0;
|
|
|
$keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
|
|
|
if ($cateId > 0) {
|
|
|
$query->where('g.cate_id', $cateId);
|
|
|
- } else if($keyword==''){
|
|
|
+ } else if ($keyword == '') {
|
|
|
$query->where('g.is_recommand', 1);
|
|
|
}
|
|
|
|
|
|
})
|
|
|
- ->where(function($query) use($params){
|
|
|
+ ->where(function ($query) use ($params) {
|
|
|
$keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
|
|
|
if (!empty($keyword)) {
|
|
|
- $query->where('g.title', 'like', "%{$keyword}%")->orWhere('c.name','like',"%{$keyword}%");
|
|
|
+ $query->where('g.title', 'like', "%{$keyword}%")->orWhere('c.name', 'like', "%{$keyword}%");
|
|
|
}
|
|
|
})
|
|
|
- ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock','g.score', 'g.price', 'g.specs', 'g.thumb', 'g.status', 'g.create_time', 'g.description', 'g.view_num','g.is_recommand'])
|
|
|
+ ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock', 'g.score', 'g.price', 'g.specs', 'g.thumb', 'g.status', 'g.create_time', 'g.description', 'g.view_num', 'g.is_recommand'])
|
|
|
->orderBy('g.create_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
|
|
|
@@ -139,18 +139,18 @@ class GoodsService extends BaseService
|
|
|
if ($dataList) {
|
|
|
foreach ($dataList['data'] as &$item) {
|
|
|
$item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
|
|
|
- $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
|
|
|
+ $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
|
|
|
// 销量
|
|
|
- $sale = OrdersModel::where(['goods_id'=> $item['id'],'mark'=> 1])->whereIn('status',[2,3,4])->count('id');
|
|
|
- $item['sale'] = $sale? $sale : 0;
|
|
|
+ $sale = OrdersModel::where(['goods_id' => $item['id'], 'mark' => 1])->whereIn('status', [2, 3, 4])->count('id');
|
|
|
+ $item['sale'] = $sale ? $sale : 0;
|
|
|
}
|
|
|
unset($item);
|
|
|
}
|
|
|
|
|
|
return [
|
|
|
'code' => 0,
|
|
|
- 'success'=> true,
|
|
|
+ 'success' => true,
|
|
|
'msg' => '操作成功',
|
|
|
'count' => isset($dataList['total']) ? $dataList['total'] : 0,
|
|
|
'data' => isset($dataList['data']) ? $dataList['data'] : 0,
|
|
|
@@ -162,23 +162,27 @@ class GoodsService extends BaseService
|
|
|
* @param $id
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function getDetail($id){
|
|
|
- if($id<=0){
|
|
|
+ public function getDetail($id)
|
|
|
+ {
|
|
|
+ if ($id <= 0) {
|
|
|
return message('参数错误', false);
|
|
|
}
|
|
|
$info = $this->model::from('goods as g')
|
|
|
->leftJoin('goods_cates as c', 'g.cate_id', '=', 'c.id')
|
|
|
- ->where(['g.id'=> $id,'g.mark'=> 1,'g.status'=> 1])
|
|
|
- ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock','g.score', 'g.price', 'g.specs', 'g.thumb', 'g.status', 'g.create_time', 'g.description', 'g.view_num','g.is_recommand','g.content'])
|
|
|
+ ->where(['g.id' => $id, 'g.mark' => 1, 'g.status' => 1])
|
|
|
+ ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock', 'g.score', 'g.price', 'g.specs', 'g.thumb', 'g.status', 'g.create_time', 'g.description', 'g.view_num', 'g.is_recommand', 'g.content'])
|
|
|
->first();
|
|
|
- $info = $info? $info->toArray() : [];
|
|
|
- if($info){
|
|
|
- $info['thumb'] = $info['thumb']? get_image_url($info['thumb']) : '';
|
|
|
- $info['create_time'] = $info['create_time']? datetime($info['create_time'],'Y-m-d H:i:s') : '';
|
|
|
+ $info = $info ? $info->toArray() : [];
|
|
|
+ if ($info) {
|
|
|
+ $rate = ConfigService::make()->getConfigByCode('recharge_rate');
|
|
|
+ $rate = $rate>0? $rate : 1;
|
|
|
+ $info['thumb'] = $info['thumb'] ? get_image_url($info['thumb']) : '';
|
|
|
+ $info['create_time'] = $info['create_time'] ? datetime($info['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
$info['albums'] = isset($info['albums']) && $info['albums'] ? json_decode($info['albums'], true) : [];
|
|
|
- if($info['albums']){
|
|
|
- foreach ($info['albums'] as &$v){
|
|
|
- $v['url'] = isset($v['url']) && $v['url']? get_image_url($v['url']) : '';
|
|
|
+ $info['money'] = moneyFormat($info['price']*$rate, 2);
|
|
|
+ if ($info['albums']) {
|
|
|
+ foreach ($info['albums'] as &$v) {
|
|
|
+ $v['url'] = isset($v['url']) && $v['url'] ? get_image_url($v['url']) : '';
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -209,14 +213,14 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
|
|
|
// 图册上传处理
|
|
|
- if(isset($data['albums'])){
|
|
|
- if($data['albums']){
|
|
|
- foreach ($data['albums'] as &$v){
|
|
|
- $v['url'] = isset($v['url']) && $v['url']? str_replace(IMG_URL, "", $v['url']) : '';
|
|
|
+ if (isset($data['albums'])) {
|
|
|
+ if ($data['albums']) {
|
|
|
+ foreach ($data['albums'] as &$v) {
|
|
|
+ $v['url'] = isset($v['url']) && $v['url'] ? str_replace(IMG_URL, "", $v['url']) : '';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $data['albums'] = $data['albums']? json_encode($data['albums'], 256) : '';
|
|
|
+ $data['albums'] = $data['albums'] ? json_encode($data['albums'], 256) : '';
|
|
|
}
|
|
|
|
|
|
$data['update_time'] = time();
|