日常开发

app/Http/Controllers/AdminController.php

@@ -794,7 +794,7 @@ class AdminController extends Controller
     // 文章列表
     public function articleList(Request $request)
     {
-        $view['articleList'] = Article::query()->where('is_del', 0)->orderBy('sort', 'desc')->paginate(15)->appends($request->except('page'));
+        $view['list'] = Article::query()->where('is_del', 0)->orderBy('sort', 'desc')->paginate(15)->appends($request->except('page'));
 
         return Response::view('admin/articleList', $view);
     }
@@ -869,12 +869,12 @@ class AdminController extends Controller
     {
         $view['groupList'] = SsGroup::query()->paginate(15)->appends($request->except('page'));
 
-        $level_list = $this->levelList();
-        $level_dict = [];
-        foreach ($level_list as $level) {
-            $level_dict[$level['level']] = $level['level_name'];
+        $levelList = $this->levelList();
+        $levelMap = [];
+        foreach ($levelList as $vo) {
+            $levelMap[$vo['level']] = $vo['level_name'];
         }
-        $view['level_dict'] = $level_dict;
+        $view['levelMap'] = $levelMap;
 
         return Response::view('admin/groupList', $view);
     }
@@ -890,7 +890,7 @@ class AdminController extends Controller
 
             return Response::json(['status' => 'success', 'data' => '', 'message' => '添加成功']);
         } else {
-            $view['level_list'] = $this->levelList();
+            $view['levelList'] = $this->levelList();
 
             return Response::view('admin/addGroup', $view);
         }
@@ -918,7 +918,7 @@ class AdminController extends Controller
             }
         } else {
             $view['group'] = SsGroup::query()->where('id', $id)->first();
-            $view['level_list'] = $this->levelList();
+            $view['levelList'] = $this->levelList();
 
             return Response::view('admin/editGroup', $view);
         }
@@ -930,8 +930,8 @@ class AdminController extends Controller
         $id = $request->get('id');
 
         // 检查是否该分组下是否有节点
-        $group_node = SsGroupNode::query()->where('group_id', $id)->get();
-        if (!$group_node->isEmpty()) {
+        $ssGroupNodeCount = SsGroupNode::query()->where('group_id', $id)->count();
+        if ($ssGroupNodeCount) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '删除失败：该分组下有节点关联，请先解除关联']);
         }
 
@@ -1006,6 +1006,7 @@ class AdminController extends Controller
         return Response::view('admin/subscribeLog', $view);
     }
 
+    // 设置用户的订阅的状态
     public function setSubscribeStatus(Request $request)
     {
         $id = $request->get('id');
@@ -1653,32 +1654,32 @@ EOF;
         $level = $request->get('level');
         $level_name = $request->get('level_name');
 
-        if (empty($id)) {
+        if (!$id) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => 'ID不能为空']);
         }
 
-        if (empty($level)) {
+        if (!$level) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不能为空']);
         }
 
-        if (empty($level_name)) {
+        if (!$level_name) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级名称不能为空']);
         }
 
         $le = Level::query()->where('id', $id)->first();
-        if (empty($le)) {
+        if (!$le) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不存在']);
         }
 
         // 校验该等级下是否存在关联分组
-        $existGroups = SsGroup::query()->where('level', $le->level)->get();
-        if (!$existGroups->isEmpty()) {
+        $ssGroupCount = SsGroup::query()->where('level', $le->level)->count();
+        if ($ssGroupCount) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联分组，请先取消关联']);
         }
 
         // 校验该等级下是否存在关联账号
-        $existUsers = User::query()->where('level', $le->level)->get();
-        if (!$existUsers->isEmpty()) {
+        $userCount = User::query()->where('level', $le->level)->count();
+        if ($userCount) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级下存在关联账号，请先取消关联']);
         }
 
@@ -1875,34 +1876,6 @@ EOF;
         return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
     }
 
