合并后代码格式化

app/Console/Commands/AutoDecGoodsTraffic.php

@@ -48,6 +48,7 @@ class AutoDecGoodsTraffic extends Command
                         User::query()->where('id', $order->user_id)->update(['u' => 0, 'd' => 0, 'transfer_enable' => 0]);
                     } else {
                         User::query()->where('id', $order->user_id)->decrement('transfer_enable', $order->goods->traffic * 1048576);
+
                         // 处理已用流量
                         if ($order->user->u + $order->user->d - $order->goods->traffic * 1048576 <= 0) {
                             User::query()->where('id', $order->user_id)->update(['u' => 0, 'd' => 0]);
@@ -55,9 +56,7 @@ class AutoDecGoodsTraffic extends Command
                             // 一般来说d的值远远大于u
                             if ($order->user->d - $order->goods->traffic * 1048576 >= 0) {
                                 User::query()->where('id', $order->user_id)->decrement('d', $order->goods->traffic * 1048576);
-                            }
-                            // 如果d不够减，则减u，然后d置0
-                            else {
+                            } else { // 如果d不够减，则减u，然后d置0
                                 User::query()->where('id', $order->user_id)->decrement('u', $order->goods->traffic * 1048576 - $order->user->d);
                                 User::query()->where('id', $order->user_id)->update(['d' => 0]);
                             }

app/Console/Commands/AutoJob.php

@@ -218,8 +218,8 @@ class AutoJob extends Command
     // 端口回收与分配
     private function dispatchPort()
     {
-        // 自动分配端口
         if (self::$config['auto_release_port']) {
+            ## 自动分配端口
             $userList = User::query()->where('status', '>=', 0)->where('enable', 1)->where('port', 0)->get();
             if (!$userList->isEmpty()) {
                 foreach ($userList as $user) {
@@ -228,10 +228,8 @@ class AutoJob extends Command
                     User::query()->where('id', $user->id)->update(['port' => $port]);
                 }
             }
-        }
 
-        // 被封禁的账号自动释放端口
-        if (self::$config['auto_release_port']) {
+            ## 被封禁的账号自动释放端口
             $userList = User::query()->where('status', -1)->where('enable', 0)->get();
             if (!$userList->isEmpty()) {
                 foreach ($userList as $user) {
@@ -240,10 +238,8 @@ class AutoJob extends Command
                     }
                 }
             }
-        }
-        
-        // 过期一个月的账户自动释放端口
-        if (self::$config['auto_release_port']) {
+
+            ## 过期一个月的账户自动释放端口
             $userList = User::query()->where('enable', 0)->get();
             if (!$userList->isEmpty()) {
                 foreach ($userList as $user) {

app/Console/Commands/AutoResetUserTraffic.php

@@ -42,6 +42,7 @@ class AutoResetUserTraffic extends Command
                         ->where('is_expire', 0)
                         ->orderBy('oid', 'desc')
                         ->first();
+
                     if (!$order) {
                         continue;
                     }

app/Console/Commands/UserExpireAutoWarning.php

@@ -37,6 +37,7 @@ class UserExpireAutoWarning extends Command
                 if (false === filter_var($user->username, FILTER_VALIDATE_EMAIL)) {
                     continue;
                 }
+
                 // 计算剩余可用时间
                 $lastCanUseDays = ceil(round(strtotime($user->expire_time) - strtotime(date('Y-m-d H:i:s'))) / 3600 / 24);
                 if ($lastCanUseDays == 0) {

app/Http/Controllers/AdminController.php

@@ -1925,8 +1925,6 @@ EOF;
     // 生成邀请码
     public function makeInvite(Request $request)
     {
-        $user = Session::get('user');
-
         for ($i = 0; $i < 5; $i++) {
             $obj = new Invite();
             $obj->uid = 0;

app/Http/Controllers/Api/YzyController.php

@@ -158,7 +158,7 @@ class YzyController extends Controller
             } else {
                 $expireTime = $order->user->expire_time;
             }
-            
+
             // 套餐就改流量重置日，流量包不改
             if ($goods->type == 2) {
                 if (date('m') == 2 && date('d') == 29) {
@@ -211,7 +211,7 @@ class YzyController extends Controller
             }
 
             // 取消重复返利
-            User::query()->where('id', $order->user_id)->update(['referral_uid' => 0]);            
+            User::query()->where('id', $order->user_id)->update(['referral_uid' => 0]);
 
             DB::commit();
         } catch (\Exception $e) {

app/Http/Controllers/RegisterController.php

@@ -51,19 +51,19 @@ class RegisterController extends Controller
                 Session::flash('errorMsg', '请输入用户名');
 
                 return Redirect::back()->withInput();
-            } else if (empty($password)) {
+            } elseif (empty($password)) {
                 Session::flash('errorMsg', '请输入密码');
 
                 return Redirect::back()->withInput();
-            } else if (empty($repassword)) {
+            } elseif (empty($repassword)) {
                 Session::flash('errorMsg', '请重新输入密码');
 
                 return Redirect::back()->withInput();
-            } else if (md5($password) != md5($repassword)) {
+            } elseif (md5($password) != md5($repassword)) {
                 Session::flash('errorMsg', '两次输入密码不一致，请重新输入');
 
                 return Redirect::back()->withInput($request->except(['password', 'repassword']));
-            } else if (false === filter_var($username, FILTER_VALIDATE_EMAIL)) {
+            } elseif (false === filter_var($username, FILTER_VALIDATE_EMAIL)) {
                 Session::flash('errorMsg', '用户名必须是合法邮箱，请重新输入');
 
                 return Redirect::back()->withInput();
@@ -133,12 +133,10 @@ class RegisterController extends Controller
 
             // 校验aff对应账号是否存在
             $aff = $request->cookie('register_aff') ? $request->cookie('register_aff') : 0;
-            // 优先处理邀请链接
-            if ($aff) {
+            if ($aff) { // 优先处理邀请链接
                 $affUser = User::query()->where('id', $aff)->first();
                 $referral_uid = $affUser ? $aff : 0;
-            } elseif($code) {
-                // 如果使用邀请码，则将邀请码也列入aff
+            } elseif ($code) { // 如果使用邀请码，则将邀请码也列入aff
                 $inviteCode = Invite::query()->where('code', $code)->where('status', 0)->first();
                 $referral_uid = $inviteCode ? $inviteCode->uid : 0;
             } else {

app/Http/Controllers/UserController.php

@@ -999,7 +999,7 @@ class UserController extends Controller
                 } else {
                     $expireTime = $user->expire_time;
                 }
-                
+
                 // 套餐就改流量重置日，流量包不改
                 if ($goods->type == 2) {
                     if (date('m') == 2 && date('d') == 29) {
@@ -1011,7 +1011,7 @@ class UserController extends Controller
                 } else {
                     User::query()->where('id', $order->user_id)->update(['expire_time' => $expireTime, 'enable' => 1]);
                 }
-                
+
                 // 写入用户标签
                 if ($goods->label) {
                     // 用户默认标签
@@ -1043,7 +1043,7 @@ class UserController extends Controller
                 if ($user->referral_uid) {
                     $this->addReferralLog($user->id, $user->referral_uid, $order->oid, $amount, $amount * $this->systemConfig['referral_percent']);
                 }
-                
+
                 // 取消重复返利
                 User::query()->where('id', $order->user_id)->update(['referral_uid' => 0]);
 
@@ -1083,7 +1083,7 @@ class UserController extends Controller
         if ($user['score'] < 100) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '兑换失败：满100才可以兑换，请继续累计吧']);
         }
-        
+
         // 账号过期不允许兑换
         if ($user['expire_time'] < date('Y-m-d')) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '兑换失败：账号已过期，请先购买服务吧']);
@@ -1132,7 +1132,7 @@ class UserController extends Controller
         $view['link'] = $this->systemConfig['website_url'] . '/register?aff=' . $user['id'];
         $view['referralLogList'] = ReferralLog::query()->where('ref_user_id', $user['id'])->with('user')->paginate(10);
         $view['referralApplyList'] = ReferralApply::query()->where('user_id', $user['id'])->with('user')->paginate(10);
-        $view['referralUserList'] = User::select(['username','created_at'])->where('referral_uid', $user['id'])->orderBy('id','desc')->paginate(10);
+        $view['referralUserList'] = User::select(['username', 'created_at'])->where('referral_uid', $user['id'])->orderBy('id', 'desc')->paginate(10);
 
         return Response::view('user/referral', $view);
     }

resources/lang/en/home.php

@@ -155,7 +155,7 @@ return [
     'ticket_reply_button'             => 'Reply',
 
     // 推广返利
-    'referral_title'                  => 'My Referrals',
+    'referral_title'                  => 'Commissions',
     'referral_button'                 => 'Copy Link',
     'referral_my_link'                => 'My Referral Link',
     'referral_table_user'             => 'Who',

resources/lang/ja/home.php

@@ -155,7 +155,7 @@ return [
     'ticket_reply_button'             => '返信',
 
     // 推广返利
-    'referral_title'                  => '私のプロモーション',
+    'referral_title'                  => '口銭',
     'referral_button'                 => 'コピー',
     'referral_my_link'                => '私のプロモーションリンク',
     'referral_table_user'             => '消費者',

resources/lang/ko/home.php

@@ -153,7 +153,7 @@ return [
     'ticket_reply_button'             => '답장',
 
     // 推广返利
-    'referral_title'                  => '나의홍보',
+    'referral_title'                  => '수수료',
     'referral_button'                 => '주소사 ',
     'referral_my_link'                => '홍보전용 링크',
     'referral_table_user'             => '소비자',

resources/lang/zh-CN/home.php

@@ -155,7 +155,7 @@ return [
     'ticket_reply_button'             => '回复',
 
     // 推广返利
-    'referral_title'                  => '我的推广',
+    'referral_title'                  => '佣金记录',
     'referral_button'                 => '复制',
     'referral_my_link'                => '我的推广链接',
     'referral_table_user'             => '消费者',

resources/lang/zh-tw/home.php

@@ -155,7 +155,7 @@ return [
     'ticket_reply_button'             => '回復',
 
     // 推广返利
-    'referral_title'                  => '我的推廣',
+    'referral_title'                  => '傭金記錄',
     'referral_button'                 => '複製',
     'referral_my_link'                => '我的推廣連結',
     'referral_table_user'             => '消費者',

resources/views/admin/editUser.blade.php

@@ -346,7 +346,7 @@
                                             <div class="form-group">
                                                 <label for="speed_limit_per_user" class="col-md-3 control-label">邀请人</label>
                                                 <div class="col-md-8">
-                                                    <input type="text" class="form-control" name="referral" value="{{$user->referral ? $user->referral->username : '无邀请人'}}" id="referral" placeholder="" readonly>
+                                                    <p class="form-control-static"> {{$user->referral ? $user->referral->username : '无邀请人'}} </p>
                                                 </div>
                                             </div>
                                         </div>

resources/views/user/referral.blade.php

@@ -39,6 +39,7 @@
                         </div>
                     </div>
                 </div>
+
                 <!-- 邀请记录 -->
                 <div class="portlet light bordered">
                     <div class="portlet-title">
@@ -74,7 +75,7 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-12 col-sm-12">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $referralUserList->links() }}
                                 </div>
@@ -82,6 +83,7 @@
                         </div>
                     </div>
                 </div>
+
                 <!-- 推广记录 -->
                 <div class="portlet light bordered">
                     <div class="portlet-title">
@@ -193,7 +195,7 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-12 col-sm-12">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $referralLogList->links() }}
                                 </div>