liuzejian пре 1 година
родитељ
комит
bc029933a0
2 измењених фајлова са 17 додато и 7 уклоњено
  1. 13 3
      modules/Jiesuan/Http/Controllers/JiesuanController.php
  2. 4 4
      modules/Video/routes/route.php

+ 13 - 3
modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -54,9 +54,13 @@ class JiesuanController extends CatchController
             ->select('remain_money', 'dakuan_money', 'id')
             ->select('remain_money', 'dakuan_money', 'id')
             ->first();
             ->first();
 
 
-//        DB::table('tixian_records')
-//            ->where('company_uid', $company_uid)
-//            ->whereIn('status', [1,3])
+        $tixian_money = DB::table('tixian_records')
+            ->where('company_uid', $company_uid)
+            ->whereIn('status', [1,3])
+            ->sum('tixian_money');
+
+        $moneyInfo->tixian_money = $tixian_money;
+        return $moneyInfo;
     }
     }
 
 
     /**
     /**
@@ -64,7 +68,13 @@ class JiesuanController extends CatchController
      * @param Request $request
      * @param Request $request
      */
      */
     public function tixian(Request $request) {
     public function tixian(Request $request) {
+        $this->validate($request, [
+            'bank_card_id' => 'required',
+            'tixian_money' => 'required|numeric|min:500'
+        ]);
 
 
+//        DB::table('tixian_records')
+//            ->insert()
     }
     }
 
 
     /**
     /**

+ 4 - 4
modules/Video/routes/route.php

@@ -3,20 +3,20 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Route;
 use Modules\System\Http\Controllers\NoticesController;
 use Modules\System\Http\Controllers\NoticesController;
 use Modules\System\Http\Controllers\NoticeTypesController;
 use Modules\System\Http\Controllers\NoticeTypesController;
-use Modules\Video\Http\Controllers\BankAccountController;
+use Modules\Video\Http\Controllers\EpisodeController;
 use Modules\Video\Http\Controllers\VideoCategoryController;
 use Modules\Video\Http\Controllers\VideoCategoryController;
 use Modules\Video\Http\Controllers\VideoController;
 use Modules\Video\Http\Controllers\VideoController;
 
 
 Route::prefix('videoStock')->group(function () {
 Route::prefix('videoStock')->group(function () {
     Route::get('video/list', [VideoController::class, 'list']);
     Route::get('video/list', [VideoController::class, 'list']);
-    Route::get('episode/list', [BankAccountController::class, 'list']);
-    Route::get('episode/downloadList', [BankAccountController::class, 'downloadList']);
+    Route::get('episode/list', [EpisodeController::class, 'list']);
+    Route::get('episode/downloadList', [EpisodeController::class, 'downloadList']);
     Route::get('videoCategory/list', [VideoCategoryController::class, 'list']);
     Route::get('videoCategory/list', [VideoCategoryController::class, 'list']);
 
 
 
 
     Route::post('video/update', [VideoController::class, 'update']);
     Route::post('video/update', [VideoController::class, 'update']);
     Route::post('video/add', [VideoController::class, 'add']);
     Route::post('video/add', [VideoController::class, 'add']);
     Route::post('video/setChargeConfig', [VideoController::class, 'setChargeConfig']);
     Route::post('video/setChargeConfig', [VideoController::class, 'setChargeConfig']);
-    Route::post('episode/add', [BankAccountController::class, 'add']);
+    Route::post('episode/add', [EpisodeController::class, 'add']);
 });
 });