修改获取小组采购所有订单
This commit is contained in:
parent
4276a74af2
commit
236b78e60d
@ -79,6 +79,8 @@ class StoreProduct extends BaseController
|
|||||||
$data['status'] = $merchant->is_audit ? 0 : 1;
|
$data['status'] = $merchant->is_audit ? 0 : 1;
|
||||||
$data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
|
$data['mer_status'] = ($merchant['is_del'] || !$merchant['mer_state'] || !$merchant['status']) ? 0 : 1;
|
||||||
$data['rate'] = 3;
|
$data['rate'] = 3;
|
||||||
|
// $data['cate_id'] = 1;
|
||||||
|
// $data['mer_cate_id'] = 1;
|
||||||
$this->repository->create($data, 0, 1);
|
$this->repository->create($data, 0, 1);
|
||||||
return app('json')->success('添加成功');
|
return app('json')->success('添加成功');
|
||||||
}
|
}
|
||||||
|
@ -155,7 +155,7 @@ class StoreOrder extends BaseController
|
|||||||
$source = $this->request->param('source');
|
$source = $this->request->param('source');
|
||||||
$source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
|
$source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
|
||||||
$where['uid'] = $this->request->uid();
|
$where['uid'] = $this->request->uid();
|
||||||
$where['paid'] = 1;
|
// $where['paid'] = 1;
|
||||||
$where['source'] = $source;
|
$where['source'] = $source;
|
||||||
|
|
||||||
return app('json')->success($this->repository->getList($where, $page, $limit, $source));
|
return app('json')->success($this->repository->getList($where, $page, $limit, $source));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user