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

admin/control/control.php

@@ -392,7 +392,7 @@ class SystemControl
     {
         $items = Model('')->table('merchant')->where($condition)->limit(1000)->order('company_name asc')->select();
         foreach ($items as &$item) {
-            $item['pinyin'] = Pinyin::getPinyin($item['company_name']);
+            $item['pinyin'] = Pinyin::getPinyin(strtolower($item['company_name']));
             $item['alpha'] = substr($item['pinyin'],0,1);
         }
 

data/config/xyz/refill.ini.php

@@ -1620,22 +1620,22 @@ $yunsuoyaofs_phone = ['name' => 'yunsuoyaofs', 'store_id' => 83, 'qualitys' => '
         20 => [['goods_id' => 6770, 'price' => 19.08, 'quality' => 1, 'card_type' => 'chinamobile']],
         30 => [
             ['goods_id' => 6771, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6771, 'price' => 28.26, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6771, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6771, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6772, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6772, 'price' => 47.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6772, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6772, 'price' => 48, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6773, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6773, 'price' => 94.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6773, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6773, 'price' => 96, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6774, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6774, 'price' => 188.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6774, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6774, 'price' => 192, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [['goods_id' => 6775, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinamobile']],
@@ -1690,22 +1690,22 @@ $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' =>
 //        ],
         30 => [
             ['goods_id' => 6799, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6799, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6799, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6799, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6800, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6800, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6800, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6800, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6801, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6801, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6801, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6801, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6802, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6802, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6802, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6802, 'price' => 189, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
 //        300 => [
@@ -2262,22 +2262,22 @@ $wangliantx_phone = ['name' => 'wangliantx', 'store_id' => 112,'qualitys' => '1'
 //            ['goods_id' => 6980, 'price' => 19.04, 'quality' => 1, 'card_type' => 'chinaunicom']
 //        ],
         30 => [
-            ['goods_id' => 6981, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6981, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6981, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6981, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6982, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6982, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6982, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6982, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6983, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6983, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6983, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6983, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6984, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6984, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6984, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6984, 'price' => 189, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -2576,18 +2576,18 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.31, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7060, 'price' => 10.11, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7060, 'price' => 10.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.23, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.62, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7061, 'price' => 20.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7061, 'price' => 20.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.46, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.27, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.024, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7062, 'price' => 30.15, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7062, 'price' => 30.24, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
@@ -2713,7 +2713,7 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 //            ['goods_id' => 7101, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 7102, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7102, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7102, 'price' => 28.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7102, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -2807,17 +2807,17 @@ $yuanta_phone = ['name' => 'yuanta', 'store_id' => 128, 'qualitys' => '5',
 //        ],
         50 => [
             ['goods_id' => 7119, 'price' => 47.25, 'quality' => 5, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7119, 'price' => 45, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7119, 'price' => 45.25, 'quality' => 5, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7119, 'price' => 45.75, 'quality' => 5, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7120, 'price' => 94.5, 'quality' => 5, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7120, 'price' => 90, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7120, 'price' => 90.5, 'quality' => 5, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7120, 'price' => 91.5, 'quality' => 5, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7121, 'price' => 189, 'quality' => 5, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7121, 'price' => 180, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7121, 'price' => 181, 'quality' => 5, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7121, 'price' => 183, 'quality' => 5, 'card_type' => 'chinatelecom']
         ]
 //        300 => [
@@ -4039,22 +4039,22 @@ $yamiao_normal_phone = ['name' => 'yamiao_normal', 'store_id' => 172, 'qualitys'
         30 => [
             ['goods_id' => 7465, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7465, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7465, 'price' => 28.2, 'quality' => 1, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 7465, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 7466, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7466, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7466, 'price' => 47, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7466, 'price' => 47.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7467, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7467, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7467, 'price' => 94, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7467, 'price' => 94.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7468, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7468, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7468, 'price' => 188, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7468, 'price' => 189.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7469, 'price' => 287.7, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -5225,16 +5225,16 @@ $yamiaoman_phone = ['name' => 'yamiaoman', 'store_id' => 205, 'qualitys' => '5',
 //            ['goods_id' => 7724, 'price' => 27.75, 'quality' => 5, 'card_type' => 'chinatelecom']
 //        ],
         50 => [
-            ['goods_id' => 7725, 'price' => 45, 'quality' => 5, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7725, 'price' => 45.5, 'quality' => 5, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7725, 'price' => 45.5, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7725, 'price' => 46, 'quality' => 5, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7726, 'price' => 90, 'quality' => 5, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7726, 'price' => 91, 'quality' => 5, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7726, 'price' => 91, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7726, 'price' => 92, 'quality' => 5, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7727, 'price' => 180, 'quality' => 5, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7727, 'price' => 182, 'quality' => 5, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7727, 'price' => 182, 'quality' => 5, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7727, 'price' => 184, 'quality' => 5, 'card_type' => 'chinatelecom']
         ],
 //        300 => [
 //            ['goods_id' => 7728, 'price' => 270, 'quality' => 5, 'card_type' => 'chinaunicom'],

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

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 9.99, "4-20-2" => 19.98, "4-30-2" => 29.895, "4-50-2" => 49.825, "4-100-2" => 99.65, "4-200-2" => 199.3, "4-300-2" => 298.95, "4-500-2" => 498.25,//天津 2
-        "4-10-6" => 9.76, "4-20-6" => 19.52, "4-30-6" => 29.28, "4-50-6" => 48.8, "4-100-6" => 97.6, "4-200-6" => 195.2, "4-300-6" => 292.8, "4-500-6" => 488,//辽宁 6
+        "4-10-6" => 9.755, "4-20-6" => 19.51, "4-30-6" => 29.265, "4-50-6" => 48.775, "4-100-6" => 97.55, "4-200-6" => 195.1, "4-300-6" => 292.65, "4-500-6" => 487.75,//辽宁 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, "4-20-8" => 20, "4-30-8" => 30, "4-50-8" => 50, "4-100-8" => 100, "4-200-8" => 200, "4-300-8" => 300, "4-500-8" => 500 ,//黑龙江 8
         "4-10-29" => 9.755, "4-20-29" => 19.51, "4-30-29" => 29.265, "4-50-29" => 48.775, "4-100-29" => 97.55, "4-200-29" => 195.1, "4-300-29" => 292.65, "4-500-29" => 487.75,//青海 29