Changes

.idea/dataSources.local.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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">
+    <data-source name="api_niubiyun_xyz@158.247.203.230" uuid="1e09a6f5-c562-4514-a27d-37e0d8ac0291">
+      <database-info product="MySQL" version="5.7.43-log" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.7.43" exact-driver-version="8.2">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
+        <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
       </database-info>
       <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>

.idea/dataSources.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="api_niubiyun_xyz@47.243.54.62" uuid="1e09a6f5-c562-4514-a27d-37e0d8ac0291">
+    <data-source source="LOCAL" name="api_niubiyun_xyz@158.247.203.230" uuid="1e09a6f5-c562-4514-a27d-37e0d8ac0291">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://47.243.54.62:13306/api_niubiyun_xyz</jdbc-url>
+      <jdbc-url>jdbc:mysql://158.247.203.230:13306/api_niubiyun_xyz</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

app/Services/OrderService.php

@@ -146,19 +146,27 @@ class OrderService
         //用户的 剩余流量
         $totalTransfer = self::$user->transfer_enable;
         $usedTransfer = self::$user->u + self::$user->d;
-        $unusedTraffic = max($totalTransfer - $usedTransfer, 0);
+        $unusedTraffic = $totalTransfer - $usedTransfer; // 计算剩余流量
+
+        // 如果剩余流量为负数，将其设置为0
+        if ($unusedTraffic < 0) {
+            $unusedTraffic = 0;
+        }
+        // 用户的使用流量超过总流量就
+        if ($unusedTraffic > $totalTransfer) {
+            $unusedTraffic = 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 = [