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

admin/control/refill_order.php

@@ -145,7 +145,7 @@ class refill_orderControl extends SystemControl
             $cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
 
             [$start,$end] = $scope['add_time'];
-            $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+            $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
 
             if(isset($scope['notify_time'])) {
                 [$start,$end] = $scope['notify_time'];
@@ -162,7 +162,7 @@ class refill_orderControl extends SystemControl
 
         $normal = $normal_cond($input);
         if (!empty($input['export'])) {
-            $this->export_execl($normal, $scope);
+            $this->export_execl($normal, $scope, $input);
         }
 
         $tmcond = $time_cond($scope);
@@ -246,7 +246,7 @@ class refill_orderControl extends SystemControl
         Tpl::showpage('refill.order.index');
     }
 
-    private function export_execl($normal_cond, $time_scope)
+    private function export_execl($normal_cond, $time_scope, $input)
     {
         $title = $input['task_title'] ?? '';
         $manager = new task\manager();

data/config/win/refill.ini.php

@@ -2467,32 +2467,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         30 => [
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7065, 'price' => 200.46, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7066, 'price' => 300.69, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7067, 'price' => 501.15, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

data/config/xyz/refill.ini.php

@@ -2467,32 +2467,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         30 => [
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7065, 'price' => 200.46, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7066, 'price' => 300.69, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7067, 'price' => 501.15, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

data/config/xyzadm/refill.ini.php

@@ -2467,32 +2467,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         30 => [
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7065, 'price' => 200.46, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7066, 'price' => 300.69, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7067, 'price' => 501.15, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

helper/refill/api/xyz/guochuang/config.php

@@ -66,7 +66,7 @@ class config
         "4-10-2" => 10.005, "4-20-2" => 20.01, "4-30-2" => 29.91, "4-50-2" => 49.85, "4-100-2" => 99.7, "4-200-2" => 199.4, "4-300-2" => 299.1, "4-500-2" => 498.5,//天津 2
         "4-10-6" => 9.72, "4-20-6" => 19.44, "4-30-6" => 29.16, "4-50-6" => 48.6, "4-100-6" => 97.2, "4-200-6" => 194.4, "4-300-6" => 291.6, "4-500-6" => 486,//辽宁 6
         "4-10-9" => 9.94, "4-20-9" => 19.88, "4-30-9" => 29.82, "4-50-9" => 49.7, "4-100-9" => 99.4,//上海 9
-        "4-10-8" => 10.012, "4-20-8" => 20.024, "4-30-8" => 30.036, "4-50-8" => 50.06, "4-100-8" => 100.12, "4-200-8" => 200.24, "4-300-8" => 300.36, "4-500-8" => 500.6,//黑龙江 8
+        "4-10-8" => 10.01, "4-20-8" => 20.02, "4-30-8" => 30.03, "4-50-8" => 50.05, "4-100-8" => 100.1, "4-200-8" => 200.2, "4-300-8" => 300.3, "4-500-8" => 500.5,//黑龙江 8
         "4-10-29" => 9.82, "4-20-29" => 19.64, "4-30-29" => 29.46, "4-50-29" => 49.1, "4-100-29" => 98.2, "4-200-29" => 196.4, "4-300-29" => 294.6, "4-500-29" => 491,//青海 29
         "4-10-28" => 9.96, "4-20-28" => 19.90, "4-30-28" => 29.88, "4-50-28" => 49.8, "4-100-28" => 99.6, "4-200-28" => 199.2, "4-300-28" => 298.8, "4-500-28" => 498,//甘肃 28
         "4-10-13" => 10.22, "4-20-13" => 19.94, "4-30-13" => 30.27, "4-50-13" => 50.3, "4-100-13" => 100.4, "4-200-13" => 200.6, "4-300-13" => 300.9, "4-500-13" => 501.5,//福建 13

helper/task/handler.php

@@ -67,14 +67,14 @@ class handler
                 $cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
 
                 [$start, $end] = $time_scope['add_time'];
-                $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+                $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
 
                 $cond['refill_order.notify_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
             } else {
                 $cond['refill_order.order_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
 
                 [$start, $end] = $time_scope['add_time'];
-                $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+                $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
             }
 
             return $cond;

test/TestRefillClear.php

@@ -29,8 +29,8 @@ class TestRefillClear extends TestCase
     //docker-compose run -d phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefillClear::testNineMonth)( .*)?$/" --test-suffix TestRefillClear.php /var/www/html/test
     public function testNineMonth()
     {
-        $start_date = strtotime('2021-09-04');
-        $end_date   = strtotime('2021-09-05');
+        $start_date = strtotime('2021-09-05');
+        $end_date   = strtotime('2021-10-01');
 
         $this->clear($start_date,$end_date);
     }