Merge branch 'raccount' into rch

admin/config/config.ini.php

@@ -31,7 +31,9 @@ if(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY')
             '趣带娃浦发',
             '国研宁波',
             '游来平安',
-            '福庆顺招行'
+            '福庆顺招行',
+            '椰林光大',
+            '椰林北京',
     ];
 
     $config['server'] = [

data/config/xyz/refill.ini.php

@@ -438,7 +438,7 @@ $oil_providers = [
     ['name' => 'leyou', 'cfg' => $leyou_oil],
     ['name' => 'nanjingpushang_oil', 'cfg' => $nanjingpushang_oil],
     ['name' => 'zhongshiyou_oil', 'cfg' => $zhongshiyou_oil],
-    ['name' => 'xuyou_oil', 'cfg' => $xuyou_oil],
+//    ['name' => 'xuyou_oil', 'cfg' => $xuyou_oil],
 ];
 $config['oil_providers'] = $oil_providers;
 
@@ -10019,7 +10019,7 @@ $phone_providers = [
     ['name' => 'wangxin', 'cfg' => $wangxin_phone],
     ['name' => 'xunyuan', 'cfg' => $xunyuan_phone],
     ['name' => 'nanjingpushang_hf', 'cfg' => $nanjingpushang_hf_phone],
-    ['name' => 'xuyou_hf', 'cfg' => $xuyou_hf_phone],
+//    ['name' => 'xuyou_hf', 'cfg' => $xuyou_hf_phone],
 ];
 $config['phone_providers'] = $phone_providers;
 

data/config/zy/refill.ini.php

@@ -3099,4 +3099,4 @@ $third_providers = [
 $config['third_providers'] = $third_providers;
 
 #油需要发短信的机构
-$config['sms_mchids'] = [19];
+$config['sms_mchids'] = [19, 139, 140];

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

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.18, "4-20-2" => 20.36, "4-30-2" => 30.18, "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.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-6" => 9.78, "4-20-6" => 19.56, "4-30-6" => 29.34, "4-50-6" => 48.9, "4-100-6" => 97.8, "4-200-6" => 195.6, "4-300-6" => 293.4, "4-500-6" => 489,//辽宁 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.86, "4-20-29" => 19.72, "4-30-29" => 29.58, "4-50-29" => 49.3, "4-100-29" => 98.6, "4-200-29" => 197.2, "4-300-29" => 295.8, "4-500-29" => 493,//青海 29

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

@@ -5,8 +5,8 @@ namespace refill\leyou;
 use mtopcard;
 class config
 {
-    const ORDER_URL = 'http://lorp-api.shujubuy.com/api/v1/submitOrder';
-    const QUERY_URL = 'http://lorp-api.shujubuy.com/api/v1/queryOrder';
+    const ORDER_URL   = 'http://lorp-api.shujubuy.com/api/v1/submitOrder';
+    const QUERY_URL   = 'http://lorp-api.shujubuy.com/api/v1/queryOrder';
     const BALANCE_URL = 'http://lorp-api.shujubuy.com/api/v1/queryBalance';
 
     const APP_KEY = '550b3e8e00144ad0b823416cfd83f1ae';
@@ -25,22 +25,21 @@ class config
     ];
 
     const product_code = [
-        mtopcard\PetroChinaCard =>  [
-            50   => 200050,
-            100  => 200100,
-            200  => 200200,
-            500  => 200500,
+        mtopcard\PetroChinaCard => [
+            50 => 200050,
+            100 => 200100,
+            200 => 200200,
+            500 => 200500,
             1000 => 201000
         ],
-        mtopcard\SinopecCard =>
-        [
-            50   => 100050,
-            100  => 100100,
-            200  => 100200,
-            500  => 100500,
+        mtopcard\SinopecCard => [
+            50 => 100050,
+            100 => 100100,
+            200 => 100200,
+            500 => 100500,
             1000 => 101000,
             2000 => 102000
-        ],
+        ]
     ];
 
     const SIGN_KEY_SORT = [

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

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.18, "4-20-2" => 20.36, "4-30-2" => 30.18, "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.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-6" => 9.78, "4-20-6" => 19.56, "4-30-6" => 29.34, "4-50-6" => 48.9, "4-100-6" => 97.8, "4-200-6" => 195.6, "4-300-6" => 293.4, "4-500-6" => 489,//辽宁 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.86, "4-20-29" => 19.72, "4-30-29" => 29.58, "4-50-29" => 49.3, "4-100-29" => 98.6, "4-200-29" => 197.2, "4-300-29" => 295.8, "4-500-29" => 493,//青海 29

helper/refill/policy/xyz/policy.php

@@ -530,6 +530,7 @@ class policy extends ProviderManager implements IPolicy
             "mchid" => $refill_info['mchid'],
             "order_sn" => $refill_info['mch_order'],
             "amount" => $refill_info['refill_amount'],
+            "sale_price" => ncPriceFormat($refill_info['mch_amount']),
             "cardno" => $refill_info['card_no'],
             "trade_no" => $refill_info['order_sn'],
             "idcard" => $refill_info['idcard'] ?? "",

mobile/callback/refill_leyou.php

@@ -1,4 +1,7 @@
 <?php
 
-refill\util::push_notify('leyou',$_POST);
+$content = $_SERVER['post_content'];
+$input = json_decode($content,true);
+
+refill\util::push_notify('leyou',$input);
 echo ('SUCCESS');