diff --git a/app/Domains/Virtual/Repositories/OrderRepository.php b/app/Domains/Virtual/Repositories/OrderRepository.php index 7352824d..a2bb937b 100644 --- a/app/Domains/Virtual/Repositories/OrderRepository.php +++ b/app/Domains/Virtual/Repositories/OrderRepository.php @@ -3,6 +3,7 @@ namespace App\Domains\Virtual\Repositories; use App\Core\Repository; +use Illuminate\Support\Carbon; use App\Models\Virtual\Order as Model; use App\Domains\Virtual\Services\CommonService; @@ -108,11 +109,11 @@ class OrderRepository extends Repository } if (isset($conditions['starttime'])) { - $this->model = $this->model->where('order_at', '>=', $conditions['starttime']); + $this->model = $this->model->where('order_at', '>=', Carbon::parse($conditions['starttime'])); } if (isset($conditions['endtime'])) { - $this->model = $this->model->where('order_at', '<=', $conditions['endtime']); + $this->model = $this->model->where('order_at', '<=', Carbon::parse($conditions['endtime'])); } return $this; diff --git a/app/Domains/Virtual/Services/PackageService.php b/app/Domains/Virtual/Services/PackageService.php index 97b0c519..8a240401 100644 --- a/app/Domains/Virtual/Services/PackageService.php +++ b/app/Domains/Virtual/Services/PackageService.php @@ -89,7 +89,7 @@ class PackageService extends Service $message = [ 'sn.required' => '请输入套餐编号', 'sn.between' => '套餐编号长度不合法', - 'sn.unique' => '套餐编号已存在，请重新输入', + 'sn.unique' => '已存在相同的套餐，请勿重复添加', 'name.required' => '请输入套餐名称', 'name.between' => '套餐名称长度不合法', 'name.unique' => '套餐名称已经被其他用户所使用', diff --git a/composer.lock b/composer.lock index 9b004cd2..3e65a600 100644 --- a/composer.lock +++ b/composer.lock @@ -591,17 +591,17 @@ }, { "name": "dipper/excel", - "version": "3.1.8", + "version": "3.1.9", "source": { "type": "git", "url": "ssh://gogs@git.fxft.net:2222/composer/excel.git", - "reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c" + "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc" }, "dist": { "type": "tar", - "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.8-4fd466.tar", - "reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c", - "shasum": "2f4c7f6deb2cf9a91dd5d2714bffe92e009ccd6e" + "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.9-c8a27a.tar", + "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc", + "shasum": "68794cf40c5fbab6d0c0738cb5738734f3c06471" }, "require": { "illuminate/support": "5.5.* || 5.6.* || 5.7.*", @@ -641,7 +641,7 @@ "MIT" ], "description": "Supercharged Excel exports and imports in Laravel", - "time": "2019-01-03T04:46:21+00:00" + "time": "2019-01-03T08:02:52+00:00" }, { "name": "dipper/flashmessage", @@ -680,17 +680,17 @@ }, { "name": "dipper/foundation", - "version": "1.1.18", + "version": "1.1.19", "source": { "type": "git", "url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git", - "reference": "b7858823f651bca9c77bd7b581543b9ece15ba27" + "reference": "a7179259b7b4707c570aef46fa7679f14382a584" }, "dist": { "type": "tar", - "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.18-002594.tar", - "reference": "b7858823f651bca9c77bd7b581543b9ece15ba27", - "shasum": "33cdb0c76d433e20fea1f0d7a43d603f5e2242c9" + "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.19-4a2c7e.tar", + "reference": "a7179259b7b4707c570aef46fa7679f14382a584", + "shasum": "6bc71487f98e44d82aff274a25d56c24b894de1e" }, "require": { "barryvdh/laravel-cors": "~0.11", @@ -724,7 +724,7 @@ } ], "description": "The Foundation of the Dipper Architecture project for Lumen", - "time": "2019-01-03T06:02:57+00:00" + "time": "2019-01-03T07:51:26+00:00" }, { "name": "dipper/jwt-auth", diff --git a/frontend/src/views/user/roles/detail.vue b/frontend/src/views/user/roles/detail.vue index 5507d1b0..8138593d 100644 --- a/frontend/src/views/user/roles/detail.vue +++ b/frontend/src/views/user/roles/detail.vue @@ -3,22 +3,22 @@
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 63809264..22100c1d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -604,18 +604,18 @@ }, { "name": "dipper/excel", - "version": "3.1.8", - "version_normalized": "3.1.8.0", + "version": "3.1.9", + "version_normalized": "3.1.9.0", "source": { "type": "git", "url": "ssh://gogs@git.fxft.net:2222/composer/excel.git", - "reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c" + "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc" }, "dist": { "type": "tar", - "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.8-4fd466.tar", - "reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c", - "shasum": "2f4c7f6deb2cf9a91dd5d2714bffe92e009ccd6e" + "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.9-c8a27a.tar", + "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc", + "shasum": "68794cf40c5fbab6d0c0738cb5738734f3c06471" }, "require": { "illuminate/support": "5.5.* || 5.6.* || 5.7.*", @@ -630,7 +630,7 @@ "phpunit/phpunit": "^7.0", "predis/predis": "^1.1" }, - "time": "2019-01-03T04:46:21+00:00", + "time": "2019-01-03T08:02:52+00:00", "type": "library", "extra": { "laravel": { @@ -697,18 +697,18 @@ }, { "name": "dipper/foundation", - "version": "1.1.18", - "version_normalized": "1.1.18.0", + "version": "1.1.19", + "version_normalized": "1.1.19.0", "source": { "type": "git", "url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git", - "reference": "b7858823f651bca9c77bd7b581543b9ece15ba27" + "reference": "a7179259b7b4707c570aef46fa7679f14382a584" }, "dist": { "type": "tar", - "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.18-002594.tar", - "reference": "b7858823f651bca9c77bd7b581543b9ece15ba27", - "shasum": "33cdb0c76d433e20fea1f0d7a43d603f5e2242c9" + "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.19-4a2c7e.tar", + "reference": "a7179259b7b4707c570aef46fa7679f14382a584", + "shasum": "6bc71487f98e44d82aff274a25d56c24b894de1e" }, "require": { "barryvdh/laravel-cors": "~0.11", @@ -723,7 +723,7 @@ "league/flysystem": "~1.0", "nesbot/carbon": "~1.21" }, - "time": "2019-01-03T06:02:57+00:00", + "time": "2019-01-03T07:51:26+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/dipper/excel/src/Sheet.php b/vendor/dipper/excel/src/Sheet.php index ba6976b3..230657a7 100644 --- a/vendor/dipper/excel/src/Sheet.php +++ b/vendor/dipper/excel/src/Sheet.php @@ -342,9 +342,7 @@ class Sheet public function fromQuery(FromQuery $sheetExport, Worksheet $worksheet) { $sheetExport->query()->chunk($this->getChunkSize($sheetExport), function ($chunk) use ($sheetExport, $worksheet) { - foreach ($chunk as $row) { - $this->appendRow($row, $sheetExport); - } + $this->appendRows($chunk, $sheetExport); }); }