修正一些列BUG

app/Console/Commands/AutoDecGoodsTrafficJob.php

@@ -27,19 +27,20 @@ class AutoDecGoodsTrafficJob extends Command
                 continue;
             }
 
-            // 如果商品已过期，则需要扣流量
             if (date("Y-m-d H:i:s", strtotime("-" . $goods->days . " days")) >= $og->created_at) {
                 $u = User::where('id', $og->user_id)->first();
                 if (empty($u)) {
                     continue;
                 }
 
-                // 商品到期自动扣总流量
-                if ($u->transfer_enable - $goods->traffic * 1048576 <= 0) {
-                    User::where('id', $og->user_id)->update(['transfer_enable' => 0]);
-                } else {
-                    User::where('id', $og->user_id)->decrement('transfer_enable', $goods->traffic * 1048576);
-                }
+                // 流量包到期自动扣总流量
+                //if ($goods->type == 1) {
+                    if ($u->transfer_enable - $goods->traffic * 1048576 <= 0) {
+                        User::where('id', $og->user_id)->update(['transfer_enable' => 0]);
+                    } else {
+                        User::where('id', $og->user_id)->decrement('transfer_enable', $goods->traffic * 1048576);
+                    }
+                //}
 
                 OrderGoods::where('id', $og->id)->update(['is_expire' => 1]);
             }

app/Console/Commands/AutoGetLocationInfoJob.php

@@ -48,5 +48,7 @@ class AutoGetLocationInfoJob extends Command
             // 暂停一秒，防止QPS超限导致返回错误
             sleep(1);
         }
+
+        Log::info('定时任务：' . $this->description);
     }
 }

app/Console/Commands/AutoResetUserTrafficJob.php

@@ -10,7 +10,7 @@ use Log;
 class AutoResetUserTrafficJob extends Command
 {
     protected $signature = 'command:autoResetUserTrafficJob';
-    protected $description = '自动重置账号的流量';
+    protected $description = '自动重置账号流量';
 
     protected static $config;
 

app/Http/Controllers/AdminController.php

@@ -479,11 +479,20 @@ class AdminController extends BaseController
     public function delNode(Request $request)
     {
         $id = $request->get('id');
-        $user = SsNode::where('id', $id)->delete();
-        if ($user) {
+
+        $node = SsNode::query()->where('id', $id)->first();
+        if (empty($node)) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '节点不存在，请重试']);
+        }
+
+        try {
+            // 删除分组关联
+            SsGroupNode::query()->where('node_id', $id)->delete();
+            SsNode::query()->where('id', $id)->delete();
+
             return Response::json(['status' => 'success', 'data' => '', 'message' => '删除成功']);
-        } else {
-            return Response::json(['status' => 'fail', 'data' => '', 'message' => '删除失败']);
+        } catch (\Exception $e) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '删除失败：' . $e->getMessage()]);
         }
     }
 

app/Http/Controllers/UserController.php

@@ -922,7 +922,6 @@ TXT;
         $obj->amount = $ref_amount;
         $obj->link_logs = $link_logs;
         $obj->status = 0;
-        $obj->created_at = date('Y-m-d H:i:s');
         $obj->save();
 
         return Response::json(['status' => 'success', 'data' => '', 'message' => '申请成功，请等待管理员审核']);

app/Http/Models/Goods.php

@@ -15,9 +15,14 @@ class Goods extends Model
     protected $primaryKey = 'id';
     protected $fillable = [
         'name',
+        'logo',
         'traffic',
         'score',
+        'type',
         'price',
+        'desc',
+        'days',
+        'is_del',
         'status'
     ];
 

app/Http/Models/OrderGoods.php

@@ -20,7 +20,8 @@ class OrderGoods extends Model
         'goods_id',
         'num',
         'original_price',
-        'price'
+        'price',
+        'is_expire'
     ];
 
     function goods() {

app/Http/Models/ReferralApply.php

@@ -19,8 +19,7 @@ class ReferralApply extends Model
         'after',
         'amount',
         'link_logs',
-        'status',
-        'created_at'
+        'status'
     ];
 
     public function User()

app/Http/Models/ReferralLog.php

@@ -19,8 +19,7 @@ class ReferralLog extends Model
         'order_id',
         'amount',
         'ref_amount',
-        'status',
-        'created_at'
+        'status'
     ];
 
     function user() {