liuzejian 1 år sedan
förälder
incheckning
0778bcab72
1 ändrade filer med 5 tillägg och 3 borttagningar
  1. 5 3
      modules/Jiesuan/Http/Controllers/JiesuanController.php

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

@@ -49,9 +49,9 @@ class JiesuanController extends CatchController
      */
     public function accountInfo(Request $request) {
         $company_uid = $this->getLoginUserId();
-        $moneyInfo = DB::table('users')
-            ->where('id', $company_uid)
-            ->select('remain_money', 'dakuan_money', 'id')
+        $moneyInfo = DB::table('company_user_money')
+            ->where('company_uid', $company_uid)
+            ->select('total_income', 'total_dakuan', 'total_tuikuan', 'id')
             ->first();
 
         $tixian_money = DB::table('tixian_records')
@@ -60,6 +60,7 @@ class JiesuanController extends CatchController
             ->sum('tixian_money');
 
         $moneyInfo->tixian_money = $tixian_money;
+        $moneyInfo->yue_money = $moneyInfo->total_income - $moneyInfo->total_tuikuan - $moneyInfo->total_dakuan - $tixian_money;
         return $moneyInfo;
     }
 
@@ -72,6 +73,7 @@ class JiesuanController extends CatchController
             'bank_card_id' => 'required',
             'tixian_money' => 'required|numeric|min:500'
         ]);
+        $company_uid = $this->getLoginUserId();
 
 //        DB::table('tixian_records')
 //            ->insert()