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

Merge pull request '更新' (#82) from dev into master

Browse Source 
Reviewed-on: #82
This commit is contained in:
mkm 2023-12-01 10:26:09 +08:00
commit 5d98570990
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/controller/admin/store/StoreCategory.php
View File

@ -204,26 +204,26 @@ class StoreCategory extends BaseController
$lv = $this->request->param('lv',null); $lv = $this->request->param('lv',null);
if (!is_null($lv)) $lv = $lv + 1; if (!is_null($lv)) $lv = $lv + 1;
$data = $this->repository->getList($type,$lv); $data = $this->repository->getList($type,$lv);
if ($lv) { // if ($lv) {
$ret = $data; // $ret = $data;
} else { // } else {
$ret = []; // $ret = [];
foreach ($data as $key => $value) { // foreach ($data as $key => $value) {
if (isset($value['children'])) { // if (isset($value['children'])) {
$level = []; // $level = [];
foreach ($value['children'] as $child) { // foreach ($value['children'] as $child) {
if (isset($child['children'])) { // if (isset($child['children'])) {
$level[] = $child; // $level[] = $child;
} // }
} // }
if (isset($level) && !empty($level)) { // if (isset($level) && !empty($level)) {
$value['children'] = $level; // $value['children'] = $level;
$ret[] = $value; // $ret[] = $value;
} // }
} // }
} // }
} // }
return app('json')->success($ret); return app('json')->success($data);
} }
/** /**

10
app/controller/merchant/store/product/Product.php
View File

@ -86,11 +86,11 @@ class Product extends BaseController
{ {
$params = $this->request->params($this->repository::CREATE_PARAMS); $params = $this->request->params($this->repository::CREATE_PARAMS);
$data = $this->repository->checkParams($params,$this->request->merId()); $data = $this->repository->checkParams($params,$this->request->merId());
$cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id'); // $cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id');
if(!$cate_id){ // if(!$cate_id){
return app('json')->fail('请先添加第三级分类'); // return app('json')->fail('请先添加第三级分类');
} // }
$data['cate_id']=$cate_id; // $data['cate_id']=$cate_id;
$data['mer_id'] = $this->request->merId(); $data['mer_id'] = $this->request->merId();
if ($data['is_gift_bag'] && !$this->repository->checkMerchantBagNumber($data['mer_id'])) if ($data['is_gift_bag'] && !$this->repository->checkMerchantBagNumber($data['mer_id']))
return app('json')->fail('礼包数量超过数量限制'); return app('json')->fail('礼包数量超过数量限制');