Merge branch 'raccount' of 39.97.239.116:gyfl/xyzshop into raccount

helper/refill/ops/order_clear.php

@@ -21,7 +21,7 @@ class order_clear
                 $items = Model()->table('refill_order')
                     ->field('mchid,mch_order,order_time')
                     ->where($cond)
-                    ->order('order_time desc')->limit("{$start},1000")->select();
+                    ->order('order_time asc')->limit("{$start},1000")->select();
                 $i++;
 
                 if(empty($items)) break;
@@ -95,7 +95,7 @@ class order_clear
                 $start = $i * 1000;
                 $ritems = $mod_refill->table('refill_order')->field('*')
                     ->where(['mchid' => $mchid, 'mch_order' => $mch_order])
-                    ->order('order_id desc')
+                    ->order('order_id asc')
                     ->limit("{$start},1000")->master(true)->select();
                 $i++;
 

test/TestRefillClear.php

@@ -111,6 +111,15 @@ class TestRefillClear extends TestCase
         $clear->clear($start_date,$end_date);
     }
 
+    //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testLog202203)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
+    public function testLog202203()
+    {
+        $start_date = strtotime('2022-03-01 13:55:01');
+        $end_date = strtotime('2022-03-03');
+        $clear = new refill\pdlog_clear();
+        $clear->clear($start_date,$end_date);
+    }
+
     public function testImport()
     {
         $filename = BASE_DATA_PATH . "/log/pdlog/2022-01-02-1641055749.csv";