dev

data/config/win/refill.ini.php

@@ -1486,45 +1486,45 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
-        10 => [
-            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
-        20 => [
-            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
+//        10 => [
+//            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
+//        20 => [
+//            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
         30 => [
             ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6746, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6747, 'price' => 47.95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6747, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6748, 'price' => 95.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6748, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6749, 'price' => 191.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6749, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6750, 'price' => 285.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6751, 'price' => 475.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -2470,22 +2470,22 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 300.7, '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']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ]

data/config/xyz/refill.ini.php

@@ -1486,45 +1486,45 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
-        10 => [
-            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
-        20 => [
-            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
+//        10 => [
+//            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
+//        20 => [
+//            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
         30 => [
             ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6746, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6747, 'price' => 47.95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6747, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6748, 'price' => 95.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6748, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6749, 'price' => 191.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6749, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6750, 'price' => 285.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6751, 'price' => 475.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -2470,22 +2470,22 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 300.7, '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']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ]

data/config/xyzadm/refill.ini.php

@@ -1486,45 +1486,45 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
-        10 => [
-            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
-        20 => [
-            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
-        ],
+//        10 => [
+//            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
+//        20 => [
+//            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
+//        ],
         30 => [
             ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6746, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6747, 'price' => 47.95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6747, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6748, 'price' => 95.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6748, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6749, 'price' => 191.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6749, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6750, 'price' => 285.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 6751, 'price' => 475.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -2470,22 +2470,22 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 300.7, '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']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['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']
         ]

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

@@ -83,7 +83,7 @@ class config
         "4-30-16" => 29.835, "4-50-16" => 49.725, "4-100-16" => 99.45, "4-200-16" => 198.9,//河南 16
         "4-50-4" => 49.75, "4-100-4" => 99.5, "4-200-4" => 199,//山西 4
         //联通
-        "5-10-19" => 10.025, "5-20-19" => 20.05, "5-30-19" => 30.105, "5-50-19" => 50.175, "5-100-19" => 100.35, "5-200-19" => 200.7, "5-300-19" => 301.05, "5-500-19" => 501.75,//广东 19
+        "5-10-19" => 10.025, "5-20-19" => 20.05, "5-30-19" => 30.084, "5-50-19" => 50.14, "5-100-19" => 100.28, "5-200-19" => 200.56, "5-300-19" => 300.84, "5-500-19" => 501.4,//广东 19
         "5-10-1" => 9.99, "5-20-1" => 19.98, "5-30-1" => 29.97, "5-50-1" => 49.95, "5-100-1" => 99.9, "5-200-1" => 199.8, "5-300-1" => 299.7, "5-500-1" => 499.5,//北京 1
         "5-10-22" => 10.04, "5-20-22" => 20.08, "5-30-22" => 30.12, "5-50-22" => 50.2, "5-100-22" => 100.4, "5-200-22" => 200.8, "5-300-22" => 301.2, "5-500-22" => 502,//重庆 22
         "5-10-14" => 10.04, "5-20-14" => 20.08, "5-30-14" => 30.12, "5-50-14" => 50.2, "5-100-14" => 100.1, "5-200-14" => 200.2, "5-300-14" => 300.3, "5-500-14" => 500.5,//江西 14

helper/refill/api/xyz/xingzy/RefillPhone.php

@@ -92,6 +92,8 @@ class RefillPhone extends refill\IRefillPhone
                     $order_state = ORDER_STATE_CANCEL;
                 } elseif ($status === 1) {
                     $order_state = ORDER_STATE_SEND;
+                } elseif ($status === 5 && (time() - $refill_info['commit_time'] > 600)) {
+                    $order_state = ORDER_STATE_NOEXIST;
                 } else {
                     return [false, $resp['msg']];
                 }

helper/refill/api/xyz/xingzy_normal/RefillPhone.php

@@ -102,6 +102,8 @@ class RefillPhone extends refill\IRefillPhone
                     $order_state = ORDER_STATE_CANCEL;
                 } elseif ($status === 1) {
                     $order_state = ORDER_STATE_SEND;
+                } elseif ($status === 5 && (time() - $refill_info['commit_time'] > 600)) {
+                    $order_state = ORDER_STATE_NOEXIST;
                 } else {
                     return [false, $resp['msg']];
                 }