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

计费规则移除套餐情况

Browse Source
This commit is contained in:
邓皓元 2019-02-26 17:34:48 +08:00
parent 4d2bb31304
commit be817022e0
3 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Domains/Card/Services/CardService.php Normal file
View File

@ -0,0 +1,18 @@
<?php
namespace App\Domains\Card\Services;
use App\Core\Service;
class CardService extends Service
{
/**
* 构造函数
*
* @return void
*/
public function __construct()
{
//
}
}

13
app/Domains/Card/Tests/Services/CardServiceTest.php Normal file
View File

@ -0,0 +1,13 @@
<?php
namespace App\Domains\Card\Tests\Services;
use App\Core\TestCase;
use App\Domains\Card\Services\CardService;
class CardServiceTest extends TestCase
{
public function testCardServiceTest()
{
$this->assertTrue(true);
}
}

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

@ -653,27 +653,39 @@ class FlowPoolService extends Service
$item->products = $products;
$products = array_keyBy($products, 'product_id');
if ($settings = $allSettings[$item->id]) {
foreach ($settings as $setting) {
$minimum_settings = array_keyBy($setting->minimum_settings ?? [], 'product_id');
if ($setting->start_at <= $month && $setting->end_at >= $month) {
$setting_status = 1;
$minimum_settings = array_keyBy($setting->minimum_settings ?? [], 'product_id');
foreach ($products as $product) {
if (!isset($minimum_settings[$product['product_id']])) {
$setting_status = 0;
$minimum_settings[$product['product_id']] = [
'product_id' => $product['product_id'],
'product_name' => $product['product_name'],
'flows' => 0,
'price' => 0
];
} else {
$minimum_settings[$product['product_id']]['product_name'] = $product['product_name'];
}
}
$setting->minimum_settings = array_values($minimum_settings);
foreach ($minimum_settings as $product_id => $minimum_setting) {
if (!isset($products[$product_id])) {
unset($minimum_settings[$product_id]);
}
}
}
foreach ($minimum_settings as $product_id => $minimum_setting) {
$minimum_settings[$product_id]['product_name'] = ProductService::load($product['product_id'])['name'];
}
$setting->minimum_settings = array_values($minimum_settings);
}
} else {
$settings = collect();