diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index f24d668..467dd51 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -100,7 +100,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::find($all['id']); + $detail = Visit::with('acceptAdmin','acceptAdminSignFile','acceptGoodsAdmin','accpetDepartment','visitArea')->find($all['id']); return $this->success($detail); } diff --git a/app/Models/Visit.php b/app/Models/Visit.php index 3a8859c..0c85ef6 100644 --- a/app/Models/Visit.php +++ b/app/Models/Visit.php @@ -44,4 +44,27 @@ class Visit extends SoftDeletesModel return $this->hasOne(Admin::class, 'id', 'admin_id'); } + public function acceptAdmin() + { + return $this->hasOne(Admin::class, 'id', 'accept_admin_id'); + } + + public function acceptGoodsAdmin() + { + return $this->hasOne(Admin::class, 'id', 'accept_goods_admin_id'); + } + + public function acceptAdminSignFile() + { + return $this->hasOne(Upload::class, 'id', 'accept_admin_sign'); + } + + public function accpetDepartment(){ + return $this->hasOne(Department::class,'id','accpet_department_id'); + } + + public function visitArea(){ + return $this->hasOne(VisitArea::class,'id','visit_area_id'); + } + } diff --git a/config/app.php b/config/app.php index 06c1ce7..296bcbe 100644 --- a/config/app.php +++ b/config/app.php @@ -4,8 +4,8 @@ use Illuminate\Support\Facades\Facade; return [ - 'wechat_appid' => '', - 'wechat_appsecret' => '', + 'wechat_appid' => 'wx35190cc07e73eda1', + 'wechat_appsecret' => 'aa7c4f7f055c2c95fadd52cab04fb800', /* |-------------------------------------------------------------------------- | Application Name