合并@SheffieldLee同志的PR

app/Console/Commands/AutoDecGoodsTraffic.php

@@ -50,8 +50,24 @@ class AutoDecGoodsTraffic extends Command
             DB::beginTransaction();
             try {
                 foreach ($orderList as $order) {
+                    // 先过期本订单
                     Order::query()->where('oid', $order->oid)->update(['is_expire' => 1]);
 
+                    // 再检查该订单对应用户是否还有套餐（非流量包）存在
+                    $haveOrder = Order::query()
+                        ->with(['user', 'goods'])
+                        ->where('is_expire', 0)
+                        ->where('user_id', $order->user_id)
+                        ->whereHas('goods', function ($q) {
+                            $q->where('type', 2);
+                        })
+                        ->orderBy('oid', 'desc')
+                        ->first();
+                    if (!$haveOrder) {
+                        // 如果不存在有效套餐（非流量包），则清空用户重置日
+                        User::query()->where('id', $order->user_id)->update(['traffic_reset_day' => 0]);
+                    }
+
                     if (empty($order->user) || empty($order->goods)) {
                         continue;
                     }

app/Console/Commands/AutoResetUserTraffic.php

@@ -38,7 +38,7 @@ class AutoResetUserTraffic extends Command
     // 重置用户流量
     private function resetUserTraffic()
     {
-        $userList = User::query()->where('status', '>=', 0)->where('enable', 1)->get();
+        $userList = User::query()->where('status', '>=', 0)->where('expire_time', '>=', date('Y-m-d'))->get();
         if (!$userList->isEmpty()) {
             foreach ($userList as $user) {
                 if (!$user->traffic_reset_day) {

app/Http/Controllers/AdminController.php

@@ -2318,7 +2318,7 @@ EOF;
         $ref_username = trim($request->get('ref_username'));
         $status = $request->get('status');
 
-        $query = ReferralLog::query()->with(['user', 'order'])->orderBy('id', 'desc')->orderBy('status', 'asc');
+        $query = ReferralLog::query()->with(['user', 'order'])->orderBy('status', 'asc')->orderBy('id', 'desc');
 
         if ($username) {
             $query->whereHas('user', function ($q) use ($username) {

app/Http/Controllers/SubscribeController.php

@@ -199,7 +199,7 @@ class SubscribeController extends Controller
                 $ssr_str .= '/?obfsparam=' . base64url_encode($obfs_param);
                 $ssr_str .= '&protoparam=' . ($node['single'] ? base64url_encode($user->port . ':' . $user->passwd) : base64url_encode($protocol_param));
                 $ssr_str .= '&remarks=' . base64url_encode($node['name']);
-                $ssr_str .= '&group=' . base64url_encode(empty($group) ? '' : $group->name);
+                $ssr_str .= '&group=' . base64url_encode(empty($group) ? '默认' : $group->name);
                 $ssr_str .= '&udpport=0';
                 $ssr_str .= '&uot=0';
                 $ssr_str = base64url_encode($ssr_str);