diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 6283c1ce..a04d2ee8 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -2009,7 +2009,7 @@ EOF; } break; case 'bitpayx': - if(!self::$systemConfig['bitpayx']){ + if(!self::$systemConfig['bitpay_secret']){ return Response::json(['status' => 'fail', 'message' => '请先设置【麻瓜宝】必要参数']); } break; diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0b8299c9..c2cc8dcc 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -271,7 +271,7 @@ class UserController extends Controller //重置流量 public function resetUserTraffic() { - $temp = Order::uid()->where('status', 2)->where('is_expire', 0)->first(); + $temp = Order::uid()->where('status', 2)->where('is_expire', 0)->with(['goods'])->whereHas('goods', function($q){ $q->where('type', 2); })->first(); $renewCost = Goods::query()->where('id', $temp->goods_id)->first()->renew; if(Auth::user()->balance < $renewCost){ return Response::json(['status' => 'fail', 'data' => '', 'message' => '余额不足,请充值余额']); diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index 7ca8ae7f..f28b1ca0 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -230,7 +230,7 @@