From 75ee436e0876c5c6fcc1c64cb0c517b5ea6b1043 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Fri, 31 Oct 2025 16:24:20 +0900 Subject: [PATCH] dbmsv3 init...1 --- app/Interfaces/Customer/ServiceInterface.php | 10 ---------- app/Interfaces/Equipment/ServerInterface.php | 13 ------------ .../Equipment/ServerPartInterface.php | 13 ------------ app/Interfaces/Part/IPInterface.php | 20 ------------------- app/Interfaces/Part/PartInterface.php | 11 ---------- app/Interfaces/Part/SWITCHInterface.php | 12 ----------- app/Interfaces/PaymentInterface.php | 20 ------------------- app/Language/en/Customer/Account.php | 1 + app/Services/Customer/AccountService.php | 7 +++---- app/Services/Customer/ServiceService.php | 3 +-- app/Services/Equipment/ServerPartService.php | 3 +-- app/Services/Equipment/ServerService.php | 3 +-- app/Services/Part/IPService.php | 3 +-- app/Services/Part/PartService.php | 3 +-- app/Services/Part/SWITCHService.php | 3 +-- app/Services/PaymentService.php | 3 +-- 16 files changed, 11 insertions(+), 117 deletions(-) delete mode 100644 app/Interfaces/Customer/ServiceInterface.php delete mode 100644 app/Interfaces/Equipment/ServerInterface.php delete mode 100644 app/Interfaces/Equipment/ServerPartInterface.php delete mode 100644 app/Interfaces/Part/IPInterface.php delete mode 100644 app/Interfaces/Part/PartInterface.php delete mode 100644 app/Interfaces/Part/SWITCHInterface.php delete mode 100644 app/Interfaces/PaymentInterface.php diff --git a/app/Interfaces/Customer/ServiceInterface.php b/app/Interfaces/Customer/ServiceInterface.php deleted file mode 100644 index 4ac00a7..0000000 --- a/app/Interfaces/Customer/ServiceInterface.php +++ /dev/null @@ -1,10 +0,0 @@ - [ STATUS['DEPOSIT'] => "입금", STATUS['WITHDRAWAL'] => "출금", + STATUS['PAID'] => "결제", ], ]; diff --git a/app/Services/Customer/AccountService.php b/app/Services/Customer/AccountService.php index f581d12..6855d3f 100644 --- a/app/Services/Customer/AccountService.php +++ b/app/Services/Customer/AccountService.php @@ -61,18 +61,17 @@ class AccountService extends CustomerService 'title' => "[결제차감] {$paymentEntity->getTitle()}", 'issue_at' => date('Y-m-d H:i:s'), 'amount' => $paymentEntity->getAmount(), - 'status' => STATUS['WITHDRAWAL'], + 'status' => STATUS['PAID'], ]; $this->setBalance($formDatas); - return $this->getModel()->create($formDatas)($formDatas); + return $this->getModel()->create($formDatas); } //기본 기능부분 //생성 protected function create_process(array $formDatas): AccountEntity { $this->setBalance($formDatas); - $entity = parent::create_process($formDatas)($formDatas); - return $entity; + return parent::create_process($formDatas); } //수정 public function modify(mixed $entity, array $formDatas): AccountEntity diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index 2b6b916..98626fe 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -4,7 +4,6 @@ namespace App\Services\Customer; use App\Entities\Customer\ServiceEntity; use App\Helpers\Customer\ServiceHelper; -use App\Interfaces\Customer\ServiceInterface; use App\Models\Customer\ServiceModel; use App\Processors\Customer\ServiceV1Processor as Proceessor; use App\Services\Equipment\ServerService; @@ -12,7 +11,7 @@ use App\Services\PaymentService; use DateTimeImmutable; use DateTimeZone; -class ServiceService extends CustomerService implements ServiceInterface +class ServiceService extends CustomerService { private ?ServerService $_serverService = null; private ?PaymentService $_paymentService = null; diff --git a/app/Services/Equipment/ServerPartService.php b/app/Services/Equipment/ServerPartService.php index 417bdf7..4a8ab2f 100644 --- a/app/Services/Equipment/ServerPartService.php +++ b/app/Services/Equipment/ServerPartService.php @@ -6,7 +6,6 @@ use App\Entities\Equipment\ServerEntity; use App\Entities\Equipment\ServerPartEntity; use App\Entities\Part\PartEntity; use App\Helpers\Equipment\ServerPartHelper; -use App\Interfaces\Equipment\ServerPartInterface; use App\Models\Equipment\ServerPartModel; use App\Processors\Equipment\ServerPartV1Processor as Proceessor; use App\Services\Customer\ServiceService; @@ -21,7 +20,7 @@ use App\Services\Part\SOFTWAREService; use App\Services\Part\SWITCHService; use App\Services\PaymentService; -class ServerPartService extends EquipmentService implements ServerPartInterface +class ServerPartService extends EquipmentService { private ?ServiceService $_serviceService = null; private ?ServerService $_serverService = null; diff --git a/app/Services/Equipment/ServerService.php b/app/Services/Equipment/ServerService.php index 4486e9f..e67eec8 100644 --- a/app/Services/Equipment/ServerService.php +++ b/app/Services/Equipment/ServerService.php @@ -5,7 +5,6 @@ namespace App\Services\Equipment; use App\Entities\Customer\ServiceEntity; use App\Entities\Equipment\ServerEntity; use App\Helpers\Equipment\ServerHelper; -use App\Interfaces\Equipment\ServerInterface; use App\Models\Equipment\ServerModel; use App\Services\Customer\ServiceService; use App\Services\Equipment\EquipmentService; @@ -14,7 +13,7 @@ use App\Services\Part\IPService; use App\Services\Part\SWITCHService; use App\Processors\Equipment\ServerV1Processor as Proceessor; -class ServerService extends EquipmentService implements ServerInterface +class ServerService extends EquipmentService { private ?ServiceService $_serviceService = null; private ?ServerPartService $_serverPartService = null; diff --git a/app/Services/Part/IPService.php b/app/Services/Part/IPService.php index 1e6ba8c..69944c0 100644 --- a/app/Services/Part/IPService.php +++ b/app/Services/Part/IPService.php @@ -7,14 +7,13 @@ use App\Entities\Equipment\ServerEntity; use App\Entities\Equipment\ServerPartEntity; use App\Entities\Part\IPEntity; use App\Helpers\Part\IPHelper; -use App\Interfaces\Part\IPInterface; use App\Models\Part\IPModel; use App\Services\Customer\ServiceService; use App\Services\Equipment\LineService; use App\Services\Equipment\ServerService; use App\Services\Part\PartService; -class IPService extends PartService implements IPInterface +class IPService extends PartService { private ?LineService $_lineService = null; private ?ServiceService $_serviceService = null; diff --git a/app/Services/Part/PartService.php b/app/Services/Part/PartService.php index 2b448ea..d62dfd2 100644 --- a/app/Services/Part/PartService.php +++ b/app/Services/Part/PartService.php @@ -4,11 +4,10 @@ namespace App\Services\Part; use App\Entities\Equipment\ServerPartEntity; use App\Helpers\CommonHelper; -use App\Interfaces\Part\PartInterface; use App\Models\CommonModel; use App\Services\CommonService; -abstract class PartService extends CommonService implements PartInterface +abstract class PartService extends CommonService { protected function __construct(CommonModel $model, CommonHelper $helper) { diff --git a/app/Services/Part/SWITCHService.php b/app/Services/Part/SWITCHService.php index 0a974da..6c93e45 100644 --- a/app/Services/Part/SWITCHService.php +++ b/app/Services/Part/SWITCHService.php @@ -6,13 +6,12 @@ use App\Entities\Equipment\ServerEntity; use App\Entities\Equipment\ServerPartEntity; use App\Entities\Part\SWITCHEntity; use App\Helpers\Part\SWITCHHelper; -use App\Interfaces\Part\SWITCHInterface; use App\Models\Part\SWITCHModel; use App\Services\Customer\ServiceService; use App\Services\Equipment\ServerService; use App\Services\Part\PartService; -class SWITCHService extends PartService implements SWITCHInterface +class SWITCHService extends PartService { private ?ServiceService $_serviceService = null; private ?ServerService $_serverService = null; diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index b7b965a..fb2b76b 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -8,7 +8,6 @@ use App\Entities\Equipment\ServerEntity; use App\Entities\Equipment\ServerPartEntity; use App\Entities\PaymentEntity; use App\Helpers\PaymentHelper; -use App\Interfaces\PaymentInterface; use App\Models\PaymentModel; use App\Services\CommonService; use App\Services\Customer\AccountService; @@ -18,7 +17,7 @@ use App\Services\Equipment\ServerService; use DateTimeImmutable; use DateTimeZone; -class PaymentService extends CommonService implements PaymentInterface +class PaymentService extends CommonService { private ?ServiceService $_serviceService = null; private ?ServerService $_serverService = null;