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

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -8,6 +8,7 @@ use Modules\Manage\Enmus\MiniprogramType;
 use Modules\Manage\Http\Requests\MiniprogramRequest;
 use Modules\Manage\Http\Requests\MiniprogramUpdateRequest;
 use Modules\Manage\Models\Miniprogram;
+use Illuminate\Support\Facades\DB;
 use Log;
 
 class MiniprogramController extends Controller
@@ -28,6 +29,7 @@ class MiniprogramController extends Controller
         $name = $request->get('name');
         $play_name = $request->get('play_name');
         $company = $request->get('company');
+        $page_size = $request->input('limit', 15);
         $where = [];
         if($name){
             $where[] = ['name','like','%'.$name.'%']; 
@@ -38,7 +40,7 @@ class MiniprogramController extends Controller
         if($company){
             $where[] = ['company','like','%'.$company.'%']; 
         }
-        $result = $this->miniprogram->where($where)->paginate(20);
+        $result = $this->miniprogram->where($where)->paginate($page_size);
         foreach($result as $item){
             $item->type_name = MiniprogramType::from($item->type)->name();
             $item->status_name = $item->status == 1 ?'启用':'禁用';
@@ -99,4 +101,14 @@ class MiniprogramController extends Controller
         $data = array_map( fn($item)=>['name'=>$item->name(),'value'=>$item->value()],$type_list );
         return $data;
     }
+
+
+    /**
+     * 获取所有公司
+     *
+     * @return void
+     */
+    public function companyList(){
+        return $this->miniprogram->select(DB::raw('distinct company'))->get()->pluck('company');
+    }
 }

modules/Manage/routes/route.php

@@ -34,5 +34,10 @@ Route::prefix('manage')->group(function(){
          Route::post('allocation/{miniprogram_id}',[UserMiniprogramController::class,'allocationStore'])
          ->withoutMiddleware(config('catch.route.middlewares'));
 
+
+        //分配小程序
+        Route::get('companylist',[MiniprogramController::class,'companyList'])
+        ->withoutMiddleware(config('catch.route.middlewares'));
+
     });
 });

tests/Feature/MiniprogramTest.php

@@ -57,8 +57,9 @@ class MiniprogramTest extends TestCase
     public function test_index(): void
     {
         $name = '亿';
-        $response = $this->getJson('/api/channel/paytemplate/optionSequence');
         //$response = $this->getJson('/api/channel/paytemplate/optionSequence');
+        //$response = $this->getJson('/api/channel/paytemplate/optionSequence');
+        $response = $this->getJson('/api/manage/miniprogram/companylist');
         echo $response->getContent();
         $response->dd();
     }