Changes

.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="PS-241.15989.102">
+  <component name="dataSourceStorageLocal" created-in="PS-241.17011.119">
     <data-source name="api_niubiyun_xyz@47.243.54.62" uuid="1e09a6f5-c562-4514-a27d-37e0d8ac0291">
       <database-info product="MySQL" version="5.7.37-log" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="5.7.37" exact-driver-version="8.0">
         <extra-name-characters>#@</extra-name-characters>

app/Http/Controllers/Api/Client/V3Controller.php

@@ -103,7 +103,7 @@ class V3Controller  extends Controller
 //        if ($expireTime < date('Y-m-d H:i:s')){
 //            return response()->json(['ret' => 445, 'msg' => "用户到期，请即使续费"], 200);
 //        }
-
+//
 //        $usedTraffic = $user->usedTraffic();
 //        if ($usedTraffic >= $user["transfer_enable"]){
 //            return response()->json(['ret' => 446, 'msg' => "流量已经用完，联系客服免费重置流量"], 200);
@@ -125,7 +125,7 @@ class V3Controller  extends Controller
             'user_ticket' => 'https://user.viptwo.xyz/logintoticket?email='.$request->input('email') . '&password='.$request->input('password'),
             'clash_config' => route('SProxy_config', ['code'=>$userinfo['code']]),
             'subUrl'      => sysConfig('subscribe_domain') . "/s/" . $userinfo['code'],
-            'subUrl2'      => "https://vip.zfvipone.xyz" . "/s/" . $userinfo['code'],
+            'subUrl2'      => "https://naizi1124.xn--3iq226gfdb94q.com" . "/s/" . $userinfo['code'],
         ];
 
         return response()->json(['ret' => 1, 'msg' => "请求成功",'data'=>$data], 200);
@@ -306,11 +306,11 @@ class V3Controller  extends Controller
 
         $usedTraffic =  $user->usedTraffic();
         if ($usedTraffic >= $userinfo["transfer_enable"]){
-            return response()->json(['ret' => 446, 'msg' => "流量已经用完，联系客服免费重置流量"], 200);
+            return response()->json(['ret' => 446, 'msg' => "流量已经用完，请购买加油包"], 200);
         }
 
         if ($userinfo["enable"] == 0){
-            return response()->json(['ret' => 446, 'msg' => "账号禁用1个小时内流量超过30G,1个小时后自动解封"], 200);
+            return response()->json(['ret' => 446, 'msg' => "账号禁用"], 200);
         }
 
         //获取节点

app/Services/OrderService.php

@@ -149,8 +149,16 @@ class OrderService
         $unusedTraffic = max($totalTransfer - $usedTransfer, 0);
         $googstraffic = self::$goods->traffic * MB;
         // 套餐流量加上剩余流量
+        // $countt = max($googstraffic + $unusedTraffic, 0); //确保总流量不为负数
+        // 套餐流量加上剩余流量
+        // 套餐流量加上剩余流量
         $countt = $googstraffic + $unusedTraffic;
 
+        // 如果总流量为负数，将其设置为套餐流量
+        if ($countt < 0) {
+            $countt = $googstraffic;
+        }
+
         Log::info('用户购买'.self::$user->email.'到期时间'.self::$user->expired_at."流量".flowAutoShow($countt)."剩余流量".flowAutoShow($unusedTraffic));
 
         $updateData = [