Merge branch 'liuzj-permission-dev' into test

modules/ContentManage/Http/Controllers/CpSubscribeStatisticDataController.php

@@ -124,14 +124,16 @@ class CpSubscribeStatisticDataController extends CatchController
         $endDate = $request->input('end_date');
         $bookSettlementType = $request->input('book_settlement_type');
 
-        $cpName = $this->getUserCpName() ?? $cpName;
-
         return [
             'yesterday_total_coins' => 0,
             'yesterday_available_amount' => 0,
             'yesterday_final_amount' => 0,
         ];
 
+        $cpName = $this->getUserCpName() ?? $cpName;
+
+
+
         $res = DB::table('cp_subscribe_statistic_data as statistic')
             ->leftJoin('books as book', 'statistic.bid' , 'book.id')
             ->when($bookName, function ($query, $bookName) {

modules/ContentManage/routes/route.php

@@ -1,3 +1,142 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+use Modules\ContentManage\Http\Controllers\BookController;
+use Modules\ContentManage\Http\Controllers\CpListController;
+use Modules\ContentManage\Http\Controllers\OutputController;
+use Modules\ContentManage\Http\Controllers\CpSubscribeStatisticDataController;
+use Modules\ContentManage\Http\Controllers\System\NoticesController;
+use Modules\ContentManage\Http\Controllers\System\NoticeTypesController;
+use Modules\ContentManage\Http\Controllers\TestController;
+
+Route::prefix('contentManage')->group(function () {
+    Route::prefix('cp')->group(function () {
+        Route::apiResource('manage/cp_list', CpListController::class);
+        // cp选择项
+        Route::any('options',[CpListController::class,"selectOptions"]);
+        /**
+         * cp结算数据中心
+         */
+        Route::get('subscribeStatisticData/list', [CpSubscribeStatisticDataController::class, 'list']);
+        /**
+         * cp结算数据中心统计数据
+         */
+        Route::get('subscribeStatisticData/listStatistic', [CpSubscribeStatisticDataController::class, 'listStatistic']);
+        /**
+         * cp结算
+         */
+        Route::get('subscribeStatisticData/monthList', [CpSubscribeStatisticDataController::class, 'monthList']);
+        /**
+         * 导出某个cp某个月的各个书籍的应结算金额
+         */
+        Route::get('subscribeStatisticData/listCpMonthFinalAmount', [CpSubscribeStatisticDataController::class, 'listCpMonthFinalAmount']);
+        /**
+         * 修改cp结算状态
+         */
+        Route::post('subscribeStatisticData/saveFinalState',
+            [CpSubscribeStatisticDataController::class, 'saveFinalState']);
+
+        Route::post('test/test1', [TestController::class, 'test1'])->withoutMiddleware(config('catch.route.middlewares'));
+
+        Route::get('cpCollection',[CpListController::class,"cpCollection"])->withoutMiddleware(config('catch.route.middlewares'));
+	});
+
+    // 书籍管理
+    Route::prefix('book')->group(function (){
+        // 书籍列表
+        Route::any('list',[BookController::class, 'list']);
+        // 结算方式选项
+        Route::any('settlementypes',[BookController::class, 'settlementTypes']);
+        // 保存书籍版权时间,结算方式，单本和批量
+        Route::post('edit_author',[BookController::class, 'editAuthorByBid']);
+        // 书籍编辑时获取书籍信息
+        Route::get('edit_author/{bid}',[BookController::class, 'bookInfo']);
+         // 获取书籍分库权限信息
+        Route::get('distribute/{bid}',[BookController::class, 'distributeInfo']);
+         // 获取书籍分库权限信息提交
+        Route::post('distribute/{bid}',[BookController::class, 'distributeSubmit']);
+         // 导出书籍
+        Route::get('export/{bid}',[BookController::class, 'export'])->withoutMiddleware(config('catch.route.middlewares'));
+        //导入书籍
+        Route::post('import',[BookController::class, 'import'])->withoutMiddleware(config('catch.route.middlewares'));;
+        Route::post('createBook',[BookController::class, 'createBook']);
+        //分类列表
+        Route::get('categorylist',[BookController::class, 'categoryList'])->withoutMiddleware(config('catch.route.middlewares'));
+
+    });
+    // 通知管理
+    Route::prefix('notices')->group(function(){
+        // 通知分类
+        Route::prefix('types')->group(function (){
+            // 添加通知分类
+            Route::post('add',[NoticeTypesController::class, 'add']);
+            // 通知分类列表
+            Route::any('list',[NoticeTypesController::class, 'list']);
+            //  删除通知分类
+            Route::post('del/{id}',[NoticeTypesController::class, 'delete']);
+        });
+        // 通知管理
+        Route::prefix('notice')->group(function(){
+            // 添加通知
+            Route::post('add',[NoticesController::class, 'addNotice']);
+            // 通知列表
+            Route::any('list',[NoticesController::class, 'list']);
+            //  删除通知
+            Route::post('del/{id}',[NoticesController::class, 'delete']);
+            //   修改通知状态
+            Route::post('enable/{id}',[NoticesController::class, 'enable']);
+            // 获取编辑信息
+            Route::get('edit/{id}',[NoticesController::class, 'info']);
+            // 保存编辑
+            Route::post('edit/{id}',[NoticesController::class, 'edit']);
+
+            // 不判断权限
+            Route::prefix("")->group(function (){
+                // 通知对象接口
+                Route::any('obj_option',[NoticesController::class, 'objOption'])->withoutMiddleware(config('catch.route.middlewares'));
+                // 我的通知
+                Route::any('mine',[NoticesController::class, 'myNotices'])->withoutMiddleware(config('catch.route.middlewares'));
+                //  已读
+                Route::get('read/{id}',[NoticesController::class, 'setRead'])->withoutMiddleware(config('catch.route.middlewares'));
+                // 用户删除
+                Route::get('user_del/{id}',[NoticesController::class, 'userDel'])->withoutMiddleware(config('catch.route.middlewares'));
+                // 查看通知信息
+                Route::any('detail/{id}',[NoticesController::class, 'detail'])->withoutMiddleware(config('catch.route.middlewares'));
+                // 获取首页弹窗消息
+                Route::any('popup',[NoticesController::class, 'getPopup'])->withoutMiddleware(config('catch.route.middlewares'));
+
+            });
+
+        });
+
+    });
+
+});
+
+
+/**
+ * 书籍输出
+ */
+Route::prefix('output')->group(function () {
+
+    //书籍列表
+    Route::get('booklist',[OutputController::class,'bookList'])
+    ->withoutMiddleware(config('catch.route.middlewares'));
+
+    //书籍详情
+    Route::get('bookdetail/{bid}',[OutputController::class,'bookDetail'])
+    ->withoutMiddleware(config('catch.route.middlewares'));
+
+    //章节列表
+    Route::get('chapterlist/{bid}',[OutputController::class,'chapterList'])
+    ->withoutMiddleware(config('catch.route.middlewares'));
+    //章节内容
+    Route::get('chaptercontent/{bid}/chapterid/{chapter_id}',[OutputController::class,'chapterContent'])
+    ->withoutMiddleware(config('catch.route.middlewares'));
+
+    //分类
+    Route::get('listCategories',[OutputController::class,'listCategories'])
+    ->withoutMiddleware(config('catch.route.middlewares'));
+
+});
 

modules/ContentManage/routes/route.php.1

@@ -1,142 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-use Modules\ContentManage\Http\Controllers\BookController;
-use Modules\ContentManage\Http\Controllers\CpListController;
-use Modules\ContentManage\Http\Controllers\OutputController;
-use Modules\ContentManage\Http\Controllers\CpSubscribeStatisticDataController;
-use Modules\ContentManage\Http\Controllers\System\NoticesController;
-use Modules\ContentManage\Http\Controllers\System\NoticeTypesController;
-use Modules\ContentManage\Http\Controllers\TestController;
-
-Route::prefix('contentManage')->group(function () {
-    Route::prefix('cp')->group(function () {
-        Route::apiResource('manage/cp_list', CpListController::class);
-        // cp选择项
-        Route::any('options',[CpListController::class,"selectOptions"]);
-        /**
-         * cp结算数据中心
-         */
-        Route::get('subscribeStatisticData/list', [CpSubscribeStatisticDataController::class, 'list']);
-        /**
-         * cp结算数据中心统计数据
-         */
-        Route::get('subscribeStatisticData/listStatistic', [CpSubscribeStatisticDataController::class, 'listStatistic']);
-        /**
-         * cp结算
-         */
-        Route::get('subscribeStatisticData/monthList', [CpSubscribeStatisticDataController::class, 'monthList']);
-        /**
-         * 导出某个cp某个月的各个书籍的应结算金额
-         */
-        Route::get('subscribeStatisticData/listCpMonthFinalAmount', [CpSubscribeStatisticDataController::class, 'listCpMonthFinalAmount']);
-        /**
-         * 修改cp结算状态
-         */
-        Route::post('subscribeStatisticData/saveFinalState',
-            [CpSubscribeStatisticDataController::class, 'saveFinalState']);
-
-        Route::post('test/test1', [TestController::class, 'test1'])->withoutMiddleware(config('catch.route.middlewares'));
-
-        Route::get('cpCollection',[CpListController::class,"cpCollection"])->withoutMiddleware(config('catch.route.middlewares'));
-	});
-
-    // 书籍管理
-    Route::prefix('book')->group(function (){
-        // 书籍列表
-        Route::any('list',[BookController::class, 'list']);
-        // 结算方式选项
-        Route::any('settlementypes',[BookController::class, 'settlementTypes']);
-        // 保存书籍版权时间,结算方式，单本和批量
-        Route::post('edit_author',[BookController::class, 'editAuthorByBid']);
-        // 书籍编辑时获取书籍信息
-        Route::get('edit_author/{bid}',[BookController::class, 'bookInfo']);
-         // 获取书籍分库权限信息
-        Route::get('distribute/{bid}',[BookController::class, 'distributeInfo']);
-         // 获取书籍分库权限信息提交
-        Route::post('distribute/{bid}',[BookController::class, 'distributeSubmit']);
-         // 导出书籍
-        Route::get('export/{bid}',[BookController::class, 'export'])->withoutMiddleware(config('catch.route.middlewares'));
-        //导入书籍
-        Route::post('import',[BookController::class, 'import'])->withoutMiddleware(config('catch.route.middlewares'));;
-        Route::post('createBook',[BookController::class, 'createBook']);
-        //分类列表
-        Route::get('categorylist',[BookController::class, 'categoryList'])->withoutMiddleware(config('catch.route.middlewares'));
-
-    });
-    // 通知管理
-    Route::prefix('notices')->group(function(){
-        // 通知分类
-        Route::prefix('types')->group(function (){
-            // 添加通知分类
-            Route::post('add',[NoticeTypesController::class, 'add']);
-            // 通知分类列表
-            Route::any('list',[NoticeTypesController::class, 'list']);
-            //  删除通知分类
-            Route::post('del/{id}',[NoticeTypesController::class, 'delete']);
-        });
-        // 通知管理
-        Route::prefix('notice')->group(function(){
-            // 添加通知
-            Route::post('add',[NoticesController::class, 'addNotice']);
-            // 通知列表
-            Route::any('list',[NoticesController::class, 'list']);
-            //  删除通知
-            Route::post('del/{id}',[NoticesController::class, 'delete']);
-            //   修改通知状态
-            Route::post('enable/{id}',[NoticesController::class, 'enable']);
-            // 获取编辑信息
-            Route::get('edit/{id}',[NoticesController::class, 'info']);
-            // 保存编辑
-            Route::post('edit/{id}',[NoticesController::class, 'edit']);
-
-            // 不判断权限
-            Route::prefix("")->group(function (){
-                // 通知对象接口
-                Route::any('obj_option',[NoticesController::class, 'objOption'])->withoutMiddleware(config('catch.route.middlewares'));
-                // 我的通知
-                Route::any('mine',[NoticesController::class, 'myNotices'])->withoutMiddleware(config('catch.route.middlewares'));
-                //  已读
-                Route::get('read/{id}',[NoticesController::class, 'setRead'])->withoutMiddleware(config('catch.route.middlewares'));
-                // 用户删除
-                Route::get('user_del/{id}',[NoticesController::class, 'userDel'])->withoutMiddleware(config('catch.route.middlewares'));
-                // 查看通知信息
-                Route::any('detail/{id}',[NoticesController::class, 'detail'])->withoutMiddleware(config('catch.route.middlewares'));
-                // 获取首页弹窗消息
-                Route::any('popup',[NoticesController::class, 'getPopup'])->withoutMiddleware(config('catch.route.middlewares'));
-
-            });
-
-        });
-
-    });
-
-});
-
-
-/**
- * 书籍输出
- */
-Route::prefix('output')->group(function () {
-
-    //书籍列表
-    Route::get('booklist',[OutputController::class,'bookList'])
-    ->withoutMiddleware(config('catch.route.middlewares'));
-
-    //书籍详情
-    Route::get('bookdetail/{bid}',[OutputController::class,'bookDetail'])
-    ->withoutMiddleware(config('catch.route.middlewares'));
-
-    //章节列表
-    Route::get('chapterlist/{bid}',[OutputController::class,'chapterList'])
-    ->withoutMiddleware(config('catch.route.middlewares'));
-    //章节内容
-    Route::get('chaptercontent/{bid}/chapterid/{chapter_id}',[OutputController::class,'chapterContent'])
-    ->withoutMiddleware(config('catch.route.middlewares'));
-
-    //分类
-    Route::get('listCategories',[OutputController::class,'listCategories'])
-    ->withoutMiddleware(config('catch.route.middlewares'));
-
-});
-