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

data/config/xyz/refill.ini.php

@@ -3728,52 +3728,52 @@ $yinghuochong_phone = ['name' => 'yinghuochong', 'store_id' => 159,'qualitys' =>
 $meixu_phone = ['name' => 'meixu', 'store_id' => 160,'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7349, 'price' => 10.065, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7349, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7349, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7349, 'price' => 10.28, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7349, 'price' => 10.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7349, 'price' => 10.36, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         20 => [
-            ['goods_id' => 7350, 'price' => 20.13, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7350, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7350, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7350, 'price' => 20.56, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7350, 'price' => 20.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7350, 'price' => 20.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         30 => [
-            ['goods_id' => 7351, 'price' => 30.195, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7351, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7351, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7351, 'price' => 30.84, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7351, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7351, 'price' => 30.54, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         50 => [
-            ['goods_id' => 7352, 'price' => 50.325, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7352, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7352, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7352, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7352, 'price' => 50.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7352, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         100 => [
-            ['goods_id' => 7353, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7353, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7353, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7353, 'price' => 100.18, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7353, 'price' => 100.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7353, 'price' => 100.23, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         200 => [
-            ['goods_id' => 7354, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7354, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7354, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7354, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7354, 'price' => 200.32, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7354, 'price' => 200.36, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         300 => [
-            ['goods_id' => 7355, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7355, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7355, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7355, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7355, 'price' => 300.48, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7355, 'price' => 300.54, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
-        500 => [
-            ['goods_id' => 7356, 'price' => 499.75, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7356, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7356, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
-        ]
+//        500 => [
+//            ['goods_id' => 7356, 'price' => 500.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7356, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 7356, 'price' => 500.9, 'quality' => 2, 'card_type' => 'chinatelecom']
+//        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -9902,13 +9902,25 @@ $yiqiandq_phone = ['name' => 'yiqiandq', 'store_id' => 377,'qualitys' => '2',
 
 //        50 => [['goods_id' => 8956, 'price' => 50.5, 'quality' => 2, 'card_type' => 'chinatelecom']],
 
-        100 => [['goods_id' => 8957, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+        100 => [
+            ['goods_id' => 8957, 'price' => 100.7, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8957, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        200 => [['goods_id' => 8958, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+        200 => [
+            ['goods_id' => 8957, 'price' => 201.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8958, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        300 => [['goods_id' => 8959, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']],
+        300 => [
+            ['goods_id' => 8957, 'price' => 302.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8959, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        500 => [['goods_id' => 8960, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']]
+        500 => [
+            ['goods_id' => 8957, 'price' => 503.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8960, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -10357,35 +10369,35 @@ $huifen_fast_phone = ['name' => 'huifen_fast', 'store_id' => 391, 'qualitys' =>
 //            ['goods_id' => 9066, 'price' => 21.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
 //            ['goods_id' => 9066, 'price' => 21.1, 'quality' => 2, 'card_type' => 'chinatelecom'],
 //        ],
-//        30 => [
+        30 => [
 //            ['goods_id' => 9067, 'price' => 31.11, 'quality' => 2, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 9067, 'price' => 30.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 9067, 'price' => 30.93, 'quality' => 2, 'card_type' => 'chinatelecom'],
-//        ],
+            ['goods_id' => 9067, 'price' => 31.05, 'quality' => 2, 'card_type' => 'chinatelecom'],
+        ],
         50 => [
             ['goods_id' => 9068, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinamobile'],
 //            ['goods_id' => 9068, 'price' => 51.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 9068, 'price' => 51.55, 'quality' => 2, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 9068, 'price' => 50.75, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 9069, 'price' => 100.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 9069, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 9069, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 9069, 'price' => 100.8, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 9070, 'price' => 201, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 9070, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 9070, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 9070, 'price' => 201.6, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 9071, 'price' => 301.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 9071, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 9071, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 9071, 'price' => 303, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ],
         500 => [
             ['goods_id' => 9072, 'price' => 502.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 9072, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 9072, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 9072, 'price' => 505, 'quality' => 2, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];

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

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.28, "4-20-2" => 20.56, "4-30-2" => 30.84, "4-50-2" => 50.3, "4-100-2" => 100.3, "4-200-2" => 200.6, "4-300-2" => 300.9, "4-500-2" => 501.5,//天津 2
-        "4-10-6" => 9.62, "4-20-6" => 19.24, "4-30-6" => 28.86, "4-50-6" => 48.1, "4-100-6" => 96.2, "4-200-6" => 192.4, "4-300-6" => 288.6, "4-500-6" => 481,//辽宁 6
+        "4-10-6" => 9.63, "4-20-6" => 19.26, "4-30-6" => 28.89, "4-50-6" => 48.15, "4-100-6" => 96.3, "4-200-6" => 192.6, "4-300-6" => 288.9, "4-500-6" => 481.5,//辽宁 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" => 9.98, "4-20-8" => 19.96, "4-30-8" => 29.94, "4-50-8" => 49.9, "4-100-8" => 99.8, "4-200-8" => 199.6, "4-300-8" => 299.4, "4-500-8" => 499,//黑龙江 8
         "4-10-29" => 9.85, "4-20-29" => 19.7, "4-30-29" => 29.55, "4-50-29" => 49.25, "4-100-29" => 98.5, "4-200-29" => 197, "4-300-29" => 295.5, "4-500-29" => 492.5,//青海 29
@@ -76,7 +76,7 @@ class config
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22
-        "4-10-15" => 10.47, "4-20-15" => 20.54, "4-30-15" => 30.57, "4-50-15" => 50.6, "4-100-15" => 99.3, "4-200-15" => 198.6, "4-300-15" => 297.9,//山东 15
+        "4-10-15" => 10.47, "4-20-15" => 20.64, "4-30-15" => 30.66, "4-50-15" => 50.7, "4-100-15" => 99.3, "4-200-15" => 198.6, "4-300-15" => 297.9,//山东 15
         "4-10-10" => 9.945, "4-20-10" => 19.89, "4-30-10" => 30.18, "4-50-10" => 50.2, "4-100-10" => 100.2, "4-200-10" => 200.4, "4-300-10" => 300.6, "4-500-10" => 501,//江苏 10
         "4-10-11" => 9.945, "4-20-11" => 19.89, "4-30-11" => 29.835, "4-50-11" => 49.725, "4-100-11" => 99.45, "4-200-11" => 198.9, "4-300-11" => 298.35, "4-500-11" => 497.25,//浙江 11
         "4-10-17" => 9.945, "4-20-17" => 19.89, "4-30-17" => 29.835, "4-50-17" => 49.725, "4-100-17" => 99.45, "4-200-17" => 198.9, "4-300-17" => 298.35, "4-500-17" => 497.25,//湖北 17

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

@@ -44,10 +44,10 @@ class config
             500 => 30000001588,
         ],
         mtopcard\ChinaTelecomCard => [
-            10 => 30000003442,
-            20 => 30000003443,
-            30 => 30000003444,
-            50 => 30000003445,
+            10 => 100017,
+            20 => 100018,
+            30 => 100019,
+            50 => 100020,
             100 => 100021,
             200 => 100022,
             300 => 100023,

helper/refill/api/xyz/yiqiandq/API.MD

@@ -1,7 +1,7 @@
 
 ## 壹谦（电渠）
 
-- 商户号：M00631eKXy
+- 商户号：100604
 - 登陆密码 ：SJ5iHpH7
 - MD5KEY :hGcGrZQwbBIbtHqy2BSqu8YxiMXuDM9w
 - 接口文档地址: http://118.31.46.58:8080/doc/api.html
@@ -10,4 +10,9 @@
 
 ## 店铺
 - 账号：yiqiandq
-- 密码：yiqiandq67890
+- 密码：yiqiandq67890
+
+2024.5.28 更新
+下单地址：http://120.55.190.198:20000/api/huafei/makeOrder
+查单地址：http://120.55.190.198:20000/api/queryOrder
+余额地址：http://120.55.190.198:20000/api/queryBalance

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

@@ -4,14 +4,15 @@ namespace refill\yiqiandq;
 use mtopcard;
 class config
 {
-    const ORDER_URL = 'http://118.31.46.58:8080/api/huafei/makeOrder';
-    const QUERY_URL = 'http://118.31.46.58:8080/api/queryOrder';
-    const BALANCE_URL = 'http://118.31.46.58:8080/api/queryBalance';
+    const ORDER_URL = 'http://120.55.190.198:20000/api/huafei/makeOrder';
+    const QUERY_URL = 'http://120.55.190.198:20000/api/queryOrder';
+    const BALANCE_URL = 'http://120.55.190.198:20000/api/queryBalance';
 
-    const MCH_ID = 'M00631eKXy';
+    const MCH_ID = '100604';
     const KEY = 'hGcGrZQwbBIbtHqy2BSqu8YxiMXuDM9w';
     const NOTIFY_URL = BASE_SITE_URL . "/mobile/callback/refill_yiqiandq.php";
     const operator = [
+        mtopcard\ChinaMobileCard => '移动',
         mtopcard\ChinaTelecomCard => '电信'
     ];
 }

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

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.28, "4-20-2" => 20.56, "4-30-2" => 30.84, "4-50-2" => 50.3, "4-100-2" => 100.3, "4-200-2" => 200.6, "4-300-2" => 300.9, "4-500-2" => 501.5,//天津 2
-        "4-10-6" => 9.62, "4-20-6" => 19.24, "4-30-6" => 28.86, "4-50-6" => 48.1, "4-100-6" => 96.2, "4-200-6" => 192.4, "4-300-6" => 288.6, "4-500-6" => 481,//辽宁 6
+        "4-10-6" => 9.63, "4-20-6" => 19.26, "4-30-6" => 28.89, "4-50-6" => 48.15, "4-100-6" => 96.3, "4-200-6" => 192.6, "4-300-6" => 288.9, "4-500-6" => 481.5,//辽宁 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" => 9.98, "4-20-8" => 19.96, "4-30-8" => 29.94, "4-50-8" => 49.9, "4-100-8" => 99.8, "4-200-8" => 199.6, "4-300-8" => 299.4, "4-500-8" => 499,//黑龙江 8
         "4-10-29" => 9.85, "4-20-29" => 19.7, "4-30-29" => 29.55, "4-50-29" => 49.25, "4-100-29" => 98.5, "4-200-29" => 197, "4-300-29" => 295.5, "4-500-29" => 492.5,//青海 29
@@ -76,7 +76,7 @@ class config
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22
-        "4-10-15" => 10.47, "4-20-15" => 20.54, "4-30-15" => 30.57, "4-50-15" => 50.6, "4-100-15" => 99.3, "4-200-15" => 198.6, "4-300-15" => 297.9,//山东 15
+        "4-10-15" => 10.47, "4-20-15" => 20.64, "4-30-15" => 30.66, "4-50-15" => 50.7, "4-100-15" => 99.3, "4-200-15" => 198.6, "4-300-15" => 297.9,//山东 15
         "4-10-10" => 9.945, "4-20-10" => 19.89, "4-30-10" => 30.18, "4-50-10" => 50.2, "4-100-10" => 100.2, "4-200-10" => 200.4, "4-300-10" => 300.6, "4-500-10" => 501,//江苏 10
         "4-10-11" => 9.945, "4-20-11" => 19.89, "4-30-11" => 29.835, "4-50-11" => 49.725, "4-100-11" => 99.45, "4-200-11" => 198.9, "4-300-11" => 298.35, "4-500-11" => 497.25,//浙江 11
         "4-10-17" => 9.945, "4-20-17" => 19.89, "4-30-17" => 29.835, "4-50-17" => 49.725, "4-100-17" => 99.45, "4-200-17" => 198.9, "4-300-17" => 298.35, "4-500-17" => 497.25,//湖北 17

helper/refill/api/yl/yuansheng_fs/API.MD

@@ -46,4 +46,8 @@
 267294	广东电信30
 267295	广东电信50
 267296	广东电信100
-267582	广东电信200
+267582	广东电信200
+
+30000005190	陕西移动50元
+31146	陕西移动100
+311618	陕西移动200

helper/refill/api/yl/yuansheng_fs/config.php

@@ -66,6 +66,12 @@ class config
                 100 => '327102',
                 200 => '327630'
             ],
+            //陕西
+            27 => [
+                50 => '30000005190',
+                100 => '31146',
+                200 => '311618'
+            ],
         ]
     ];
 
@@ -78,5 +84,6 @@ class config
         "4-50-20" => 47.5, "4-100-20" => 95, "4-200-20" => 190,//广西 20
         "4-50-10" => 47.5, "4-100-10" => 95, "4-200-10" => 190,//江苏 10
         "4-50-30" => 47.5, "4-100-30" => 95, "4-200-30" => 190,//宁夏 30
+        "4-50-27" => 47.5, "4-100-27" => 95, "4-200-27" => 190,//陕西 27
     ];
 }

test/TestRefill.php

@@ -5710,8 +5710,8 @@ class TestRefill extends TestCase
     public function testyiqiandq()
     {
         $provider = $this->getProvider('yiqiandq');
-//        $resp = $provider->balance();
-        $resp = $provider->add(18074608795, 6, 10, ['order_sn' => $this->make_sn()]);
+        $resp = $provider->balance();
+//        $resp = $provider->add(18074608795, 6, 10, ['order_sn' => $this->make_sn()]);
     }
 
     public function testyiqiandq_fs()