hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

关联 删除订单

Browse Source
This commit is contained in:
邓皓元 2019-03-25 18:49:43 +08:00
parent c0f511e5d7
commit 450b833a70
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Domains/Real/Repositories/OrderCardPartitionRepository.php
View File

@ -63,7 +63,10 @@ class OrderCardPartitionRepository extends Repository
$this->model = $this->model->selectRaw($select); $this->model = $this->model->selectRaw($select);
$this->model = $this->model->leftJoin('virtual_order_cards_partition', 'virtual_order_cards_partition.sim', '=', 'real_order_cards_partition.sim'); $this->model = $this->model->leftJoin('virtual_order_cards_partition', function($join){
$join->on('virtual_order_cards_partition.sim', '=', 'real_order_cards_partition.sim')
->whereNull('virtual_order_cards_partition.deleted_at');
});
$this->model= $this->model $this->model= $this->model
->orderBy('real_order_cards_partition.id') ->orderBy('real_order_cards_partition.id')

4
app/Domains/Real/Services/OrderService.php
View File

@ -94,7 +94,7 @@ class OrderService extends Service
$key = array_search(0, $orderIds); $key = array_search(0, $orderIds);
if (!is_null($key)) { if ($key !== false) {
unset($orderIds[$key]); unset($orderIds[$key]);
} }
@ -104,7 +104,7 @@ class OrderService extends Service
$virtualOrders = app(VirtualOrderRepository::class)->withConditions(['id' => $orderIds])->get()->keyBy('id'); $virtualOrders = app(VirtualOrderRepository::class)->withConditions(['id' => $orderIds])->get()->keyBy('id');
} }
$cards->map(function ($item) use ($virtualOrders, $virtualOrderCards) { $cards->map(function ($item) use ($virtualOrders) {
$item->sim = (string)$item->sim; $item->sim = (string)$item->sim;
$item->company_id = $item->company_id ?? 0; $item->company_id = $item->company_id ?? 0;
$item->package_id = $item->package_id ?? 0; $item->package_id = $item->package_id ?? 0;