-    // 设置微信、支付宝二维码（已废弃）
-    public function setQrcode(Request $request)
-    {
-        // 微信二维码
-        if ($request->hasFile('wechat_qrcode')) {
-            $file = $request->file('wechat_qrcode');
-            $type = $file->getClientOriginalExtension();
-            $name = date('YmdHis') . mt_rand(1000, 2000) . '.' . $type;
-            $move = $file->move(base_path() . '/public/upload/image/qrcode/', $name);
-            $wechat_qrcode = $move ? '/upload/image/qrcode/' . $name : '';
-
-            Config::query()->where('name', 'wechat_qrcode')->update(['value' => $wechat_qrcode]);
-        }
-
-        // 支付宝二维码
-        if ($request->hasFile('alipay_qrcode')) {
-            $file = $request->file('alipay_qrcode');
-            $type = $file->getClientOriginalExtension();
-            $name = date('YmdHis') . mt_rand(1000, 2000) . '.' . $type;
-            $move = $file->move(base_path() . '/public/upload/image/qrcode/', $name);
-            $alipay_qrcode = $move ? '/upload/image/qrcode/' . $name : '';
-
-            Config::query()->where('name', 'alipay_qrcode')->update(['value' => $alipay_qrcode]);
-        }
-
-        return Redirect::back();
-    }
-
     // 邀请码列表
     public function inviteList(Request $request)
     {

app/Http/Controllers/Controller.php

@@ -310,13 +310,13 @@ class Controller extends BaseController
     // 将Base64图片转换为本地图片并保存
     function base64ImageSaver($base64_image_content)
     {
-        //匹配出图片的格式
+        // 匹配出图片的格式
         if (preg_match('/^(data:\s*image\/(\w+);base64,)/', $base64_image_content, $result)) {
             $type = $result[2];
 
             $directory = date('Ymd');
             $path = '/assets/images/qrcode/' . $directory . '/';
-            if (!file_exists(public_path($path))) { //检查是否有该文件夹，如果没有就创建，并给予最高权限
+            if (!file_exists(public_path($path))) { // 检查是否有该文件夹，如果没有就创建，并给予最高权限
                 mkdir(public_path($path), 0755, true);
             }
 

app/Http/Controllers/PaymentController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Http\Controllers;
 
 use App\Components\Yzy;
@@ -21,6 +22,7 @@ class PaymentController extends Controller
     {
         $goods_id = intval($request->get('goods_id'));
         $coupon_sn = $request->get('coupon_sn');
+
         $user = Session::get('user');
 
         $goods = Goods::query()->where('id', $goods_id)->where('status', 1)->first();
@@ -34,7 +36,7 @@ class PaymentController extends Controller
         }
 
         // 判断是否存在同个商品的未支付订单
-        $existsOrder = Order::query()->where('goods_id', $goods_id)->where('status', 0)->where('user_id', $user['id'])->first();
+        $existsOrder = Order::query()->where('status', 0)->where('user_id', $user['id'])->where('goods_id', $goods_id)->exists();
         if ($existsOrder) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：尚有未支付的订单，请先去支付']);
         }
@@ -43,7 +45,7 @@ class PaymentController extends Controller
         $strategy = $this->systemConfig['goods_purchase_limit_strategy'];
         if ($strategy == 'all' || ($strategy == 'free' && $goods->price == 0)) {
             // 判断是否已经购买过该商品
-            $noneExpireOrderExist = Order::query()->where('user_id', $user['id'])->where('goods_id', $goods_id)->where('status', '>=', 0)->where('is_expire', 0)->exists();
+            $noneExpireOrderExist = Order::query()->where('status', '>=', 0)->where('is_expire', 0)->where('user_id', $user['id'])->where('goods_id', $goods_id)->exists();
             if ($noneExpireOrderExist) {
                 return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：商品不可重复购买']);
             }
@@ -51,7 +53,7 @@ class PaymentController extends Controller
 
         // 使用优惠券
         if ($coupon_sn) {
-            $coupon = Coupon::query()->where('sn', $coupon_sn)->whereIn('type', [1, 2])->where('is_del', 0)->where('status', 0)->first();
+            $coupon = Coupon::query()->where('status', 0)->where('is_del', 0)->whereIn('type', [1, 2])->where('sn', $coupon_sn)->first();
             if (!$coupon) {
                 return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：优惠券不存在']);
             }
@@ -63,14 +65,15 @@ class PaymentController extends Controller
             $amount = $goods->price;
         }
 
-        // 如果最后总价格为0，则不允许创建支付单
-        if ($amount <= 0) {
-            return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：合计价格为0，无需使用在线支付']);
+        // 价格异常判断
+        if ($amount < 0) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：订单总价异常']);
+        } elseif ($amount == 0) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：订单总价为0，无需使用在线支付']);
         }
 
         DB::beginTransaction();
         try {
-            $user = Session::get('user');
             $orderSn = date('ymdHis') . mt_rand(100000, 999999);
             $sn = makeRandStr(12);
 
@@ -179,7 +182,7 @@ class PaymentController extends Controller
 
         if ($payment->status) {
             return Response::json(['status' => 'success', 'data' => '', 'message' => '支付成功']);
-        } else if ($payment->status < 0) {
+        } elseif ($payment->status < 0) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '支付失败']);
         } else {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '等待支付']);

resources/views/admin/addGroup.blade.php

@@ -39,8 +39,8 @@
                                     <label class="control-label col-md-3">分组级别</label>
                                     <div class="col-md-4">
                                         <select class="form-control" name="level" id="level" required>
