Merge branch 'master' into test

modules/Channel/Http/Controllers/OrdersController.php

@@ -51,7 +51,7 @@ class OrdersController extends CatchController
                 if (getProp($param, 'user_id')) {
                     $val->total_count = $val->promotion_count;
                 }
-                unset($val->caompany_count, $val->promotion_count, $val->id, $val->puser_id, $val->pay_product_id, $val->create_ip, $val->transaction_id);
+                unset($val->caompany_count, $val->promotion_count, $val->id, $val->pay_product_id, $val->create_ip, $val->transaction_id);
                 unset($val->third_orderid, $val->pay_merchant_sourcem, $val->video_id, $val->video_series_sequence, $val->updated_at);
             }
         }

modules/Channel/Services/Order/OrderService.php

@@ -31,10 +31,9 @@ class OrderService
         if ($isAll) {
             $list = $sql->get();
         } else {
-            $list = $sql->simplePaginate(getProp($param, 'limit', 15));
+            $list = $sql->paginate(getProp($param, 'limit', 15));
         }
 
-
         if (!$list->isEmpty()) {
             $status = array_column(self::getOrderPayType(),null,'value');
             $types = array_column(self::getOrderType(),null,'value');

modules/Channel/Services/WechatMinprogram/WechatMinprogramUserService.php

@@ -95,7 +95,7 @@ class WechatMinprogramUserService
             ->where('orders.status', 'PAID')
             ->where('orders.uid', $uid)
             ->orderBy('orders.id', 'desc')
-            ->simplePaginate(15);
+            ->paginate(15);
 
         foreach ($list as $item) {
             $item->pay_name = '微信支付';
@@ -110,7 +110,6 @@ class WechatMinprogramUserService
                 $item->rechare_coin = "-";
                 $item->pay_result = '充值';
             }
-
             $item->from_page = $item->video_id > 0 ? "播放页" : "充值页";
         }
         return $list;
@@ -152,7 +151,7 @@ class WechatMinprogramUserService
     public static function getUserConsumeRecord(mixed $uid)
     {
         $tableName = 'coin_cost_record_' . ($uid % 8);
-        $result = DB::table($tableName)->where('uid', $uid)->orderBy('id', 'desc')->simplePaginate();
+        $result = DB::table($tableName)->where('uid', $uid)->orderBy('id', 'desc')->paginate();
         foreach ($result as $item) {
             $item->series_name = VideoSeries::where('video_id', $item->video_id)->where('series_sequence', $item->sequence)->select('series_name')->first()->series_name;
             $item->video_name = Videos::where('id', $item->video_id)->value('name');

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -3,18 +3,21 @@
 namespace Modules\Manage\Http\Controllers;
 
 use Illuminate\Routing\Controller;
+use Catch\Base\CatchController;
 use Illuminate\Http\Request;
 use Modules\Manage\Enmus\MiniprogramType;
 use Modules\Manage\Http\Requests\MiniprogramRequest;
 use Modules\Manage\Http\Requests\MiniprogramUpdateRequest;
 use Modules\Manage\Models\Miniprogram;
+use Modules\Channel\Models\UserHasMiniprograms;
 use Illuminate\Support\Facades\DB;
 use Log;
+use Modules\Channel\Services\User\UserService;
 
-class MiniprogramController extends Controller
+class MiniprogramController extends CatchController
 {
 
-    public function __construct(protected readonly Miniprogram $miniprogram)
+    public function __construct(protected readonly Miniprogram $miniprogram,protected readonly UserHasMiniprograms $userHasMiniprograms)
     {
         
     }
@@ -26,6 +29,7 @@ class MiniprogramController extends Controller
      */
     public function index(Request $request)
     {
+        $uid = $this->getLoginUser()->id;
         $name = $request->get('name');
         $play_name = $request->get('play_name');
         $company = $request->get('company');
@@ -45,8 +49,17 @@ class MiniprogramController extends Controller
         if($type){
             $where[] = ['type','=',$type];
         }
-
-        $result = $this->miniprogram->where($where)->paginate($page_size);
+        if(UserService::userHasRole($uid,'administrator')){
+            $result = $this->miniprogram->where($where)->orderBy('id','desc')->paginate($page_size);
+        }else{
+            $result = $this->userHasMiniprograms->join('miniprogram','miniprogram.id','=','user_has_miniprograms.miniprogram_id')
+            ->where('user_has_miniprograms.is_enabled',1)
+            ->where('uid',$uid)
+            ->where($where)
+            ->select('miniprogram.*')
+            ->paginate($page_size);
+        }
+       
         foreach($result as $item){
             $item->type_name = MiniprogramType::from($item->type)->name();
             $item->status_name = $item->status == 1 ?'启用':'禁用';

modules/Manage/routes/route.php

@@ -12,27 +12,21 @@ Route::prefix('manage')->group(function(){
         ->withoutMiddleware(config('catch.route.middlewares'));
 
         //添加
-        Route::post('store',[MiniprogramController::class,'store'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::post('store',[MiniprogramController::class,'store']);
 
         //小程序列表
-        Route::get('index',[MiniprogramController::class,'index'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::get('index',[MiniprogramController::class,'index']);
 
         //小程序详情
-        Route::get('show/{id}',[MiniprogramController::class,'show'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::get('show/{id}',[MiniprogramController::class,'show']);
 
          //小程序详情
-         Route::post('update/{id}',[MiniprogramController::class,'update'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::post('update/{id}',[MiniprogramController::class,'update']);
 
          //小程序分配列表
-         Route::get('allocation/{miniprogram_id}',[UserMiniprogramController::class,'getAllocationInfo'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::get('allocation/{miniprogram_id}',[UserMiniprogramController::class,'getAllocationInfo']);
         //分配小程序
-         Route::post('allocation/{miniprogram_id}',[UserMiniprogramController::class,'allocationStore'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::post('allocation/{miniprogram_id}',[UserMiniprogramController::class,'allocationStore']);
 
 
         //分配小程序