Merge branch 'master' of qk:zy_duanju/duanju_manage into test

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -76,6 +76,9 @@ class PayTemplateController extends CatchController
         $option_cache = [];
         $type_list = collect($this->optionTypeList())->pluck('value');
         foreach($option_list as $option){
+            if(!is_numeric($option['price']) || !is_numeric($option['given'])){
+                ChannelBusinessException::throwError(Errors::PARAM_ERROR);
+            }
             if($option['type'] == 'COIN' || $option['type'] == 'FIRST_COIN'){
                 if($option['given'] > 3*$option['price']*100){
                     ChannelBusinessException::throwError(Errors::PAY_TEMPLATE_GIVEN_TOO_MUCH);
@@ -381,14 +384,24 @@ class PayTemplateController extends CatchController
     }
 
 
+
+    public function optionTypeListOutPut(){
+        return collect($this->optionTypeList())->map(function($item){
+            return [
+                'type'=>$item['value'],'type_name'=>$item['name']
+            ];
+        })->all();
+    }
+
+
     public function optionSequence(){
         return [
-            ['name'=>'位置一','value'=>1],
-            ['name'=>'位置二','value'=>2],
-            ['name'=>'位置三','value'=>3],
-            ['name'=>'位置四','value'=>4],
-            ['name'=>'位置五','value'=>5],
-            ['name'=>'位置六','value'=>6]
+            ['sequence_text'=>'位置一','sequence'=>1],
+            ['sequence_text'=>'位置二','sequence'=>2],
+            ['sequence_text'=>'位置三','sequence'=>3],
+            ['sequence_text'=>'位置四','sequence'=>4],
+            ['sequence_text'=>'位置五','sequence'=>5],
+            ['sequence_text'=>'位置六','sequence'=>6]
         ];
     }
 }

modules/Channel/routes/route.php

@@ -17,10 +17,10 @@ Route::prefix('channel')->group(function () {
 
     //支付模板
     Route::prefix('paytemplate')->group(function(){
-        Route::get('optionTypeList',[PayTemplateController::class,'optionTypeList'])->withoutMiddleware(config('catch.route.middlewares'));
+        Route::get('optionTypeList',[PayTemplateController::class,'optionTypeListOutPut'])->withoutMiddleware(config('catch.route.middlewares'));
         Route::get('optionSequence',[PayTemplateController::class,'optionSequence'])->withoutMiddleware(config('catch.route.middlewares'));
         Route::get('list',[PayTemplateController::class,'index']);
-        Route::get('show/{id}',[PayTemplateController::class,'show'])->withoutMiddleware(config('catch.route.middlewares'));;
+        Route::get('show/{id}',[PayTemplateController::class,'show']);
         Route::post('store',[PayTemplateController::class,'store']);
         Route::post('update/{id}',[PayTemplateController::class,'update']);
         Route::post('updateStatus/{id}',[PayTemplateController::class,'updateStatus']);//->withoutMiddleware(config('catch.route.middlewares'));;

tests/Feature/MiniprogramTest.php

@@ -21,7 +21,7 @@ class MiniprogramTest extends TestCase
     }
 
 
-    public function  test_store(): void
+    public function  ttest_store(): void
     {
         /*
         $response = $this->postJson('/api/channel/paytemplate/update/5',[
@@ -57,7 +57,7 @@ class MiniprogramTest extends TestCase
     public function test_index(): void
     {
         $name = '亿';
-        $response = $this->getJson('/api/channel/paytemplate/show/5');
+        $response = $this->getJson('/api/channel/paytemplate/optionSequence');
         //$response = $this->getJson('/api/channel/paytemplate/optionSequence');
         echo $response->getContent();
         $response->dd();