修正购买商品无法自动启用SSR

app/Http/Controllers/AdminController.php

@@ -48,13 +48,13 @@ class AdminController extends BaseController
         $view['activeUserCount'] = User::query()->where('t', '>=', $past)->count();
         $view['onlineUserCount'] = User::query()->where('t', '>=', $online)->count();
         $view['nodeCount'] = SsNode::query()->count();
-        $flowCount = UserTrafficLog::query()->sum('u') + UserTrafficLog::sum('d');
+        $flowCount = UserTrafficLog::query()->sum('u') + UserTrafficLog::query()->sum('d');
         $flowCount = $this->flowAutoShow($flowCount);
         $view['flowCount'] = $flowCount;
         $view['totalBalance'] = User::query()->sum('balance');
         $view['totalWaitRefAmount'] = ReferralLog::query()->whereIn('status', [0, 1])->sum('ref_amount');
         $view['totalRefAmount'] = ReferralApply::query()->where('status', 2)->sum('amount');
-        $view['expireWarningUserCount'] = User::query()->where('expire_time', '<=', date('Y-m-d', strtotime("+15 days")))->where('enable', 1)->count();
+        $view['expireWarningUserCount'] = User::query()->where('expire_time', '<=', date('Y-m-d', strtotime("+" . self::$config['expire_days'] . " days")))->where('enable', 1)->count();
 
         return Response::view('admin/index', $view);
     }

app/Http/Controllers/UserController.php

@@ -769,12 +769,11 @@ class UserController extends BaseController
                     $couponLogObj->save();
                 }
 
-                // 把流量包内的流量加到账号上
+                // 把商品的流量加到账号上
                 User::query()->where('id', $user['id'])->increment('transfer_enable', $goods->traffic * 1048576);
 
-                // 将商品的有效期加到账号上，如果账号过期时间小于
-                //if (date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days")) ) {}
-                User::query()->where('id', $user['id'])->update(['expire_time' => date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days"))]);
+                // 将商品的有效期加到账号上
+                User::query()->where('id', $user['id'])->update(['expire_time' => date('Y-m-d H:i:s', strtotime("+" . $goods->days . " days")), 'enable' => 1]);
 
                 // 写入返利日志
                 if ($user->referral_uid) {

resources/views/user/addOrder.blade.php

@@ -34,13 +34,13 @@
                         </thead>
                         <tbody>
                         <tr>
-                            <td style="padding: 20px;">
-                                <h3>{{$goods->name}}</h3>
-                                <p> <img src="{{$goods->logo}}" style="width:100px; height:100px;"> 内含流量 {{$goods->traffic}} MiB，有效期 {{date('Y-m-d', strtotime($goods->start_time))}} ~ {{date('Y-m-d', strtotime($goods->end_time))}} </p>
+                            <td style="padding: 10px;">
+                                <h2>{{$goods->name}}</h2>
+                                <p> 内含流量 {{$goods->traffic}} MiB <br> 有效期 {{$goods->days}}天，到期后自动扣除 </p>
                             </td>
-                            <td class="text-center sbold"> ￥{{$goods->price}} </td>
-                            <td class="text-center sbold"> x 1 </td>
-                            <td class="text-center sbold"> ￥{{$goods->price}} </td>
+                            <td class="text-center"> ￥{{$goods->price}} </td>
+                            <td class="text-center"> x 1 </td>
+                            <td class="text-center"> ￥{{$goods->price}} </td>
                         </tr>
                         </tbody>
                     </table>

resources/views/user/goodsList.blade.php

@@ -17,11 +17,11 @@
         <!-- BEGIN PAGE BASE CONTENT -->
         <div class="row">
             <div class="col-md-12">
-                <!-- BEGIN PAGE BASE CONTENT -->
-                <div class="portlet light portlet-fit bordered">
+                <!--
+                <div class="portlet light bordered">
                     <div class="portlet-title">
                         <div class="caption">
-                            <span class="caption-subject bold uppercase"> 套餐 </span>
+                            <span class="caption-subject bold uppercase"> 流量套餐 </span>
                         </div>
                         <div class="actions"></div>
                     </div>
@@ -38,17 +38,11 @@
                                             <h3><sup class="price-sign">￥</sup>28</h3>
                                         </div>
                                         <div class="price-table-content">
-                                            <div class="row mobile-padding">
-                                                <div class="col-xs-3 text-right mobile-padding">
-                                                    <i class="icon-user"></i>
-                                                </div>
-                                                <div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
-                                            </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
                                                     <i class="icon-drawer"></i>
                                                 </div>
-                                                <div class="col-xs-9 text-left mobile-padding">流量15G/月</div>
+                                                <div class="col-xs-9 text-left mobile-padding">15G/月</div>
                                             </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
@@ -85,17 +79,11 @@
                                             <h3><sup class="price-sign">￥</sup>78</h3>
                                         </div>
                                         <div class="price-table-content">
-                                            <div class="row mobile-padding">
-                                                <div class="col-xs-3 text-right mobile-padding">
-                                                    <i class="icon-user"></i>
-                                                </div>
-                                                <div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
-                                            </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
                                                     <i class="icon-drawer"></i>
                                                 </div>
-                                                <div class="col-xs-9 text-left mobile-padding">流量25G/月</div>
+                                                <div class="col-xs-9 text-left mobile-padding">25G/月</div>
                                             </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
@@ -133,17 +121,11 @@
                                             <div class="price-ribbon">热门</div>
                                         </div>
                                         <div class="price-table-content">
-                                            <div class="row mobile-padding">
-                                                <div class="col-xs-3 text-right mobile-padding">
-                                                    <i class="icon-user"></i>
-                                                </div>
-                                                <div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
-                                            </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
                                                     <i class="icon-drawer"></i>
                                                 </div>
-                                                <div class="col-xs-9 text-left mobile-padding">流量50G/月</div>
+                                                <div class="col-xs-9 text-left mobile-padding">50G/月</div>
                                             </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
@@ -180,17 +162,11 @@
                                             <h3><sup class="price-sign">￥</sup>320</h3>
                                         </div>
                                         <div class="price-table-content">
-                                            <div class="row mobile-padding">
-                                                <div class="col-xs-3 text-right mobile-padding">
-                                                    <i class="icon-user"></i>
-                                                </div>
-                                                <div class="col-xs-9 text-left mobile-padding">支持同时5个设备在线</div>
-                                            </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
                                                     <i class="icon-drawer"></i>
                                                 </div>
-                                                <div class="col-xs-9 text-left mobile-padding">流量50G/月</div>
+                                                <div class="col-xs-9 text-left mobile-padding">50G/月</div>
                                             </div>
                                             <div class="row mobile-padding">
                                                 <div class="col-xs-3 text-right mobile-padding">
@@ -221,7 +197,7 @@
                         </div>
                     </div>
                 </div>
-                <!-- BEGIN EXAMPLE TABLE PORTLET-->
+                -->
                 <div class="portlet light bordered">
                     <div class="portlet-title">
                         <div class="caption font-dark">
@@ -277,7 +253,6 @@
                         </div>
                     </div>
                 </div>
-                <!-- END EXAMPLE TABLE PORTLET-->
             </div>
         </div>
         <!-- END PAGE BASE CONTENT -->