mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#18) from dev into main

Browse Source 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/18
This commit is contained in:
mkm 2025-04-16 17:18:47 +08:00
commit 363c7d604a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/admin/lists/store_product/StoreProductLists.php
View File

@ -73,7 +73,6 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
}
$class_all = $this->request->get('class_all');
if ($class_all) {
//查3级别的
if (count($class_all) == 1) {
$query->where('top_category_id', $class_all[0]);
} elseif (count($class_all) == 2) {
@ -182,21 +181,19 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
*/
public function count(): int
{
$export = $this->request->get('export');
if ($export == 1) {
$query = StoreProduct::where($this->searchWhere);
$class_all = $this->request->get('class_all');
if ($class_all) {
//查3级别的
$arr = Cate::where('pid', $class_all)->column('id');
if ($arr) {
$arr2 = Cate::where('pid', 'in', $arr)->column('id');
$this->searchWhere[] = ['cate_id', 'in', array_merge($arr, $arr2)];
if (count($class_all) == 1) {
$query->where('top_category_id', $class_all[0]);
} elseif (count($class_all) == 2) {
$query->where(function ($query) use ($class_all) {
$query->where('two_cate_id', $class_all[1])->whereOr('cate_id', $class_all[1]);
});
} else {
$this->searchWhere[] = ['cate_id', '=', $class_all];
$query->where('cate_id', $class_all[2]);
}
}
}
$query = StoreProduct::where($this->searchWhere);
if (isset($this->params['type_filter'])) {
if ($this->params['type_filter'] == 0) {
$query->where(function ($query) {