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

uncancelled

Browse Source
This commit is contained in:
邓皓元 2019-11-19 17:51:32 +08:00
parent 96d82f942e
commit 3fc93b725b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domains/Virtual/Http/Controllers/FlowPoolController.php
View File

@ -208,7 +208,7 @@ class FlowPoolController extends Controller
'company_id' => $flowPool->company_id, 'company_id' => $flowPool->company_id,
'package_id' => $package_ids, 'package_id' => $package_ids,
'unit_price' => 0, 'unit_price' => 0,
'card_status' => 2, 'uncancelled' => 1,
]; ];
$cards = $repository->skipCache()->select([ $cards = $repository->skipCache()->select([

7
app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
View File

@ -218,6 +218,13 @@ trait OrderCardConcern
} }
} }
if (isset($conditions['uncancelled'])) {
$date = isset($conditions['month']) ? Carbon::parse($conditions['month'])->copy()->startOfMonth() : date('Y-m-d H:i:s');
$this->model = $this->model->whereHas('card', function ($relation) use ($date) {
$relation->whereNull('cancelled_at')->orWhere('cancelled_at', "<", $date);
});
}
return $this; return $this;
} }
} }

4
app/Domains/Virtual/Services/FlowPoolService.php
View File

@ -141,7 +141,7 @@ class FlowPoolService extends Service
'company_id' => $company_ids, 'company_id' => $company_ids,
'package_id' => $package_ids, 'package_id' => $package_ids,
'unit_price' => 0, 'unit_price' => 0,
'card_status' => 2, 'uncancelled' => 1,
]; ];
$cards = app(OrderCardPartitionRepository::class)->skipCache()->select([ $cards = app(OrderCardPartitionRepository::class)->skipCache()->select([
@ -455,7 +455,7 @@ class FlowPoolService extends Service
'company_id' => $flowPool->company_id, 'company_id' => $flowPool->company_id,
'package_id' => array_keys($settings), 'package_id' => array_keys($settings),
'unit_price' => 0, 'unit_price' => 0,
'card_status' => 2, 'uncancelled' => 1,
]; ];
$cards = app(OrderCardPartitionRepository::class)->skipCache()->selectRaw('distinct sim as sim, package_id')->withConditions($cardConditions)->get(); $cards = app(OrderCardPartitionRepository::class)->skipCache()->selectRaw('distinct sim as sim, package_id')->withConditions($cardConditions)->get();