From d8510155bb1946689d866dca1925095031050215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Tue, 16 Aug 2022 21:15:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20#10000=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Controller.php | 1 + app/Http/Controllers/Shop/ShopsController.php | 10 ++++++++++ resources/lang/zh-CN/permission.php | 5 +++++ routes/api.php | 1 + 4 files changed, 17 insertions(+) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 7ba4564..f737615 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -13,6 +13,7 @@ class Controller extends BaseController protected $res = [ 'httpCode' => 200, + 'message' => '操作成功', 'errorCode' => 0, 'errorMessage' => '', ]; diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php index a6fdc4a..b1acbcc 100644 --- a/app/Http/Controllers/Shop/ShopsController.php +++ b/app/Http/Controllers/Shop/ShopsController.php @@ -131,4 +131,14 @@ class ShopsController extends Controller return $data; } + + public function downloadGoods($id, Request $request) + { + $shop = Shop::query()->find($id); + $business = BusinessFactory::init()->make($shop->plat_id); + $business->setShop($shop); + $business->downloadGoodsListAndBind(); + + return response($this->res, $this->res['httpCode']); + } } diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php index fe2f9f9..7cae14b 100644 --- a/resources/lang/zh-CN/permission.php +++ b/resources/lang/zh-CN/permission.php @@ -148,6 +148,11 @@ return [ 'name' => '删除', 'parent_id' => 5, ], + 'business.goods_sku.download' => [ + 'id' => 55, + 'name' => '商品下载', + 'parent_id' => 5, + ], // 用户管理 'USER_MANAGE' => [ 'id' => 6, diff --git a/routes/api.php b/routes/api.php index 19fbfe3..fe003ca 100644 --- a/routes/api.php +++ b/routes/api.php @@ -34,6 +34,7 @@ Route::middleware(['auth:api', 'check.permissions'])->group(function () { // 店铺 Route::resource('shops', 'Shop\ShopsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]); Route::get('count/orders/num', [ShopsController::class, 'countOrdersNumWithSkuCode'])->name('goods_sku.orders_num'); + Route::get('download/{id}/goods', [ShopsController::class, 'downloadGoods'])->name('business.goods_sku.download'); // 角色 Route::resource('roles', 'Role\RolesController', ['only' => ['index', 'store', 'show', 'update']]); Route::post('roles/{id}/permissions', [RolesController::class, 'addPermissions'])->name('roles.permission'); From 1c89064f6578a6265e130dfa7e2e6040268e8d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Tue, 16 Aug 2022 21:26:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20#10000=20=E6=9D=83=E9=99=90seed?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/seeds/PermissionsTableSeeder.php | 6 +++--- database/seeds/RolesTableSeeder.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database/seeds/PermissionsTableSeeder.php b/database/seeds/PermissionsTableSeeder.php index c0aa0f7..e053ab4 100644 --- a/database/seeds/PermissionsTableSeeder.php +++ b/database/seeds/PermissionsTableSeeder.php @@ -2,6 +2,7 @@ use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; +use Spatie\Permission\Models\Permission; class PermissionsTableSeeder extends Seeder { @@ -13,10 +14,9 @@ class PermissionsTableSeeder extends Seeder public function run() { $routes = include(resource_path('lang/zh-CN/permission.php')); - $data = []; foreach ($routes as $key => $route) { - $data[] = ['name' => $key, 'guard_name' => 'api']; + $data = ['name' => $key, 'guard_name' => 'api']; + Permission::firstOrCreate($data); } - DB::table('permissions')->insert($data); } } diff --git a/database/seeds/RolesTableSeeder.php b/database/seeds/RolesTableSeeder.php index 8623938..b0f693e 100644 --- a/database/seeds/RolesTableSeeder.php +++ b/database/seeds/RolesTableSeeder.php @@ -12,7 +12,7 @@ class RolesTableSeeder extends Seeder */ public function run() { - DB::table('roles')->insert([ + DB::table('roles')->insertOrIgnore([ ['name' => '超级管理员', 'guard_name' => 'api'], ]); }