BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-11 15:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #156 & PayBeaver建立订单报错时处理错误的问题

Browse Source
This commit is contained in:
兔姬桑
2021-02-10 01:34:19 -05:00
parent 58154ad98d
commit 63b1c8b567
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Gateway/PayBeaver.php
View File

@@ -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)

30
app/Http/Controllers/PaymentController.php
View File

@@ -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' => '订单创建失败：订单总价异常']);

2
resources/views/admin/user/info.blade.php
View File

@@ -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">