Compare commits

..

No commits in common. '428962d2e7b58b6afbe0c268f0e9e187c1246745' and '34e7f951a39fc790c1a2aa896c60d349a4b9e563' have entirely different histories.

  1. 11
      app/common/model/Goods.php

@ -194,7 +194,7 @@ class Goods extends BaseModel
$this->getPk() => 'desc', $this->getPk() => 'desc',
]; ];
} }
$field = $this->getAliasFields($this->name, ['content']); $field = $this->getAliasFields($this->name, ['content']);
@ -311,7 +311,6 @@ class Goods extends BaseModel
'goodsName' => null, // 商品名称 'goodsName' => null, // 商品名称
'goodsNo' => null, // 商品编码 'goodsNo' => null, // 商品编码
'status' => 0, // 商品状态(0全部 10上架 20下架) 'status' => 0, // 商品状态(0全部 10上架 20下架)
'keywords' => []
]); ]);
// 实例化新查询对象 // 实例化新查询对象
@ -344,10 +343,6 @@ class Goods extends BaseModel
} }
// 商品名称 // 商品名称
if(count($params['keywords']) > 0 ) {
$filter[] = ['goods_name', 'like', "%{$params['keywords']}%"];
}
// 商品名称
!empty($params['goodsName']) && $filter[] = ['goods_name', 'like', "%{$params['goodsName']}%"]; !empty($params['goodsName']) && $filter[] = ['goods_name', 'like', "%{$params['goodsName']}%"];
// 商品编码 // 商品编码
!empty($params['goodsNo']) && $filter[] = ['goods_no', 'like', "%{$params['goodsNo']}%"]; !empty($params['goodsNo']) && $filter[] = ['goods_no', 'like', "%{$params['goodsNo']}%"];
@ -371,7 +366,7 @@ class Goods extends BaseModel
if (isset($param['is_in_store']) && $param['is_in_store'] !== '') { if (isset($param['is_in_store']) && $param['is_in_store'] !== '') {
$filter[] = ['is_in_store', '=', $params['is_in_store']]; $filter[] = ['is_in_store', '=', $params['is_in_store']];
} }
if (isset($param['store_id']) && $param['store_id'] !== '') { if (isset($param['store_id']) && $param['store_id'] !== '') {
$filter[] = ['goods.store_id', '=', $params['store_id']]; $filter[] = ['goods.store_id', '=', $params['store_id']];
} }
@ -396,7 +391,7 @@ class Goods extends BaseModel
// 遍历商品列表整理数据 // 遍历商品列表整理数据
foreach ($list as &$goods) { foreach ($list as &$goods) {
$goods = $this->setGoodsData($goods, $callback); $goods = $this->setGoodsData($goods, $callback);
} }

Loading…
Cancel
Save