dev

test/TestOrderErr.php

@@ -46,13 +46,14 @@ class TestOrderErr extends TestCase
         $filter = function ($lines)
         {
             $logs = [];
-            $keys = explode(',','lg_member_id,lg_member_name,lg_add_time,lg_type,lg_order_sn,lg_av_amount,lg_desc,lg_available');
             foreach ($lines as $line)
             {
-                $ret = preg_match('/VALUES[^(][(]{1}(?P<value>[^)]+)[)]{1}/u', $line, $matches);
+                $ret = preg_match('/lrlz_pd_log[^(]+[(]{1}(?P<key>[^)]+)[)]{1}[\s]+VALUES[^(][(]{1}(?P<value>[^)]+)[)]{1}/u', $line, $matches);
                 if($ret) {
-                    $data = $matches['value'];
-                    $values = explode(',',$data);
+                    $skey = $matches['key'];
+                    $svalue = $matches['value'];
+                    $keys = explode(',',$skey);
+                    $values = explode(',',$svalue);
 
                     $conveter = function ($value) {
                         $val = trim($value, '\'');
@@ -71,10 +72,10 @@ class TestOrderErr extends TestCase
         $mod_log = Model();
         $inserter = function ($logs) use ($mod_log)
         {
-//            $mod_log->table('acclog')->insertAll($logs);
-            foreach ($logs as $log) {
-                $mod_log->table('acclog')->insert($log);
-            }
+            $mod_log->table('acclog')->insertAll($logs);
+//            foreach ($logs as $log) {
+//                $mod_log->table('acclog')->insert($log);
+//            }
         };
 
         $file = fopen($filename,'r');
@@ -89,15 +90,20 @@ class TestOrderErr extends TestCase
 
     public function testSQLMatch()
     {
-        $line =<<< line
-        [cordispatcher 38-123975 2021-12-28 15:22:10 0.261198] ERR: DbError eno=1062 msg=Duplicate entry '2147483647' for key 'lrlz_pd_log.PRIMARY' sql=INSERT  INTO `lrlz_pd_log` (lg_member_id,lg_member_name,lg_add_time,lg_type,lg_order_sn,lg_av_amount,lg_desc,lg_available) VALUES ('66025','5d322c4ee98781023b16d9a3c21cbfb4',1640676130,'order_pay','6861760694020130235975',-48,'下单，支付预存款，订单号: 6861760694020130235975','954256.6700')
-        line;
-
-        $keys = explode(',','lg_member_id,lg_member_name,lg_add_time,lg_type,lg_order_sn,lg_av_amount,lg_desc,lg_available');
-        $ret = preg_match('/VALUES[^(][(]{1}(?P<value>[^)]+)[)]{1}/u', $line, $matches);
+//        $line =<<< line
+//        [cordispatcher 38-123975 2021-12-28 15:22:10 0.261198] ERR: DbError eno=1062 msg=Duplicate entry '2147483647' for key 'lrlz_pd_log.PRIMARY' sql=INSERT  INTO `lrlz_pd_log` (lg_member_id,lg_member_name,lg_add_time,lg_type,lg_order_sn,lg_av_amount,lg_desc,lg_available) VALUES ('66025','5d322c4ee98781023b16d9a3c21cbfb4',1640676130,'order_pay','6861760694020130235975',-48,'下单，支付预存款，订单号: 6861760694020130235975','954256.6700')
+//        line;
+        $line = <<< line
+[cordispatcher 29-126259 2021-12-28 15:22:10 0.836849] ERR: DbError eno=1062 msg=Duplicate entry '2147483647' for key 'lrlz_pd_log.PRIMARY' sql=INSERT  INTO `lrlz_pd_log` (lg_member_id,lg_member_name,lg_add_time,lg_type,lg_order_sn,lg_av_amount,lg_freeze_amount,lg_desc,lg_available) VALUES ('66240','c27517c6553a6f783b8df974c3d2d219',1640676130,'order_cancel','9031520694020106890799',48,-48,'取消订单，解冻预存款，订单
+号: 9031520694020106890799','42192.9500')
+line;
+
+        $ret = preg_match('/lrlz_pd_log[^(]+[(]{1}(?P<key>[^)]+)[)]{1}[\s]+VALUES[^(][(]{1}(?P<value>[^)]+)[)]{1}/u', $line, $matches);
         if($ret) {
-            $data = $matches['value'];
-            $values = explode(',',$data);
+            $skey = $matches['key'];
+            $svalue = $matches['value'];
+            $keys = explode(',',$skey);
+            $values = explode(',',$svalue);
 
             $conveter = function ($value)
             {

test/TestRefillClear.php

@@ -36,7 +36,7 @@ class TestRefillClear extends TestCase
     }
 
     //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember12)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
-    public function testDecember12()
+    public function testDecember2()
     {
         $start_date = strtotime('2021-12-02');
         $end_date   = strtotime('2021-12-03');
@@ -44,7 +44,7 @@ class TestRefillClear extends TestCase
     }
 
     //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember23)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
-    public function testDecember23()
+    public function testDecember3()
     {
         $start_date = strtotime('2021-12-03');
         $end_date   = strtotime('2021-12-04');
@@ -52,7 +52,7 @@ class TestRefillClear extends TestCase
     }
 
     //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember24)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
-    public function testDecember24()
+    public function testDecember4()
     {
         $start_date = strtotime('2021-12-04');
         $end_date   = strtotime('2021-12-05');
@@ -60,7 +60,7 @@ class TestRefillClear extends TestCase
     }
 
     //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember3)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
-    public function testDecember3()
+    public function testDecember6()
     {
         $start_date = strtotime('2021-12-06');
         $end_date   = strtotime('2021-12-07');
@@ -107,6 +107,28 @@ class TestRefillClear extends TestCase
         $this->clear($start_date,$end_date);
     }
 
+    //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember12)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
+    public function testDecember12()
+    {
+        $start_date = strtotime('2021-12-12');
+        $end_date   = strtotime('2021-12-14');
+        $this->clear($start_date,$end_date);
+    }
+    //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember14)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
+    public function testDecember14()
+    {
+        $start_date = strtotime('2021-12-14');
+        $end_date   = strtotime('2021-12-15');
+        $this->clear($start_date,$end_date);
+    }
+    //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testDecember15)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
+    public function testDecember15()
+    {
+        $start_date = strtotime('2021-12-15');
+        $end_date   = strtotime('2021-12-16');
+        $this->clear($start_date,$end_date);
+    }
+
     public function testAllRecords()
     {
         $rorder_getter = function ($mchid,$mch_order,$mod_refill)