|
|
@@ -7,6 +7,7 @@ use app\admin\model\dao\ShopGoodsSpecRelation;
|
|
|
use app\admin\model\dao\ShopGoodsSpecType;
|
|
|
use app\admin\model\dao\ShopGoodsType;
|
|
|
use app\common\model\ShopGoods;
|
|
|
+use think\db\Query;
|
|
|
use think\facade\Cache;
|
|
|
use think\facade\Db;
|
|
|
|
|
|
@@ -41,17 +42,23 @@ class ShopGoodsLogic
|
|
|
{
|
|
|
$model = new ShopGoods();
|
|
|
$count = $model
|
|
|
- ->withJoin(['supplier', 'cate'], 'LEFT')
|
|
|
+ ->withJoin(['supplier', 'cate' => function (Query $query) {
|
|
|
+ $query->where('cate.id', '>', 0);
|
|
|
+ }], 'LEFT')
|
|
|
->where($where)
|
|
|
->count();
|
|
|
|
|
|
$list = $model
|
|
|
- ->withJoin(['supplier', 'cate'], 'LEFT')
|
|
|
+ ->withJoin(['supplier', 'cate' => function (Query $query) {
|
|
|
+ $query->where('cate.id', '>', 0);
|
|
|
+ }], 'LEFT')
|
|
|
->where($where)
|
|
|
->page($page, $limit)
|
|
|
->order('goods_id desc')
|
|
|
->select()->toArray();
|
|
|
+
|
|
|
foreach ($list as $k => &$v) {
|
|
|
+// $v['cate'] = ShopCategoryLogic::getCateById($v['category']);
|
|
|
$v['id'] = $v['goods_id'];
|
|
|
// $v['supplier'] = Db::name('shop_supplier')->where(['id'=>$v['supplier']])->value('name');
|
|
|
$v['goods_type'] = ShopGoodsTypeLogic::getNameByCache($v['goods_type']);
|