Merge branch 'ralb' into rtest

data/config/win/refill.ini.php

@@ -1686,32 +1686,32 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 201, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 301.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 502.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1907,11 +1907,11 @@ $xinyang_phone = ['name' => 'xinyang', 'store_id' => 105, 'qualitys' => '2',
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
-//        50 => [
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
-//        ],
+        50 => [
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
         100 => [
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],

data/config/xyz/refill.ini.php

@@ -1686,32 +1686,32 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 201, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 301.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 502.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1907,11 +1907,11 @@ $xinyang_phone = ['name' => 'xinyang', 'store_id' => 105, 'qualitys' => '2',
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
-//        50 => [
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
-//        ],
+        50 => [
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
         100 => [
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],

data/config/xyzadm/refill.ini.php

@@ -1686,32 +1686,32 @@ $sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
         ],
         30 => [
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6854, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 201, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 301.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 502.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1907,11 +1907,11 @@ $xinyang_phone = ['name' => 'xinyang', 'store_id' => 105, 'qualitys' => '2',
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6935, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
-//        50 => [
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 6936, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
-//        ],
+        50 => [
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6936, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
         100 => [
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6937, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],