From 34e463fd7bbf832b1ae1973ad257135bce9d9631 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Thu, 27 Jul 2023 18:16:24 +0900 Subject: [PATCH] =?UTF-8?q?HTAPI=E9=A7=90=E8=BB=8A=E5=A0=B4=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=80=EF=BC=88=E9=80=94=E4=B8=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HT側が対応完了後に再着手予定 --- .../CreateReceiptIssuingOrderController.php | 5 ++++- .../HelloTechno/ParkingByCodeController.php | 4 +++- .../Custom/HelloTechno/ParkingsController.php | 11 +++++++++- .../Web/Custom/HelloTechno/ParkingsParam.php | 9 +++++--- .../Custom/HelloTechno/CacheParkingName.php | 5 ++++- app/Util/Custom/HelloTechno/API.php | 21 +++++++++++-------- 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/CreateReceiptIssuingOrderController.php b/app/Http/Controllers/Web/Custom/HelloTechno/CreateReceiptIssuingOrderController.php index 6706238..8cec438 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/CreateReceiptIssuingOrderController.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/CreateReceiptIssuingOrderController.php @@ -54,7 +54,10 @@ class CreateReceiptIssuingOrderController extends HelloTechnoController ->where('customer_code', $param->customerCode) ->firstOrFail(); // 駐車場情報取得 - $parking = collect(API::getParkings($param->customerCode, $param->parkingManagementCode)) + $parking = collect(API::getParkings([ + API::CONDITION_CUSTOMER_CODDE => $param->customerCode, + API::CONDITION_PARKING_MANAGEMENT_CODDE => $param->parkingManagementCode, + ])) ->where('parking_management_code', $param->parkingManagementCode) ->firstOrFail(); diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingByCodeController.php b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingByCodeController.php index 7d18788..0de4163 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingByCodeController.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingByCodeController.php @@ -38,7 +38,9 @@ class ParkingByCodeController extends HelloTechnoController { $param = $this->param; - $parking = Arr::first(API::getParkings(null, $param->parkingManagementCode)); + $parking = Arr::first(API::getParkings([ + API::CONDITION_PARKING_MANAGEMENT_CODDE => $param->parkingManagementCode + ])); if ($parking === null) { throw new AppCommonException("駐車場情報取得不正"); diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsController.php b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsController.php index 44b52ee..3c4f42e 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsController.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsController.php @@ -36,7 +36,16 @@ class ParkingsController extends HelloTechnoController { $param = $this->param; - $list = API::getParkings($param->customerCode, $param->parkingManagementCode); + $a = $param->toArray(); + $r = $request->all(); + + $condition = [ + API::CONDITION_CUSTOMER_CODDE => $param->customerCode, + API::CONDITION_PARKING_MANAGEMENT_CODDE => $param->parkingManagementCode, + API::CONDITION_PARKING_NAME => $param->parkingName, + ]; + + $list = API::getParkings($condition); return $this->successResponse(['records' => $list]); } diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsParam.php b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsParam.php index 4caf1c8..17136fa 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsParam.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/ParkingsParam.php @@ -3,18 +3,21 @@ namespace App\Http\Controllers\Web\Custom\HelloTechno; use App\Http\Controllers\Web\BaseParam; +use App\Util\Custom\HelloTechno\API; /** - * @property string $customerCode + * @property ?string $customerCode * @property ?string $parkingManagementCode + * @property ?string $parkingName */ class ParkingsParam extends BaseParam { public function rules(): array { return [ - 'customer_code' => $this->str(), - 'parking_management_code' => $this->str(true) + API::CONDITION_CUSTOMER_CODDE => $this->str(true), + API::CONDITION_PARKING_MANAGEMENT_CODDE => $this->str(true), + API::CONDITION_PARKING_NAME => $this->str(true) ]; } } diff --git a/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php b/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php index d3412d0..16bc2f4 100644 --- a/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php +++ b/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php @@ -35,7 +35,10 @@ class CacheParkingName extends BaseJob ->where('customer_code', $this->customerCode) ->firstOrFail(); // 駐車場情報取得 - $parking = collect(API::getParkings($this->customerCode, $this->parkingManagementCode)) + $parking = collect(API::getParkings([ + API::CONDITION_CUSTOMER_CODDE => $this->customerCode, + API::CONDITION_PARKING_MANAGEMENT_CODDE => $this->parkingManagementCode, + ])) ->where('parking_management_code', $this->parkingManagementCode) ->firstOrFail(); diff --git a/app/Util/Custom/HelloTechno/API.php b/app/Util/Custom/HelloTechno/API.php index 92d6f2c..5707d80 100644 --- a/app/Util/Custom/HelloTechno/API.php +++ b/app/Util/Custom/HelloTechno/API.php @@ -6,6 +6,7 @@ use App\Exceptions\AppCommonException; use App\Models\ReceiptIssuingHTParkingCustomOrder; use App\Models\ReceiptIssuingOrder; use Exception; +use Illuminate\Support\Arr; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; @@ -13,6 +14,10 @@ use Illuminate\Support\Facades\Log; class API { + const CONDITION_CUSTOMER_CODDE = 'customer_code'; + const CONDITION_PARKING_MANAGEMENT_CODDE = 'parking_management_code'; + const CONDITION_PARKING_NAME = 'parking_name'; + private const RESULT_CODE = 'result_code'; private const RESULT_CODE_SUCCESS = 'SUCCESS'; private const FIELD_DATA = 'data'; @@ -35,16 +40,14 @@ class API return static::get(static::getCustomersUrl(), $query); } - public static function getParkings(?string $customerCode, ?string $parkingManagementCode = null) + public static function getParkings(array $condition) { - - if ($customerCode) { - $query['customer_code'] = $customerCode; - } - if ($parkingManagementCode) { - $query['parking_management_code'] = $parkingManagementCode; - } - return static::get(static::getParkingsUrl(), $query); + $condition = Arr::only($condition, [ + self::CONDITION_CUSTOMER_CODDE, + self::CONDITION_PARKING_MANAGEMENT_CODDE, + self::CONDITION_PARKING_NAME, + ]); + return static::get(static::getParkingsUrl(), $condition); } public static function getAdjustData(string $customerCode, string $parkingManagementCode, int $adjustSeqNo)