diff --git a/app/Controller/Admin/CateringController.php b/app/Controller/Admin/CateringController.php index 5c1be4e..c0c135a 100644 --- a/app/Controller/Admin/CateringController.php +++ b/app/Controller/Admin/CateringController.php @@ -12,6 +12,8 @@ use Hyperf\HttpServer\Annotation\Controller; use Hyperf\HttpServer\Annotation\Middlewares; use Hyperf\HttpServer\Annotation\RequestMapping; use Hyperf\Validation\Annotation\Scene; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; #[Controller(prefix: "admin/catering")] #[Middlewares([ @@ -57,8 +59,20 @@ class CateringController } + /** + * @return array + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ + #[RequestMapping(path: "option/catering", methods: "POST")] + #[Scene(scene: "option_catering")] public function optionCatering() { return (new OptionCateringService)->handle(); } + + public function checkPrint() + { + + } } diff --git a/app/Service/Admin/Catering/Option/CateringService.php b/app/Service/Admin/Catering/Option/CateringService.php index 0b17415..c00ec31 100644 --- a/app/Service/Admin/Catering/Option/CateringService.php +++ b/app/Service/Admin/Catering/Option/CateringService.php @@ -22,7 +22,7 @@ use App\Model\PickupCode; use App\Model\Site; use App\Model\User; use App\Service\Admin\Catering\CateringBaseService; -use App\Service\Admin\Print\PrintOrderFactory; +use App\Service\Admin\Catering\Print\PrintOrderFactory; use App\Service\ServiceTrait\Admin\Catering\PrintTrait; use Exception; use Hyperf\DbConnection\Db; diff --git a/app/Service/Admin/Print/JdPrintService.php b/app/Service/Admin/Catering/Print/JdPrintService.php similarity index 98% rename from app/Service/Admin/Print/JdPrintService.php rename to app/Service/Admin/Catering/Print/JdPrintService.php index 1a8805c..35d8323 100644 --- a/app/Service/Admin/Print/JdPrintService.php +++ b/app/Service/Admin/Catering/Print/JdPrintService.php @@ -8,7 +8,7 @@ declare(strict_types=1); -namespace App\Service\Admin\Print; +namespace App\Service\Admin\Catering\Print; use App\Exception\ErrException; use function Hyperf\Config\config; diff --git a/app/Service/Admin/Print/PrintOrderFactory.php b/app/Service/Admin/Catering/Print/PrintOrderFactory.php similarity index 93% rename from app/Service/Admin/Print/PrintOrderFactory.php rename to app/Service/Admin/Catering/Print/PrintOrderFactory.php index 8c0b477..0cc094a 100644 --- a/app/Service/Admin/Print/PrintOrderFactory.php +++ b/app/Service/Admin/Catering/Print/PrintOrderFactory.php @@ -8,7 +8,7 @@ declare(strict_types=1); -namespace App\Service\Admin\Print; +namespace App\Service\Admin\Catering\Print; use App\Constants\Admin\CateringCode; use App\Exception\ErrException; diff --git a/app/Service/Admin/Print/PrintOrderInterface.php b/app/Service/Admin/Catering/Print/PrintOrderInterface.php similarity index 86% rename from app/Service/Admin/Print/PrintOrderInterface.php rename to app/Service/Admin/Catering/Print/PrintOrderInterface.php index 17c6de0..8e6e27e 100644 --- a/app/Service/Admin/Print/PrintOrderInterface.php +++ b/app/Service/Admin/Catering/Print/PrintOrderInterface.php @@ -8,7 +8,7 @@ declare(strict_types=1); -namespace App\Service\Admin\Print; +namespace App\Service\Admin\Catering\Print; interface PrintOrderInterface { diff --git a/app/Service/Admin/Print/YlyPrintService.php b/app/Service/Admin/Catering/Print/YlyPrintService.php similarity index 99% rename from app/Service/Admin/Print/YlyPrintService.php rename to app/Service/Admin/Catering/Print/YlyPrintService.php index e204e84..f226553 100644 --- a/app/Service/Admin/Print/YlyPrintService.php +++ b/app/Service/Admin/Catering/Print/YlyPrintService.php @@ -8,10 +8,9 @@ declare(strict_types=1); -namespace App\Service\Admin\Print; +namespace App\Service\Admin\Catering\Print; use App\Exception\ErrException; -use App\Extend\StringUtil; use App\Lib\Print\YlyBasicsLib; use Hyperf\Di\Annotation\Inject; use Psr\Container\ContainerExceptionInterface;