Merge branch 'raccount' into rchannel

data/config/win/refill.ini.php

@@ -2942,14 +2942,14 @@ $shuoruan_phone = ['name' => 'shuoruan', 'store_id' => 142, 'qualitys' => '2',
 
 $linzhu_phone = ['name' => 'linzhu', 'store_id' => 144,'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 7235, 'price' => 9.51,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 7236, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 7237, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 7238, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 7239, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 7240, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 7241, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 7242, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 7235, 'price' => 9.53,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7236, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7237, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7238, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7239, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7240, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7241, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7242, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -3492,18 +3492,22 @@ $dongye_phone = ['name' => 'dongye', 'store_id' => 162, 'qualitys' => '2',
         100 => [
             ['goods_id' => 7369, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7369, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7369, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7370, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7370, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7370, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 7371, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7371, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7371, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         500 => [
             ['goods_id' => 7372, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7372, 'price' => 485, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7372, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -3882,18 +3886,22 @@ $cangxin_high_phone = ['name' => 'cangxin_high', 'store_id' => 175, 'qualitys' =
         30 => [
             ['goods_id' => 7482, 'price' => 28.92, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7482, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7482, 'price' => 29.1, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 7483, 'price' => 48.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7483, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7483, 'price' => 48.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 7484, 'price' => 96.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7484, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7484, 'price' => 97, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7485, 'price' => 192.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7485, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7485, 'price' => 194, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
 //        300 => [['goods_id' => 7486, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
 //        500 => [['goods_id' => 7487, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]

data/config/xyz/refill.ini.php

@@ -2942,14 +2942,14 @@ $shuoruan_phone = ['name' => 'shuoruan', 'store_id' => 142, 'qualitys' => '2',
 
 $linzhu_phone = ['name' => 'linzhu', 'store_id' => 144,'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 7235, 'price' => 9.51,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 7236, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 7237, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 7238, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 7239, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 7240, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 7241, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 7242, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 7235, 'price' => 9.53,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7236, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7237, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7238, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7239, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7240, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7241, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7242, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -3492,18 +3492,22 @@ $dongye_phone = ['name' => 'dongye', 'store_id' => 162, 'qualitys' => '2',
         100 => [
             ['goods_id' => 7369, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7369, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7369, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7370, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7370, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7370, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 7371, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7371, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7371, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         500 => [
             ['goods_id' => 7372, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7372, 'price' => 485, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7372, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -3882,18 +3886,22 @@ $cangxin_high_phone = ['name' => 'cangxin_high', 'store_id' => 175, 'qualitys' =
         30 => [
             ['goods_id' => 7482, 'price' => 28.92, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7482, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7482, 'price' => 29.1, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 7483, 'price' => 48.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7483, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7483, 'price' => 48.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 7484, 'price' => 96.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7484, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7484, 'price' => 97, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7485, 'price' => 192.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7485, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7485, 'price' => 194, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
 //        300 => [['goods_id' => 7486, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
 //        500 => [['goods_id' => 7487, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]

data/config/xyzadm/refill.ini.php

@@ -2942,14 +2942,14 @@ $shuoruan_phone = ['name' => 'shuoruan', 'store_id' => 142, 'qualitys' => '2',
 
 $linzhu_phone = ['name' => 'linzhu', 'store_id' => 144,'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 7235, 'price' => 9.51,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 7236, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 7237, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 7238, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 7239, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 7240, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 7241, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 7242, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 7235, 'price' => 9.53,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7236, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7237, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7238, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7239, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7240, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7241, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7242, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -3492,18 +3492,22 @@ $dongye_phone = ['name' => 'dongye', 'store_id' => 162, 'qualitys' => '2',
         100 => [
             ['goods_id' => 7369, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7369, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7369, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7370, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7370, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7370, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 7371, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7371, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7371, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         500 => [
             ['goods_id' => 7372, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7372, 'price' => 485, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7372, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -3882,18 +3886,22 @@ $cangxin_high_phone = ['name' => 'cangxin_high', 'store_id' => 175, 'qualitys' =
         30 => [
             ['goods_id' => 7482, 'price' => 28.92, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7482, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7482, 'price' => 29.1, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 7483, 'price' => 48.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7483, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7483, 'price' => 48.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 7484, 'price' => 96.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7484, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7484, 'price' => 97, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7485, 'price' => 192.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7485, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7485, 'price' => 194, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
 //        300 => [['goods_id' => 7486, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
 //        500 => [['goods_id' => 7487, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]

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

@@ -26,12 +26,12 @@ class config
             100 => 3320100,
             200 => 3320200,
         ],
-//        mtopcard\ChinaTelecomCard => [
-//            30  => 2320030,
-//            50  => 2320050,
-//            100 => 2320100,
-//            200 => 2320200,
-//        ],
+        mtopcard\ChinaTelecomCard => [
+            30  => 2320030,
+            50  => 2320050,
+            100 => 2320100,
+            200 => 2320200,
+        ],
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
 }

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

@@ -39,7 +39,8 @@ class config
         mtopcard\ChinaTelecomCard => [
             1 => '30000005430', 2 => '30000005431', 3 => '30000005432', 4 => '30000005433',
             5 => '30000005435', 6 => '30000005436', 7 => '30000005437', 8 => '30000005438', 9 => '30000005439',
-            10 => '30000001080', 20 => '30000001081', 30 => '30000001082'
+            10 => '30000001080', 20 => '30000001081', 30 => '30000001082',
+            100 => '30000001084', 200 => '30000001085', 300 => '30000001086', 500 => '30000001087'
         ],
     ];
 }