-                                            @if(!$level_list->isEmpty())
-                                                @foreach($level_list as $level)
+                                            @if(!$levelList->isEmpty())
+                                                @foreach($levelList as $level)
                                                     <option value="{{$level->level}}">{{$level->level_name}}</option>
                                                 @endforeach
                                             @endif

resources/views/admin/articleList.blade.php

@@ -37,23 +37,23 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                @if($articleList->isEmpty())
+                                @if($list->isEmpty())
                                     <tr>
                                         <td colspan="6" style="text-align: center;">暂无数据</td>
                                     </tr>
                                 @else
-                                    @foreach($articleList as $article)
+                                    @foreach($list as $vo)
                                         <tr class="odd gradeX">
-                                            <td> {{$article->id}} </td>
-                                            <td> {{$article->type == '1' ? '文章' : '公告'}} </td>
-                                            <td> <a href="{{url('article?id=' . $article->id)}}" target="_blank"> {{str_limit($article->title, 80)}} </a> </td>
-                                            <td> {{$article->sort}} </td>
-                                            <td> {{$article->created_at}} </td>
+                                            <td> {{$vo->id}} </td>
+                                            <td> {{$vo->type == '1' ? '文章' : '公告'}} </td>
+                                            <td> <a href="{{url('article?id=' . $vo->id)}}" target="_blank"> {{str_limit($vo->title, 80)}} </a> </td>
+                                            <td> {{$vo->sort}} </td>
+                                            <td> {{$vo->created_at}} </td>
                                             <td>
-                                                <button type="button" class="btn btn-sm blue btn-outline" onclick="editArticle('{{$article->id}}')">
+                                                <button type="button" class="btn btn-sm blue btn-outline" onclick="editArticle('{{$vo->id}}')">
                                                     <i class="fa fa-pencil"></i>
                                                 </button>
-                                                <button type="button" class="btn btn-sm red btn-outline" onclick="delArticle('{{$article->id}}')">
+                                                <button type="button" class="btn btn-sm red btn-outline" onclick="delArticle('{{$vo->id}}')">
                                                     <i class="fa fa-trash"></i>
                                                 </button>
                                             </td>
@@ -65,11 +65,11 @@
                         </div>
                         <div class="row">
                             <div class="col-md-4 col-sm-4">
-                                <div class="dataTables_info" role="status" aria-live="polite">共 {{$articleList->total()}} 篇文章</div>
+                                <div class="dataTables_info" role="status" aria-live="polite">共 {{$list->total()}} 篇文章</div>
                             </div>
                             <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
-                                    {{ $articleList->links() }}
+                                    {{ $list->links() }}
                                 </div>
                             </div>
                         </div>

resources/views/admin/editGroup.blade.php

@@ -39,8 +39,8 @@
                                     <label class="control-label col-md-3">分组级别</label>
                                     <div class="col-md-4">
                                         <select class="form-control" name="level" id="level" required>
-                                            @if(!$level_list->isEmpty())
-                                                @foreach($level_list as $level)
+                                            @if(!$levelList->isEmpty())
+                                                @foreach($levelList as $level)
                                                     <option value="{{$level->level}}" {{$group->level == $level->level ? 'selected' : ''}}>{{$level->level_name}}</option>
                                                 @endforeach
                                             @endif

resources/views/admin/groupList.blade.php

@@ -44,7 +44,7 @@
                                             <tr class="odd gradeX">
                                                 <td> {{$group->id}} </td>
                                                 <td> {{$group->name}} </td>
-                                                <td> {{$group->level}} </td>
+                                                <td> {{$levelMap[$group->level]}} </td>
                                                 <td style="text-align: center;">
                                                     <button type="button" class="btn btn-sm blue btn-outline" onclick="editGroup('{{$group->id}}')">
                                                         <i class="fa fa-pencil"></i>

routes/web.php

@@ -72,7 +72,6 @@ Route::group(['middleware' => ['forbidden', 'user', 'admin']], function () {
     Route::get('admin/system', 'AdminController@system'); // 系统设置
     Route::post('admin/setConfig', 'AdminController@setConfig'); // 设置某个配置项
     Route::post('admin/setReferralPercent', 'AdminController@setReferralPercent'); // 设置返利比例
-    Route::post('admin/setQrcode', 'AdminController@setQrcode'); // 设置充值二维码（已废弃）
     Route::post('admin/resetUserTraffic', 'AdminController@resetUserTraffic'); // 重置用户流量
     Route::post('admin/handleUserBalance', 'AdminController@handleUserBalance'); // 余额充值
     Route::get('admin/userBalanceLogList', 'AdminController@userBalanceLogList'); // 余额变动日志