充值模板的改版

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -53,6 +53,7 @@ class PayTemplateController extends CatchController
         $result = $this->payTemplate->orderBy('id','desc')->where($where)->paginate($request->input('limit', 20));
         foreach ($result as $item) {
             $item->status_str = $item->status ? '默认模板': '非默认模板';
+            $item->type_str = 1 == $item->type ? '首充模板' : '非首充模板';
         }
 
         return $result;
@@ -65,19 +66,32 @@ class PayTemplateController extends CatchController
     private function initPayTemplate($uid) {
         if(!$this->payTemplate->where('uid', $uid)->count()) {
             $systemPayTemplates = $this->payTemplate->where('uid', 0)->get();
-            $insertData = [];
             $now = date('Y-m-d H:i:s');
             foreach ($systemPayTemplates as $systemPayTemplate) {
-                $insertData[] = [
+                $payTemplate = $this->payTemplate->create([
                     'uid' => $uid,
                     'name' => $systemPayTemplate->name,
                     'status' => $systemPayTemplate->status,
-                    'created_at' => $now,
-                    'updated_at' => $now,
                     'type' => $systemPayTemplate->type,
-                ];
+                ]);
+                $payTemplateItems = $this->payTemplateItem->where([
+                    'pay_template_id' => $systemPayTemplate->id, 'status' => 1,
+                ])->get();
+                $payTemplateItemDatas = [];
+
+                foreach ($payTemplateItems as $item) {
+                    $payTemplateItemDatas[] = [
+                        'pay_template_id' => $payTemplate->id,
+                        'pay_product_id' => $item->pay_product_id,
+                        'is_default' => $item->is_default,
+                        'status' => $item->status,
+                        'sequence' => $item->sequence,
+                        'created_at' => $now,
+                        'updated_at' => $now,
+                    ];
+                }
+                $this->payTemplateItem->insert($payTemplateItemDatas);
             }
-            $this->payTemplate->insert($insertData);
         }
     }
 
@@ -419,7 +433,6 @@ class PayTemplateController extends CatchController
     public function optionTypeList(){
         return [
             ['name'=>'普通充值','value'=>'COIN'],
-            ['name'=>'首充','value'=>'FIRST_COIN'],
             ['name'=>'包月','value'=>'MONTH'],
             ['name'=>'包季','value'=>'QUARTER'],
             ['name'=>'包年','value'=>'YEAR']

modules/Channel/routes/route.php

@@ -19,13 +19,16 @@ Route::prefix('channel')->group(function () {
     Route::prefix('paytemplate')->group(function(){
         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']);
-        Route::post('store',[PayTemplateController::class,'store']);
-        Route::post('update/{id}',[PayTemplateController::class,'update']);
+        Route::get('list',[PayTemplateController::class,'index'])->middleware(['roleCheck:administrator,optimizer']);
+        Route::get('show/{id}',[PayTemplateController::class,'show'])->middleware(['roleCheck:administrator,optimizer']);
+        Route::post('store',[PayTemplateController::class,'store'])->middleware(['roleCheck:administrator,optimizer']);
+        Route::post('update/{id}',[PayTemplateController::class,'update'])->middleware(['roleCheck:administrator,optimizer']);
+        /**
+         * @deprecated
+         */
         Route::post('updateStatus/{id}',[PayTemplateController::class,'updateStatus']);//->withoutMiddleware(config('catch.route.middlewares'));;
-        Route::post('updatePayTemplateItem/{id}',[PayTemplateController::class,'updatePayTemplateItem']);
-        Route::get('deleteOneItem/{id}',[PayTemplateController::class,'deleteOneItem']);
+        Route::post('updatePayTemplateItem/{id}',[PayTemplateController::class,'updatePayTemplateItem'])->middleware(['roleCheck:administrator,optimizer']);
+        Route::get('deleteOneItem/{id}',[PayTemplateController::class,'deleteOneItem'])->middleware(['roleCheck:administrator,optimizer']);
     });
     Route::prefix('wechat_min_user')->group(function (){
         // 微信小程用户信息

tests/Channel/Http/Controllers/PayTemplateControllerTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Tests\Channel\Http\Controllers;
+
+use Modules\Channel\Http\Controllers\PayTemplateController;
+use PHPUnit\Framework\TestCase;
+use Tests\UsedTestCase;
+
+class PayTemplateControllerTest extends UsedTestCase
+{
+
+    public function testIndex()
+    {
+        $res = $this->withHeaders([
+            'Authorization' => 'Bearer '. $this->token,
+        ])->json('get','http://localhost/api/channel/paytemplate/list', [
+
+        ]);
+        $res->dump();
+    }
+}