命令统计使用流量 完成(测试)

.env

@@ -3,7 +3,7 @@ debug = false
 trace = false
 
 [database]
-hostname = 127.0.0.1
+hostname = 149.129.117.117
 database = proxy_wxvpn_cn
 username = proxy_wxvpn_cn
 password = PijtXhjPZC6bnyjb

application/api/controller/Index.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\model\UserTraffic;
 use fast\Random;
 use think\Queue;
 
@@ -37,8 +38,14 @@ class Index extends Api
         $ret = $this->auth->login($account, $password);
         if ($ret) {
             $user = \app\common\model\User::where(['username'=>$account])->find();
-            if($user->total_traffic < $user->traffic){
-                // 流量已用完
+            $nowTime = time();
+            $usable = UserTraffic::where('uid', $user->id)
+                ->where('is_usable', '1')
+                ->where('start_time', '<', $nowTime)
+                ->where('expired_time', '>', $nowTime)
+                ->find();
+
+            if (!$usable) {
                 return $this->err();
             }
 

application/common/command/SettlementTraffic.php

@@ -50,7 +50,7 @@ class SettlementTraffic extends Command
         Db::startTrans();
         try {
             foreach ($data as $datum) {
-                if (!$this->usedTraffic($userNameMapId[$datum['username']], $datum['bytes'])) {
+                if (!$this->usedTraffic($userNameMapId[$datum['username']], $datum['bytes'], $dateTime)) {
                     throw new Exception('统计用户使用流量失败');
                 }
             }