From 63b1c8b567814812bbc154cf61a3375f252ecfdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Wed, 10 Feb 2021 01:34:19 -0500
Subject: [PATCH] =?UTF-8?q?Fix=20#156=20&=20PayBeaver=E5=BB=BA=E7=AB=8B?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8A=A5=E9=94=99=E6=97=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Gateway/PayBeaver.php |  4 ++-
 app/Http/Controllers/PaymentController.php | 30 +++++++++++-----------
 resources/views/admin/user/info.blade.php  |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Gateway/PayBeaver.php b/app/Http/Controllers/Gateway/PayBeaver.php
index e1384729..97b9de8b 100644
--- a/app/Http/Controllers/Gateway/PayBeaver.php
+++ b/app/Http/Controllers/Gateway/PayBeaver.php
@@ -64,7 +64,9 @@ class PayBeaver extends AbstractPayment
             return $response->json();
         }
 
-        return Response::json(['status' => 'fail', 'message' => '获取失败！请检查配置信息']);
+        Log::error(var_export($response->json(), true));
+
+        return ['status' => 'fail', 'message' => '获取失败！请检查配置信息'];
     }
 
     private function sign($params)
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index e13d93b0..92df212b 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -115,21 +115,6 @@ class PaymentController extends Controller
                 return Response::json(['status' => 'fail', 'message' => '购买加油包前，请先购买套餐']);
             }
 
-            //非余额付款下，检查在线支付是否开启
-            if (self::$method !== 'credit') {
-                // 判断是否开启在线支付
-                if (! sysConfig('is_onlinePay')) {
-                    return Response::json(['status' => 'fail', 'message' => '订单创建失败：系统并未开启在线支付功能']);
-                }
-
-                // 判断是否存在同个商品的未支付订单
-                if (Order::uid()->whereStatus(0)->exists()) {
-                    return Response::json(['status' => 'fail', 'message' => '订单创建失败：尚有未支付的订单，请先去支付']);
-                }
-            } elseif (Auth::getUser()->credit < $amount) { // 验证账号余额是否充足
-                return Response::json(['status' => 'fail', 'message' => '您的余额不足，请先充值']);
-            }
-
             // 单个商品限购
             if ($goods->limit_num) {
                 $count = Order::uid()->where('status', '>=', 0)->whereGoodsId($goods_id)->count();
@@ -150,6 +135,21 @@ class PaymentController extends Controller
                 $amount = $amount > 0 ? round($amount, 2) : 0; // 四舍五入保留2位小数，避免无法正常创建订单
             }
 
+            //非余额付款下，检查在线支付是否开启
+            if (self::$method !== 'credit') {
+                // 判断是否开启在线支付
+                if (! sysConfig('is_onlinePay')) {
+                    return Response::json(['status' => 'fail', 'message' => '订单创建失败：系统并未开启在线支付功能']);
+                }
+
+                // 判断是否存在同个商品的未支付订单
+                if (Order::uid()->whereStatus(0)->exists()) {
+                    return Response::json(['status' => 'fail', 'message' => '订单创建失败：尚有未支付的订单，请先去支付']);
+                }
+            } elseif (Auth::getUser()->credit < $amount) { // 验证账号余额是否充足
+                return Response::json(['status' => 'fail', 'message' => '您的余额不足，请先充值']);
+            }
+
             // 价格异常判断
             if ($amount < 0) {
                 return Response::json(['status' => 'fail', 'message' => '订单创建失败：订单总价异常']);
diff --git a/resources/views/admin/user/info.blade.php b/resources/views/admin/user/info.blade.php
index 12993e4b..814bc0ba 100644
--- a/resources/views/admin/user/info.blade.php
+++ b/resources/views/admin/user/info.blade.php
@@ -283,7 +283,7 @@
                                 <div class="form-group row">
                                     <label class="col-md-2 col-sm-3 col-form-label" for="inviter">邀请人</label>
                                     <div class="col-xl-6 col-sm-8">
-                                        <p class="form-control"> {{empty($user->inviter) ? '无邀请人' : $user->inviter->email}} </p>
+                                        <p class="form-control"> {{$user->inviter->email ?? '无邀请人'}} </p>
                                     </div>
                                 </div>
                                 <div class="form-group row">