diff --git a/app/console/controller/BrandController.php b/app/console/controller/BrandController.php index b8bce33..56c7469 100644 --- a/app/console/controller/BrandController.php +++ b/app/console/controller/BrandController.php @@ -84,6 +84,7 @@ class BrandController extends BaseController unset($v['translation']); $result['trait'][$k] = $v; } + $result['creater'] = $item['creater']; return $result; } @@ -154,6 +155,7 @@ class BrandController extends BaseController public function add(Request $request): Response { try { + $request->setPost('creater', $request->user['id']); $id = $this->getService()->add($request->all()); return $id ? $this->successResponse(['id' => $id]) : $this->errorResponse(); diff --git a/app/console/controller/VehicleNewController.php b/app/console/controller/VehicleNewController.php index c46ae08..0ee5357 100644 --- a/app/console/controller/VehicleNewController.php +++ b/app/console/controller/VehicleNewController.php @@ -104,6 +104,7 @@ class VehicleNewController extends BaseController $contentRes['content'] = isset($content['translation']) ? $content['translation']['content']:''; $result['content'][] = $contentRes; } + $result['creater'] = ['id' => $item['creater']['id'],'nickname' => $item['creater']['nickname']]; return $result; } @@ -143,6 +144,7 @@ class VehicleNewController extends BaseController public function add(Request $request): Response { try { + $request->setPost('creater', $request->user['id']); return $this->getService()->add($request->all()) ? $this->successResponse() : $this->errorResponse(); diff --git a/app/console/model/AdminsModel.php b/app/console/model/AdminsModel.php index f873a9e..c21f0cd 100644 --- a/app/console/model/AdminsModel.php +++ b/app/console/model/AdminsModel.php @@ -53,4 +53,10 @@ class AdminsModel extends Model * 不允许自动填充模型字段 */ protected $guarded = []; + + + public function vehicleNew() + { + return $this->hasMany(VehicleNewModel::class, 'creater', 'id'); + } } \ No newline at end of file diff --git a/app/console/model/BrandModel.php b/app/console/model/BrandModel.php index 19e1415..fb2175d 100644 --- a/app/console/model/BrandModel.php +++ b/app/console/model/BrandModel.php @@ -47,7 +47,7 @@ class BrandModel extends Model /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'created_at', 'updated_at']; + protected $fillable = ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'creater', 'created_at', 'updated_at']; /** * 不允许自动填充模型字段 @@ -73,4 +73,8 @@ class BrandModel extends Model { return $this->hasMany(BrandTraitModel::class, 'brand_id','id'); } + public function creater() + { + return $this->belongsTo(AdminsModel::class, 'creater','id'); + } } \ No newline at end of file diff --git a/app/console/model/VehicleNewModel.php b/app/console/model/VehicleNewModel.php index e40c992..1de4621 100644 --- a/app/console/model/VehicleNewModel.php +++ b/app/console/model/VehicleNewModel.php @@ -47,7 +47,7 @@ class VehicleNewModel extends Model /**x` * 允许自动填充模型字段 */ - protected $fillable = ['id', 'vin', 'brand', 'cover', 'album', 'price', 'type', 'energy', 'model', 'video', 'views', 'created_at', 'updated_at', 'location']; + protected $fillable = ['id', 'vin', 'brand', 'cover', 'album', 'price', 'type', 'energy', 'model', 'video', 'views', 'creater', 'created_at', 'updated_at', 'location']; /** * 不允许自动填充模型字段 @@ -118,4 +118,8 @@ class VehicleNewModel extends Model { return $this->hasMany(VehicleNewContentModel::class, 'vehicle_id', 'id'); } + public function creater() + { + return $this->belongsTo(AdminsModel::class, 'creater','id'); + } } \ No newline at end of file diff --git a/app/console/service/BrandService.php b/app/console/service/BrandService.php index 928cf22..ddc5585 100644 --- a/app/console/service/BrandService.php +++ b/app/console/service/BrandService.php @@ -34,11 +34,12 @@ class BrandService extends BaseService 'default' => function ($params) { return [ 'filters' => $params['filters'], - 'fields' => ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'created_at', 'updated_at'], + 'fields' => ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'creater', 'created_at', 'updated_at'], 'relations' => [ 'translation' => ['brand_id', 'name', 'desc','toppic_alt','descpic_alt','logo_alt'], 'banner' => ['id', 'pic', 'sort',], 'banner.translation' => ['id', 'alt',], + 'creater' => ['id', 'nickname',], 'trait' => ['id', 'sort',], 'trait.translation' => ['id', 'title', 'content',], ], diff --git a/app/console/service/VehicleNewService.php b/app/console/service/VehicleNewService.php index de76ab2..7827ba2 100644 --- a/app/console/service/VehicleNewService.php +++ b/app/console/service/VehicleNewService.php @@ -51,6 +51,7 @@ class VehicleNewService extends BaseService 'types.translation' => ['type_id', 'name'], 'energy.translation' => ['energy_id', 'name'], 'models.translation' => ['model_id', 'name'], + 'creater' => ['id', 'nickname',], ], 'sorts' => [ ['field' => 'id', 'direction' => 'desc'] @@ -67,7 +68,7 @@ class VehicleNewService extends BaseService 'filters' => [ ['field'=>'id', 'operator'=>'=', 'value'=> $params['id']], ], - 'fields' => ['id', 'vin', 'brand', 'cover', 'price', 'type', 'energy', 'model', 'video', 'views', 'created_at', 'updated_at'], + 'fields' => ['id', 'vin', 'brand', 'cover', 'price', 'type', 'energy', 'model', 'video', 'views', 'creater', 'created_at', 'updated_at'], 'relations' => [ 'translation' => ['vehicle_id', 'locale', 'name', 'condition_desc', 'location'], 'asked' => ['id', 'vehicle_id', 'status', 'sort'], @@ -82,6 +83,7 @@ class VehicleNewService extends BaseService 'types.translation' => ['type_id', 'name'], 'energy.translation' => ['energy_id', 'name'], 'models.translation' => ['model_id', 'name'], + 'creater' => ['id', 'nickname',], ], 'sorts' => [ ['field' => 'id', 'direction' => 'desc']