diff --git a/app/admin/controller/AboutUs/CompanyProfile.php b/app/admin/controller/AboutUs/CompanyProfile.php index 59429b2..de9d8fc 100644 --- a/app/admin/controller/AboutUs/CompanyProfile.php +++ b/app/admin/controller/AboutUs/CompanyProfile.php @@ -56,21 +56,28 @@ class CompanyProfile extends BaseController */ public function editCompanyProfile(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'company_profile_img|简介图片' => 'require', - 'company_profile_content|简介内容' => 'require', - 'company_profile_order|简介排序' => 'require' - ]); - $model = ModelCompanyProfile::where('company_profile_guid', $params['company_profile_guid'])->find(); - if (!$model) throwErrorMsg("该公司简介不存在", 1); - $model->allowField([ - 'company_profile_update_user_guid', - 'company_profile_img', - 'company_profile_content', - 'company_profile_order' - ])->save($params); - return msg('编辑成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'company_profile_img|简介图片' => 'require', + 'company_profile_content|简介内容' => 'require', + 'company_profile_order|简介排序' => 'require' + ]); + $model = ModelCompanyProfile::where('company_profile_guid', $params['company_profile_guid'])->find(); + if (!$model) throwErrorMsg("该公司简介不存在", 1); + $model->allowField([ + 'company_profile_update_user_guid', + 'company_profile_img', + 'company_profile_content', + 'company_profile_order' + ])->save($params); + Db::commit(); + return msg('编辑成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** @@ -84,21 +91,28 @@ class CompanyProfile extends BaseController */ public function addCompanyProfile(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'company_profile_img|简介图片' => 'require', - 'company_profile_content|简介内容' => 'require', - 'company_profile_order|简介排序' => 'require' - ]); - ModelCompanyProfile::create($params, [ - 'company_profile_guid', - 'company_profile_create_user_guid', - 'company_profile_update_user_guid', - 'company_profile_img', - 'company_profile_content', - 'company_profile_order' - ]); - return msg('添加成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'company_profile_img|简介图片' => 'require', + 'company_profile_content|简介内容' => 'require', + 'company_profile_order|简介排序' => 'require' + ]); + ModelCompanyProfile::create($params, [ + 'company_profile_guid', + 'company_profile_create_user_guid', + 'company_profile_update_user_guid', + 'company_profile_img', + 'company_profile_content', + 'company_profile_order' + ]); + Db::commit(); + return msg('添加成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** @@ -112,14 +126,21 @@ class CompanyProfile extends BaseController */ public function deleteCompanyProfile(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'company_profile_guid' => 'require', - ]); - $company_profile = ModelCompanyProfile::where([ - 'company_profile_guid' => explode(',', $params['company_profile_guid']) - ])->select(); - $company_profile->delete(); - return msg('删除成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'company_profile_guid' => 'require', + ]); + $company_profile = ModelCompanyProfile::where([ + 'company_profile_guid' => explode(',', $params['company_profile_guid']) + ])->select(); + $company_profile->delete(); + Db::commit(); + return msg('删除成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } } diff --git a/app/admin/controller/ContactUs/Signup.php b/app/admin/controller/ContactUs/Signup.php index f93953e..03a14f6 100644 --- a/app/admin/controller/ContactUs/Signup.php +++ b/app/admin/controller/ContactUs/Signup.php @@ -73,64 +73,9 @@ class Signup extends BaseController */ public function handleSignupStatus(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'signup_guid|在线报名guid' => 'require', - ]); - $msg_data = []; - $signup_guids = explode(',', $params['signup_guid']); - $signup_guids_count = count($signup_guids); - foreach ($signup_guids as $line => $signup_guid) { - $prefix_text = ($signup_guids_count != 1) ? "第" . ($line + 1) . "行-> " : null; - try { - $signup = ModelSignup::where('signup_guid', $signup_guid)->find(); - if (!$signup) throwErrorMsg('该在线报名数据不存在!'); - if ($signup->signup_status == 1) throwErrorMsg('该在线报名数据已处理!'); - $signup->signup_status = 1; - $signup->save(); - $msg_data[] = $prefix_text . "用户名称【{$signup->signup_user_name}】: 受理成功!"; - } catch (\Throwable $th) { - $msg_data[] = $prefix_text . "用户名称:【{$signup->signup_user_name}】: {$th->getMessage()}"; - } - }; - return msg(0, implode('
', $msg_data)); + return msg(ModelSignup::handleStatus($request)); } - - // /** - // * 添加在线报名 - // */ - // public function addSignup(Request $request): array - // { - // $params = $request->param(); - // $this->validate($params, [ - // 'signup_user_name|报名用户名称' => 'require', - // 'signup_user_phone|报名用户电话' => 'require', - // 'signup_user_parents_phone|报名用户家长电话' => 'require', - // 'signup_user_home_address|报名用户家庭地址' => 'require', - // 'signup_user_original_school|报名用户原就读学校' => 'require', - // 'signup_user_arrival_time|报名用户预计到校时间' => 'require', - // 'classes_guid|报名用户选择班级guid(外键)' => 'require', - // 'signup_user_grad_type|报名用户毕业类型(字典)' => 'require', - // 'signup_status|报名受理状态(字典)' => 'require' - // ]); - // $model = ModelSignup::create($params, [ - // 'signup_guid', - // 'signup_create_user_guid', - // 'signup_update_user_guid', - // 'signup_user_name', - // 'signup_user_phone', - // 'signup_user_parents_phone', - // 'signup_user_home_address', - // 'signup_user_original_school', - // 'signup_user_arrival_time', - // 'classes_guid', - // 'signup_user_grad_type', - // 'signup_status' - // ]); - // return msg('添加成功!'); - // } - /** * 删除在线报名接口 * @@ -142,15 +87,18 @@ class Signup extends BaseController */ public function deleteSignup(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'signup_guid|在线报名guid' => 'require', - ]); - $signup = ModelSignup::where([ - 'signup_guid' => explode(',', $params['signup_guid']) - ])->select(); - $signup->delete(); - return msg('删除成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, ['signup_guid|在线报名guid' => 'require',]); + $signup = ModelSignup::where(['signup_guid' => explode(',', $params['signup_guid'])])->select(); + $signup->delete(); + Db::commit(); + return msg('删除成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** diff --git a/app/admin/controller/Works/Works.php b/app/admin/controller/Works/Works.php index a87536a..7dd016f 100644 --- a/app/admin/controller/Works/Works.php +++ b/app/admin/controller/Works/Works.php @@ -66,32 +66,39 @@ class Works extends BaseController */ public function editWorks(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'works_img|作品图片' => 'require', - 'works_guid|作品guid' => 'require', - 'works_intro|作品介绍' => 'require', - 'works_likes_count|作品点赞数' => 'require', - 'works_order|排序' => 'require', - 'works_type_guid|作品类型guid' => 'require', - 'works_name|作品名称' => 'require', - 'works_author|作品作者' => 'require', - 'classes_guid|班型guid' => 'require', - ]); - $model = ModelWorks::where('works_guid', $params['works_guid'])->find(); - if (!$model) throwErrorMsg("该作品不存在", 1); - $model->allowField([ - 'works_update_user_guid', - 'works_img', - 'works_intro', - 'works_likes_count', - 'works_type_guid', - 'works_order', - 'works_name', - 'works_author', - 'classes_guid', - ])->save($params); - return msg('编辑成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'works_img|作品图片' => 'require', + 'works_guid|作品guid' => 'require', + 'works_intro|作品介绍' => 'require', + 'works_likes_count|作品点赞数' => 'require', + 'works_order|排序' => 'require', + 'works_type_guid|作品类型guid' => 'require', + 'works_name|作品名称' => 'require', + 'works_author|作品作者' => 'require', + 'classes_guid|班型guid' => 'require', + ]); + $model = ModelWorks::where('works_guid', $params['works_guid'])->find(); + if (!$model) throwErrorMsg("该作品不存在", 1); + $model->allowField([ + 'works_update_user_guid', + 'works_img', + 'works_intro', + 'works_likes_count', + 'works_type_guid', + 'works_order', + 'works_name', + 'works_author', + 'classes_guid', + ])->save($params); + Db::commit(); + return msg('编辑成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** @@ -105,31 +112,38 @@ class Works extends BaseController */ public function addWorks(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'works_img|作品图片' => 'require', - 'works_intro|作品介绍' => 'require', - 'works_likes_count|作品点赞数' => 'require', - 'works_order|排序' => 'require', - 'works_type_guid|作品类型guid' => 'require', - 'works_name|作品名称' => 'require', - 'works_author|作品作者' => 'require', - 'classes_guid|班型guid' => 'require', - ]); - ModelWorks::create($params, [ - 'works_guid', - 'works_create_user_guid', - 'works_update_user_guid', - 'works_img', - 'works_intro', - 'works_likes_count', - 'works_type_guid', - 'works_order', - 'classes_guid', - 'works_author', - 'works_name', - ]); - return msg('添加成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'works_img|作品图片' => 'require', + 'works_intro|作品介绍' => 'require', + 'works_likes_count|作品点赞数' => 'require', + 'works_order|排序' => 'require', + 'works_type_guid|作品类型guid' => 'require', + 'works_name|作品名称' => 'require', + 'works_author|作品作者' => 'require', + 'classes_guid|班型guid' => 'require', + ]); + ModelWorks::create($params, [ + 'works_guid', + 'works_create_user_guid', + 'works_update_user_guid', + 'works_img', + 'works_intro', + 'works_likes_count', + 'works_type_guid', + 'works_order', + 'classes_guid', + 'works_author', + 'works_name', + ]); + Db::commit(); + return msg('添加成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** @@ -143,15 +157,22 @@ class Works extends BaseController */ public function deleteWorks(Request $request): array { - $params = $request->param(); - $this->validate($params, [ - 'works_guid' => 'require', - ]); - $works = ModelWorks::where([ - 'works_guid' => explode(',', $params['works_guid']) - ])->select(); - $works->delete(); - return msg('删除成功!'); + Db::startTrans(); + try { + $params = $request->param(); + $this->validate($params, [ + 'works_guid' => 'require', + ]); + $works = ModelWorks::where([ + 'works_guid' => explode(',', $params['works_guid']) + ])->select(); + $works->delete(); + Db::commit(); + return msg('删除成功!'); + } catch (\Throwable $th) { + Db::rollback(); + throw $th; + } } /** diff --git a/app/common/model/ContactUs/Signup.php b/app/common/model/ContactUs/Signup.php index 511a805..85ab8ef 100644 --- a/app/common/model/ContactUs/Signup.php +++ b/app/common/model/ContactUs/Signup.php @@ -87,6 +87,35 @@ class Signup extends BaseModel $model->completeDeleteField(); } + /** + * 状态受理 + * + */ + public static function handleStatus(\app\Request $request): string + { + $params = $request->param(); + self::dataValidate($params, ['signup_guid|在线报名guid' => 'require',]); + + $msg_data = []; + $signup_guids = explode(',', $params['signup_guid']); + $signup_guids_count = count($signup_guids); + foreach ($signup_guids as $line => $signup_guid) { + $prefix_text = ($signup_guids_count != 1) ? "第" . ($line + 1) . "行-> " : null; + try { + $signup = self::where('signup_guid', $signup_guid)->find(); + if (!$signup) throwErrorMsg('该在线报名数据不存在!'); + if ($signup->signup_status == 1) throwErrorMsg('该在线报名数据已处理!'); + $signup->signup_status = 1; + $signup->save(); + $msg_data[] = $prefix_text . "用户名称【{$signup->signup_user_name}】: 受理成功!"; + } catch (\Throwable $th) { + $msg_data[] = $prefix_text . "用户名称:【{$signup->signup_user_name}】: {$th->getMessage()}"; + } + }; + + return implode('
', $msg_data); + } + /** * 导出Excel *