diff --git a/app/Constants/Common/RoleCode.php b/app/Constants/Common/RoleCode.php index 62d5bca..3cfc391 100644 --- a/app/Constants/Common/RoleCode.php +++ b/app/Constants/Common/RoleCode.php @@ -5,7 +5,7 @@ namespace App\Constants\Common; class RoleCode { /** - * @var int 角色 1=超级管理员 2=管理员 3=财务 5=客服 6=市场部 7=厨师 8=司机 9=仓管 10=套餐餐配员 11=自选餐配员 + * @var int 角色 1=超级管理员 2=管理员 3=财务 5=客服 6=市场部 7=厨师 8=司机 9=仓管 10=套餐餐配员 11=自选餐配员 12=核销员 */ CONST INT SUPER_ADMIN = 1; CONST INT ADMIN = 2; @@ -17,4 +17,5 @@ class RoleCode CONST INT WAREHOUSE = 9; CONST INT MEAL_CATERING = 10; CONST INT OPTION_CATERING = 11; + CONST INT SALESMAN = 12; } \ No newline at end of file diff --git a/app/Controller/Api/SalesmanController.php b/app/Controller/Api/SalesmanController.php new file mode 100644 index 0000000..dc9fd93 --- /dev/null +++ b/app/Controller/Api/SalesmanController.php @@ -0,0 +1,26 @@ +raw('Hello Hyperf!'); + } +} diff --git a/app/Service/Admin/Catering/Meal/CheckService.php b/app/Service/Admin/Catering/Meal/CheckService.php index 882ea3f..96ac366 100644 --- a/app/Service/Admin/Catering/Meal/CheckService.php +++ b/app/Service/Admin/Catering/Meal/CheckService.php @@ -31,9 +31,9 @@ class CheckService extends CateringBaseService protected OrderMealCateringLog $orderMealCateringLog; /** - * @var OrderMealCateringLog + * @var OrderMealCateringLog|null */ - protected OrderMealCateringLog $logInfo; + protected OrderMealCateringLog|null $logInfo; /** * @var Order diff --git a/app/Service/Api/Salesman/BaseSalesmanService.php b/app/Service/Api/Salesman/BaseSalesmanService.php new file mode 100644 index 0000000..f335d10 --- /dev/null +++ b/app/Service/Api/Salesman/BaseSalesmanService.php @@ -0,0 +1,59 @@ +cycleId = $this->initTodayCycleId(); + + $this->adminInfo = $this->adminUserModel->getAdminInfoByBindUserId($this->userId); + if ($this->adminInfo->role_id != RoleCode::SALESMAN) throw new ErrException('暂无权限,请联系客服并提供相关信息绑定账号'); + } + + abstract public function handle(); +} \ No newline at end of file diff --git a/app/Service/Api/Salesman/ForceTakePhotoService.php b/app/Service/Api/Salesman/ForceTakePhotoService.php new file mode 100644 index 0000000..de7750e --- /dev/null +++ b/app/Service/Api/Salesman/ForceTakePhotoService.php @@ -0,0 +1,19 @@ +