diff --git a/.env.dev b/.env.dev index 139449de..a9cb08f9 100644 --- a/.env.dev +++ b/.env.dev @@ -57,4 +57,4 @@ SMS_FXFT_URL=http://47.99.58.23:9001/smsSend.do SMS_FXFT_EXT=01 JWT_TTL=1440 -JWT_REFRESH_TTL=20160 \ No newline at end of file +JWT_REFRESH_TTL=20160 diff --git a/app/Domains/Virtual/Services/PackageService.php b/app/Domains/Virtual/Services/PackageService.php index c610af09..f0da622a 100644 --- a/app/Domains/Virtual/Services/PackageService.php +++ b/app/Domains/Virtual/Services/PackageService.php @@ -78,6 +78,7 @@ class PackageService extends Service 'name' => ['required', 'between:2,32', Rule::unique($this->packageRepository->getTable(), 'name')->ignore($attributes['id'])->whereNUll('deleted_at')], 'type' => ['required', 'in:0,2,3'], 'carrier_operator' => ['required', 'in:0,1,2,3'], + 'package_type' => ['required', 'numeric'], 'cost_price' => ['numeric', 'min:0'], 'guide_price' => ['numeric', 'min:0'], 'flows' => ['numeric', 'min:0'], @@ -103,6 +104,8 @@ class PackageService extends Service 'type.in' => '套餐类型不合法', 'carrier_operator.required' => '请选择运营商', 'carrier_operator.in' => '运营商不合法', + 'package_type.required' => '请选择套餐类型', + 'package_type.numeric' => '套餐类型不合法', 'cost_price.numeric' => '套餐价格必须是数字', 'guide_price.numeric' => '套餐指导价格必须是数字', 'flows.numeric' => '套餐指导价格必须是数字', diff --git a/app/Models/Virtual/Package.php b/app/Models/Virtual/Package.php index 4dbf7225..1ad4b8fd 100644 --- a/app/Models/Virtual/Package.php +++ b/app/Models/Virtual/Package.php @@ -14,6 +14,7 @@ use App\Models\PackageBase; * @property string $name 套餐名称 * @property int $type 套餐类型(0:基础套餐 1:续费包 2:加油包) * @property int $carrier_operator 运营商(0:联通 1:移动 2:电信) + * @property int $package_type 套餐类型(0:A类套餐 1:B类套餐 2:C类套餐 3:D类套餐) * @property int $cost_price 成本价格 * @property int $guide_price 指导价格 * @property int $flows 套餐流量(M) @@ -71,6 +72,7 @@ class Package extends PackageBase 'name', 'type', 'carrier_operator', + 'package_type', 'cost_price', 'guide_price', 'flows', diff --git a/database/migrations/2019_12_20_191422_add_package_type_to_virtual_packages.php b/database/migrations/2019_12_20_191422_add_package_type_to_virtual_packages.php new file mode 100644 index 00000000..181d672c --- /dev/null +++ b/database/migrations/2019_12_20_191422_add_package_type_to_virtual_packages.php @@ -0,0 +1,30 @@ +tinyInteger('package_type')->unsigned()->default(0)->comment('套餐类型(0:A类套餐 1:B类套餐 2:C类套餐 3:D类套餐)')->after('type'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('virtual_packages'); + } +} diff --git a/frontend/src/views/virtual/packages/edit.vue b/frontend/src/views/virtual/packages/edit.vue index d0fa3872..1feb08c2 100644 --- a/frontend/src/views/virtual/packages/edit.vue +++ b/frontend/src/views/virtual/packages/edit.vue @@ -46,6 +46,17 @@ +