1.修正打开限购后购买商品BUG

2.用户的用途可以多选、增加季付

app/Console/Commands/AutoCheckNodeStatusJob.php

@@ -30,7 +30,7 @@ class AutoCheckNodeStatusJob extends Command
 
         $nodeList = SsNode::query()->where('status', 1)->get();
         foreach ($nodeList as $node) {
-            // 10分钟内无节点信息则认为是宕机，因为每个节点的负载信息最多保存10分钟
+            // 10分钟内无节点负载信息则认为是宕机
             $node_info = SsNodeInfo::query()->where('node_id', $node->id)->where('log_time', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->first();
             if (empty($node_info) || empty($node_info->load)) {
                 // 10分钟内已发警告，则不再发

app/Console/Commands/AutoClearLogJob.php

@@ -26,8 +26,8 @@ class AutoClearLogJob extends Command
         $config = $this->systemConfig();
 
         if ($config['is_clear_log']) {
-            // 自动清除10分钟以前的节点负载信息日志
-            SsNodeInfo::query()->where('log_time', '<=', strtotime(date('Y-m-d H:i:s', strtotime("-10 minutes"))))->delete();
+            // 自动清除30分钟以前的节点负载信息日志
+            SsNodeInfo::query()->where('log_time', '<=', strtotime(date('Y-m-d H:i:s', strtotime("-30 minutes"))))->delete();
 
             // 自动清除1小时以前的节点在线用户数日志
             SsNodeOnlineLog::query()->where('log_time', '<=', strtotime(date('Y-m-d H:i:s', strtotime("-60 minutes"))))->delete();

app/Http/Controllers/UserController.php

@@ -855,7 +855,7 @@ class UserController extends Controller
             $strategy = self::$config['goods_purchase_limit_strategy'];
             if ($strategy == 'all' || ($strategy == 'free' && $goods->price == 0)) {
                 // 判断是否已经购买过该商品
-                $none_expire_good_exist = Order::query()->where('user_id', $user['id'])->where('goods_id', $goods_id)->where('is_expire', 0)->exists();
+                $none_expire_good_exist = Order::query()->where('user_id', $user['id'])->where('goods_id', $goods_id)->where('is_expire', 0)->where('status', '>=', 0)->exists();
                 if ($none_expire_good_exist) {
                     return Response::json(['status' => 'fail', 'data' => '', 'message' => '支付失败：商品不可重复购买']);
                 }

resources/views/admin/addUser.blade.php

@@ -44,11 +44,11 @@
                                                 <div class="col-md-8">
                                                     <div class="mt-checkbox-inline">
                                                         <label class="mt-checkbox">
-                                                            <input type="checkbox" name="usage" value="1"> 手机
+                                                            <input type="checkbox" name="usage" value="1" checked> 手机
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-checkbox">
-                                                            <input type="checkbox" name="usage" value="2"> 电脑
+                                                            <input type="checkbox" name="usage" value="2" checked> 电脑
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-checkbox">
@@ -56,7 +56,7 @@
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-checkbox">
-                                                            <input type="checkbox" name="usage" value="4" checked> 其他
+                                                            <input type="checkbox" name="usage" value="4"> 平板
                                                             <span></span>
                                                         </label>
                                                     </div>
@@ -75,11 +75,15 @@
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-radio">
-                                                            <input type="radio" name="pay_way" value="2"> 半年付
+                                                            <input type="radio" name="pay_way" value="2"> 季付
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-radio">
-                                                            <input type="radio" name="pay_way" value="3"> 年付
+                                                            <input type="radio" name="pay_way" value="3"> 半年付
+                                                            <span></span>
+                                                        </label>
+                                                        <label class="mt-radio">
+                                                            <input type="radio" name="pay_way" value="4"> 年付
                                                             <span></span>
                                                         </label>
                                                     </div>
@@ -306,6 +310,7 @@
     <script type="text/javascript">
         // 用户标签选择器
         $('#labels').select2({
+            theme: 'bootstrap',
             placeholder: '设置后则可见相同标签的节点',
             allowClear: true
         });

resources/views/admin/editUser.blade.php

@@ -62,7 +62,7 @@
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-checkbox">
-                                                            <input type="checkbox" name="usage" value="4" {{in_array(4, $user->usage) ? 'checked' : ''}}> 其他
+                                                            <input type="checkbox" name="usage" value="4" {{in_array(4, $user->usage) ? 'checked' : ''}}> 平板
                                                             <span></span>
                                                         </label>
                                                     </div>
@@ -77,15 +77,19 @@
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-radio">
-                                                            <input type="radio" name="pay_way" value="1" {{$user->pay_way == 1 ? 'checked' : ''}}> 月付
+                                                            <input type="radio" name="pay_way" value="1" {{$user->pay_way == 1 ? 'checked' : ''}}> 季付
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-radio">
-                                                            <input type="radio" name="pay_way" value="2" {{$user->pay_way == 2 ? 'checked' : ''}}> 半年付
+                                                            <input type="radio" name="pay_way" value="2" {{$user->pay_way == 2 ? 'checked' : ''}}> 月付
                                                             <span></span>
                                                         </label>
                                                         <label class="mt-radio">
-                                                            <input type="radio" name="pay_way" value="3" {{$user->pay_way == 3 ? 'checked' : ''}}> 年付
+                                                            <input type="radio" name="pay_way" value="3" {{$user->pay_way == 3 ? 'checked' : ''}}> 半年付
+                                                            <span></span>
+                                                        </label>
+                                                        <label class="mt-radio">
+                                                            <input type="radio" name="pay_way" value="4" {{$user->pay_way == 4 ? 'checked' : ''}}> 年付
                                                             <span></span>
                                                         </label>
                                                     </div>
@@ -215,7 +219,7 @@
                                                     <div class="input-group">
                                                         <input class="form-control" type="text" name="port" value="{{$user->port}}" id="port" />
                                                         <span class="input-group-btn">
-                                                            <button class="btn btn-success" type="button" onclick="makePort()">生成新端口</button>
+                                                            <button class="btn btn-success" type="button" onclick="makePort()"> <i class="fa fa-refresh"></i> </button>
                                                         </span>
                                                     </div>
                                                 </div>
@@ -226,7 +230,7 @@
                                                     <div class="input-group">
                                                         <input class="form-control" type="text" name="passwd" value="{{$user->passwd}}" id="passwd" />
                                                         <span class="input-group-btn">
-                                                            <button class="btn btn-success" type="button" onclick="makePasswd()"> 生成 </button>
+                                                            <button class="btn btn-success" type="button" onclick="makePasswd()"> <i class="fa fa-refresh"></i> </button>
                                                         </span>
                                                     </div>
                                                 </div>
@@ -373,6 +377,7 @@
     <script type="text/javascript">
         // 用户标签选择器
         $('#labels').select2({
+            theme: 'bootstrap',
             placeholder: '设置后则可见相同标签的节点',
             allowClear: true
         });

resources/views/admin/userList.blade.php

@@ -48,6 +48,7 @@
                                     <option value="1" @if(Request::get('pay_way') == '1') selected @endif>月付</option>
                                     <option value="2" @if(Request::get('pay_way') == '2') selected @endif>半年付</option>
                                     <option value="3" @if(Request::get('pay_way') == '3') selected @endif>年付</option>
+                                    <option value="4" @if(Request::get('pay_way') == '4') selected @endif>其他</option>
                                 </select>
                             </div>
                             <div class="col-md-2 col-sm-2">

sql/db.sql

@@ -124,7 +124,7 @@ CREATE TABLE `user` (
   `wechat` varchar(30) DEFAULT '' COMMENT '微信',
   `qq` varchar(20) DEFAULT '' COMMENT 'QQ',
   `usage` VARCHAR(10) NOT NULL DEFAULT '4' COMMENT '用途：1-手机、2-电脑、3-路由器、4-其他',
-  `pay_way` tinyint(4) NOT NULL DEFAULT '0' COMMENT '付费方式：0-免费、1-月付、2-半年付、3-年付',
+  `pay_way` tinyint(4) NOT NULL DEFAULT '0' COMMENT '付费方式：0-免费、1-季付、2-月付、3-半年付、4-年付',
   `balance` int(11) NOT NULL DEFAULT '0' COMMENT '余额，单位分',
   `score` int(11) NOT NULL DEFAULT '0' COMMENT '积分',
   `enable_time` date DEFAULT NULL COMMENT '开通日期',

sql/update/20180705.sql

@@ -1,3 +1,5 @@
 -- 用途可以多选
 ALTER TABLE `user`
 	CHANGE COLUMN `usage` `usage` VARCHAR(10) NOT NULL DEFAULT '4' COMMENT '用途：1-手机、2-电脑、3-路由器、4-其他' AFTER `qq`;
+
+-- 支付方式增加季付