diff --git a/app/Classes/Modules/Unity/Services/GetContractObligations.php b/app/Classes/Modules/Unity/Services/GetContractObligations.php index 480fee3f..fed54aa8 100644 --- a/app/Classes/Modules/Unity/Services/GetContractObligations.php +++ b/app/Classes/Modules/Unity/Services/GetContractObligations.php @@ -8,13 +8,14 @@ use App\Classes\Modules\Unity\Services\GetAccessToken; class GetContractObligations { - private $unityConfig; + private $getContractObligationsEndpoint; private $getAccessToken; public function __construct(GetAccessToken $getAccessToken) { - $this->unityConfig = Config::get('unity'); + $this->getContractObligationsEndpoint = Config::get('unity.url').Config::get('unity.get_ob_endpoint'); + $this->getAccessToken = $getAccessToken; } @@ -22,8 +23,7 @@ class GetContractObligations $accesToken=$this->getAccessToken->execute(); - $response = Http::withToken($accesToken)->get($this->unityConfig['url'].$this->unityConfig['steps_endpoint'])->object(); - $orderSteps = []; + $response = Http::withToken($accesToken)->get($this->getContractObligationsEndpoint)->object(); return (isset($response->data)) ? $response->data : []; diff --git a/config/unity.php b/config/unity.php index 7d3ea452..a0c576ce 100644 --- a/config/unity.php +++ b/config/unity.php @@ -1,5 +1,8 @@ env('UNITY_API_URL', 'https://dev.unity.izyim.com/user-backsys/api/'), @@ -18,7 +21,9 @@ return [ ], - 'steps_endpoint' => env('UNITY_LOGIN_ENDPOINT','contract-template-obligation/list'), + 'get_ob_endpoint' => env('UNITY_OB_LIST_ENDPOINT','contract-template-obligation/list'), + + 'create_entity_endpoint' => env('UNITY_CREATE_ENTITY_ENDPOINT','contract-template-obligation/list'), 'default_auth' => env('UNITY_AUTH','login'), @@ -28,15 +33,19 @@ return [ 'contract_template_cache' => env('UNITY_CONTRACT_TEMPLATE_CACHE','60'), - 'entity' => [ - 'xxx' => App\Classes\ValueObjects\Constants\OrderEntity::SUPPLIER, - 'zzz' => App\Classes\ValueObjects\Constants\OrderEntity::WAREHOUSE_YIWU, - 'vvv' => App\Classes\ValueObjects\Constants\OrderEntity::WAREHOUSE_GUANG_ZHOU, - 'wwww' => App\Classes\ValueObjects\Constants\OrderEntity::SUPPLIER, + 'entities' => [ + 'xxx_key' => Constant\OrderEntity::SUPPLIER, + 'zzz_key' => Constant\OrderEntity::WAREHOUSE_YIWU, + 'vvv_key' => Constant\OrderEntity::WAREHOUSE_GUANG_ZHOU, + 'wwww_key' => Constant\OrderEntity::SUPPLIER, ], - 'step_processor' => [ - App\Classes\ValueObjects\Constants\OrderSteps::PACKING => App\Classes\Modules\OrderSteps\Processors\Steps\Packing::class, + 'obligations' => [ + 'PACKING' => Constant\OrderSteps::PACKING, + ], + + 'step_processors' => [ + Constant\OrderSteps::PACKING => Step\Packing::class, ], ]; diff --git a/routes/api.php b/routes/api.php index cf91126b..4b12f682 100644 --- a/routes/api.php +++ b/routes/api.php @@ -38,8 +38,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function // // require __DIR__ . '/segment.php'; // -// require __DIR__ . '/bank.php'; -// + require __DIR__ . '/bank.php'; + require __DIR__ . '/order.php'; require __DIR__ . '/currency.php'; diff --git a/routes/order.php b/routes/order.php index 738d8a21..b2e951a6 100644 --- a/routes/order.php +++ b/routes/order.php @@ -18,4 +18,4 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f }); Route::group(['prefix' => '{id}/role', 'as' => 'role.'], function () {}); -}); \ No newline at end of file +});