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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
liu 2024-03-15 17:02:02 +08:00
commit 518a047343
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1817,17 +1817,17 @@ class StoreOrderRepository extends BaseRepository
$order->takeOrderCount = count($order['takeOrderList']); $order->takeOrderCount = count($order['takeOrderList']);
unset($order['takeOrderList']); unset($order['takeOrderList']);
} }
$orders = $list->toArray(); $list = $list->toArray();
$merIds = array_unique(array_column($orders, 'mer_id')); $merIds = array_unique(array_column($list, 'mer_id'));
/** @var ProductLabelRepository $labelRepo */ /** @var ProductLabelRepository $labelRepo */
$labelRepo = app()->make(ProductLabelRepository::class); $labelRepo = app()->make(ProductLabelRepository::class);
foreach ($orders as &$order) { foreach ($list as &$order) {
$labelRepo->isOrder = true; $labelRepo->isOrder = true;
$labelRepo->merTypeId = $order['merchant']['type_id']; $labelRepo->merTypeId = $order['merchant']['type_id'];
$labelRepo->isWholeSale = $order['sale_type'] == Enum::SALE_TYPE_WHOLESALE; $labelRepo->isWholeSale = $order['sale_type'] == Enum::SALE_TYPE_WHOLESALE;
$order['orderProduct'] = $labelRepo->appendLabel($merIds, $order['orderProduct']); $order['orderProduct'] = $labelRepo->appendLabel($merIds, $order['orderProduct']);
} }
return compact( 'count','orders'); return compact( 'count','list');
} }
public function userList($uid, $page, $limit) public function userList($uid, $page, $limit)