巨量2.0事件-金额项卡比例选项 更改返回的显示样式和路由

modules/Callback/Http/Controllers/JLEvent/JLEventController.php

@@ -116,12 +116,4 @@ class JLEventController extends CatchController
         // todo: 更新对应配置的计算比例信息
         return 'ok';
     }
-
-    /**
-     * 金额项卡比例选项
-     * @param Request $request
-     */
-    public function listCustomRate(Request $request) {
-        return JLEventService::listCustomCallBackRate();
-    }
 }

modules/Callback/routes/route.php

@@ -20,7 +20,6 @@ Route::prefix('callback')->group(function () {
         Route::post('add', [JLEventController::class, 'add']);
         Route::post('update', [JLEventController::class, 'update']);
         Route::get('list', [JLEventController::class, 'list']);
-        Route::get('listCustomRate', [JLEventController::class, 'listCustomRate']);
     });
 });
 

modules/Common/Repository/Options/JLEventCustomRate.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Common\Repository\Options;
+
+use Modules\Callback\Services\JLEventService;
+
+class JLEventCustomRate implements OptionInterface
+{
+    public function get(): array
+    {
+        $list = JLEventService::listCustomCallBackRate();
+        $result = [];
+        foreach ($list as $value=>$label) {
+            $result[] = [
+                'label' => $label,
+                'value' => $value,
+            ];
+        }
+
+        return  $result;
+    }
+}

tests/Common/Http/Controllers/OptionControllerTest.php

@@ -13,8 +13,7 @@ class OptionControllerTest extends UsedTestCase
     {
         $res = $this->withHeaders([
             'Authorization' => 'Bearer '. $this->token,
-        ])->json('get','http://localhost/api/options/CommonParams');
-        $res->dump();
+        ])->json('get','http://localhost/api/options/JLEventCustomRate');
         $this->dumpJson($res);
     }
 }