wesmiler 3 месяцев назад
Родитель
Сommit
68d7e4fe10
1 измененных файлов с 33 добавлено и 23 удалено
  1. 33 23
      app/Http/Controllers/Api/v1/AccountController.php

+ 33 - 23
app/Http/Controllers/Api/v1/AccountController.php

@@ -20,13 +20,13 @@ class AccountController extends webApp
      */
      */
     public function index()
     public function index()
     {
     {
-        $params =request()->post();
+        $params = request()->post();
         $pageSize = request()->post('pageSize', 15);
         $pageSize = request()->post('pageSize', 15);
-        $params['user_id'] = isset($params['user_id'])? $params['user_id'] : $this->userId;
+        $params['user_id'] = isset($params['user_id']) ? $params['user_id'] : $this->userId;
         $datas = AccountService::make()->getDataList($params, $pageSize);
         $datas = AccountService::make()->getDataList($params, $pageSize);
-        if($datas){
+        if ($datas) {
             return message(1010, true, $datas);
             return message(1010, true, $datas);
-        }else{
+        } else {
             return message(1009, false);
             return message(1009, false);
         }
         }
     }
     }
@@ -37,12 +37,12 @@ class AccountController extends webApp
      */
      */
     public function payMeal()
     public function payMeal()
     {
     {
-        $params =request()->post();
-        $type = isset($params['type'])? $params['type'] : 1;
+        $params = request()->post();
+        $type = isset($params['type']) ? $params['type'] : 1;
         $datas = AccountService::make()->getPayMealList($type);
         $datas = AccountService::make()->getPayMealList($type);
-        if($datas){
+        if ($datas) {
             return message(1010, true, $datas);
             return message(1010, true, $datas);
-        }else{
+        } else {
             return message(1009, false);
             return message(1009, false);
         }
         }
     }
     }
@@ -53,14 +53,14 @@ class AccountController extends webApp
      */
      */
     public function payLog()
     public function payLog()
     {
     {
-        $params =request()->post();
+        $params = request()->post();
         $pageSize = request()->post('pageSize', 15);
         $pageSize = request()->post('pageSize', 15);
         $params['type'] = 2;
         $params['type'] = 2;
-        $params['user_id'] = isset($params['user_id'])? $params['user_id'] : $this->userId;
+        $params['user_id'] = isset($params['user_id']) ? $params['user_id'] : $this->userId;
         $datas = AccountService::make()->getDataList($params, $pageSize);
         $datas = AccountService::make()->getDataList($params, $pageSize);
-        if($datas){
+        if ($datas) {
             return message(1010, true, $datas);
             return message(1010, true, $datas);
-        }else{
+        } else {
             return message(1009, false);
             return message(1009, false);
         }
         }
     }
     }
@@ -71,9 +71,9 @@ class AccountController extends webApp
      */
      */
     public function balance()
     public function balance()
     {
     {
-        $params =request()->post();
+        $params = request()->post();
         $pageSize = request()->post('pageSize', 15);
         $pageSize = request()->post('pageSize', 15);
-        $params['user_id'] = isset($params['user_id'])? $params['user_id'] : $this->userId;
+        $params['user_id'] = isset($params['user_id']) ? $params['user_id'] : $this->userId;
         $datas = BalanceLogService::make()->getDataList($params, $pageSize);
         $datas = BalanceLogService::make()->getDataList($params, $pageSize);
         return message(1010, true, $datas);
         return message(1010, true, $datas);
     }
     }
@@ -85,10 +85,15 @@ class AccountController extends webApp
     public function pay()
     public function pay()
     {
     {
         $params = request()->all();
         $params = request()->all();
-        if (!$result = AccountService::make()->recharge($this->userId, $params)) {
-            return showJson(AccountService::make()->getError(), false);
-        } else {
-            return showJson(AccountService::make()->getError(), true, $result);
+        try {
+            if (!$result = AccountService::make()->recharge($this->userId, $params)) {
+                return showJson(AccountService::make()->getError(), false);
+            } else {
+                return showJson(AccountService::make()->getError(), true, $result);
+            }
+        } catch (\Exception $exception) {
+            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
+            return showJson(1046, false, $error);
         }
         }
     }
     }
 
 
@@ -98,11 +103,16 @@ class AccountController extends webApp
      */
      */
     public function withdraw()
     public function withdraw()
     {
     {
-        $params = request()->all();
-        if (!$result = BalanceLogService::make()->withdraw($this->userId, $params)) {
-            return showJson(BalanceLogService::make()->getError(), false);
-        } else {
-            return showJson(BalanceLogService::make()->getError(), true, $result);
+        try {
+            $params = request()->all();
+            if (!$result = BalanceLogService::make()->withdraw($this->userId, $params)) {
+                return showJson(BalanceLogService::make()->getError(), false);
+            } else {
+                return showJson(BalanceLogService::make()->getError(), true, $result);
+            }
+        } catch (\Exception $exception) {
+            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
+            return showJson(1046, false, $error);
         }
         }
     }
     }
 }
 }