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

Merge branch 'develop'

Browse Source
This commit is contained in:
monanxiao 2023-03-17 15:51:48 +08:00
commit bd97777b66
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/api/server/StoreProduct.php
View File

@ -79,6 +79,8 @@ class StoreProduct extends BaseController
$data['status'] = $merchant->is_audit ? 0 : 1;
$data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
$data['rate'] = 3;
// $data['cate_id'] = 1;
// $data['mer_cate_id'] = 1;
$this->repository->create($data, 0, 1);
return app('json')->success('添加成功');
}

2
app/controller/api/store/order/StoreOrder.php
View File

@ -155,7 +155,7 @@ class StoreOrder extends BaseController
$source = $this->request->param('source');
$source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
$where['uid'] = $this->request->uid();
$where['paid'] = 1;
// $where['paid'] = 1;
$where['source'] = $source;
return app('json')->success($this->repository->getList($where, $page, $limit, $source));