From a47fbb2622302026cacaca03bee2edf66bf55ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Wed, 10 Aug 2022 23:45:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Log/LogsController.php | 1 + app/Http/Controllers/Role/RolesController.php | 2 +- app/Http/Controllers/Shop/ShopsController.php | 3 +++ app/Models/BusinessOrder.php | 5 ++++ app/Models/BusinessOrderItem.php | 26 ++++++++++++++++++- .../2022_08_02_022448_create_shops_table.php | 2 +- database/seeds/MenusTableSeeder.php | 2 +- resources/lang/zh-CN/permission.php | 20 +++++++------- 8 files changed, 47 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Log/LogsController.php b/app/Http/Controllers/Log/LogsController.php index f0441f6..cd74e76 100644 --- a/app/Http/Controllers/Log/LogsController.php +++ b/app/Http/Controllers/Log/LogsController.php @@ -12,6 +12,7 @@ class LogsController extends Controller public function index(Request $request) { $res = Log::query() + ->orderBy('id', 'desc') ->with(['user:id,name']) ->filter() ->paginate(); diff --git a/app/Http/Controllers/Role/RolesController.php b/app/Http/Controllers/Role/RolesController.php index 1e592c7..6338fd8 100644 --- a/app/Http/Controllers/Role/RolesController.php +++ b/app/Http/Controllers/Role/RolesController.php @@ -24,7 +24,7 @@ class RolesController extends Controller public function index() { - $roles = Role::query()->with('permissions')->get()->toArray(); + $roles = Role::query()->with('permissions')->where('id', '<>', 1)->get()->toArray(); $routes = include(resource_path('lang/zh-CN/permission.php')); foreach ($roles as &$role) { $permissions = []; diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php index a4aee5c..ee8c0bf 100644 --- a/app/Http/Controllers/Shop/ShopsController.php +++ b/app/Http/Controllers/Shop/ShopsController.php @@ -48,6 +48,9 @@ class ShopsController extends Controller $shop = new Shop(); $shop->name = $request->name; $shop->plat_id = $request->plat_id; + if (0 === $request->plat_id) { + $shop->status = 2; + } $shop->save(); return response($this->res, $this->res['httpCode']); diff --git a/app/Models/BusinessOrder.php b/app/Models/BusinessOrder.php index 42d4f73..913a45a 100644 --- a/app/Models/BusinessOrder.php +++ b/app/Models/BusinessOrder.php @@ -45,4 +45,9 @@ class BusinessOrder extends Model 'nick_name', 'order_sn', ]; + + public function items() + { + return $this->hasMany(BusinessOrderItem::class, 'business_order_id'); + } } diff --git a/app/Models/BusinessOrderItem.php b/app/Models/BusinessOrderItem.php index daa3675..19015e3 100644 --- a/app/Models/BusinessOrderItem.php +++ b/app/Models/BusinessOrderItem.php @@ -9,7 +9,31 @@ class BusinessOrderItem extends Model * * @var array */ - protected $guarded = []; + protected $fillable = [ + 'shop_id', + 'business_order_id', + 'already_cancel_number', + 'cancel_status', + 'category_name', + 'external_sku_id', + 'goods_amount', + 'goods_cost_price', + 'goods_id', + 'goods_name', + 'goods_number', + 'goods_price', + 'goods_purchase_price', + 'goods_specification', + 'help_sell_amount', + 'is_supplier', + 'need_verification_number', + 'shipping_status', + 'sku_id', + 'sub_order_sn', + 'theoretically_refund_amount', + 'thumb_url', + 'verification_number', + ]; public function order() { diff --git a/database/migrations/2022_08_02_022448_create_shops_table.php b/database/migrations/2022_08_02_022448_create_shops_table.php index 5d63e2f..8364f24 100644 --- a/database/migrations/2022_08_02_022448_create_shops_table.php +++ b/database/migrations/2022_08_02_022448_create_shops_table.php @@ -28,7 +28,7 @@ class CreateShopsTable extends Migration $table->unsignedInteger('refresh_token_expires_in')->nullable()->comment('refresh_token过期时间段，10表示10秒后过期'); $table->text('scope')->nullable()->comment('接口列表'); $table->text('pop_auth_token_create_response')->nullable()->comment('授权认证信息'); - $table->string('status')->default(0)->comment('状态'); + $table->unsignedTinyInteger('status')->default(0)->comment('状态'); $table->softDeletes(); $table->timestamps(); }); diff --git a/database/seeds/MenusTableSeeder.php b/database/seeds/MenusTableSeeder.php index d968742..c260c8e 100644 --- a/database/seeds/MenusTableSeeder.php +++ b/database/seeds/MenusTableSeeder.php @@ -27,7 +27,7 @@ class MenusTableSeeder extends Seeder $id = DB::table('menus')->insertGetId(['parent_id' => 0,'code' => 'SYSTEM_MANAGE', 'name' => '系统管理', 'seq' => 3]); DB::table('menus')->insert([ ['parent_id' => $id,'code' => 'ROLE_MANAGE', 'name' => '角色管理', 'seq' => 0], - ['parent_id' => $id,'code' => 'PERMISSION_MANAGE', 'name' => '权限管理', 'seq' => 1], +// ['parent_id' => $id,'code' => 'PERMISSION_MANAGE', 'name' => '权限管理', 'seq' => 1], ]); // 系统日志 DB::table('menus')->insertGetId(['parent_id' => 0,'code' => 'SYSTEM_LOG', 'name' => '系统日志', 'seq' => 4]); diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php index 3a59603..6d487bb 100644 --- a/resources/lang/zh-CN/permission.php +++ b/resources/lang/zh-CN/permission.php @@ -210,16 +210,16 @@ return [ 'name' => '设置权限', 'parent_id' => 8, ], - 'PERMISSION_MANAGE' => [ - 'id' => 9, - 'name' => '权限管理', - 'parent_id' => 7, - ], - 'permissions.index' => [ - 'id' => 90, - 'name' => '列表', - 'parent_id' => 9, - ], +// 'PERMISSION_MANAGE' => [ +// 'id' => 9, +// 'name' => '权限管理', +// 'parent_id' => 7, +// ], +// 'permissions.index' => [ +// 'id' => 90, +// 'name' => '列表', +// 'parent_id' => 9, +// ], // 系统日志 'SYSTEM_LOG' => [ 'id' => 10,