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

计数

Browse Source
This commit is contained in:
邓皓元 2019-04-24 15:34:00 +08:00
parent 731697d676
commit 7f4b94d728
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,6 +241,7 @@ class FlowPoolController extends Controller
]; ];
} else { } else {
$setting = $settings[$package_id]; $setting = $settings[$package_id];
$news = ($cards[$package_id] ?? 0) - array_sum(array_pluck($setting['cards'], 'counts'));
$chunk = $setting['cards']; $chunk = $setting['cards'];
@ -250,18 +251,16 @@ class FlowPoolController extends Controller
} }
$setting['cards'] = $chunk; $setting['cards'] = $chunk;
$setting['total'] = $cards[$package_id];
$news = ($cards[$package_id] ?? 0) - array_sum(array_pluck($setting['cards'], 'counts'));
$setting['news'] = $news < 0 ? 0 : $news; $setting['news'] = $news < 0 ? 0 : $news;
$newSettings[] = $setting; $newSettings[] = $setting;
} }
} }
$flowPoolData['total_flows'] = sprintf('%.02f', $flowPoolData['total_flows']); $flowPoolData['total_flows'] = sprintf('%.02f', $flowPoolData['total_flows']);
return res(['flowPool' => $flowPool, 'settings' => $newSettings, 'total' => array_sum(array_pluck($newSettings, 'total')), 'total_flows' => $flowPoolData['total_flows']], '数据设置'); return res(['flowPool' => $flowPool, 'settings' => $newSettings, 'total' => $cards->values()->sum(), 'total_flows' => $flowPoolData['total_flows']], '数据设置');
} }
$conditions = $this->request->all(); $conditions = $this->request->all();
@ -319,20 +318,6 @@ class FlowPoolController extends Controller
$flowPools = app(FlowPoolRepository::class)->withConditions(['id' => array_unique(array_pluck($data, 'pool_id'))])->get()->keyBy('id')->toArray(); $flowPools = app(FlowPoolRepository::class)->withConditions(['id' => array_unique(array_pluck($data, 'pool_id'))])->get()->keyBy('id')->toArray();
foreach ($data as &$item) {
$package_id = $simPackage[$item['sim']];
$pool = $flowPools[$item['pool_id']];
if (!in_array($package_id, $pool['package_ids'])) {
throw new InvalidArgumentException("卡不属于流量池 {$item['pool_id']} #: {$item['sim']}");
}
$item['package_id'] = $simPackage[$item['sim']];
}
DB::transaction(function () use ($data, $flowPools) { DB::transaction(function () use ($data, $flowPools) {
$monthGroupBy = array_groupBy($data, 'month'); $monthGroupBy = array_groupBy($data, 'month');