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

处理代发订单的错误

Browse Source
This commit is contained in:
luofei 2024-02-04 09:22:51 +08:00
parent d17cd4353b
commit 15d886e0d4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -2420,6 +2420,9 @@ class StoreOrderRepository extends BaseRepository
public function childrenList($id, $merId) public function childrenList($id, $merId)
{ {
$data = $this->dao->get($id); $data = $this->dao->get($id);
if (empty($data)) {
return [];
}
$query = $this->dao->getSearch([])->with(['orderProduct'])->where('order_id', '<>', $id); $query = $this->dao->getSearch([])->with(['orderProduct'])->where('order_id', '<>', $id);
if ($merId) $query->where('mer_id', $merId); if ($merId) $query->where('mer_id', $merId);
if ($data['main_id']) { if ($data['main_id']) {

1
app/controller/merchant/store/order/Order.php
View File

@ -478,7 +478,6 @@ class Order extends BaseController
public function childrenList($id) public function childrenList($id)
{ {
return app('json')->success([]);
$data = $this->repository->childrenList($id, $this->request->merId()); $data = $this->repository->childrenList($id, $this->request->merId());
return app('json')->success($data); return app('json')->success($data);
} }