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

data/config/win/refill.ini.php

@@ -2815,6 +2815,19 @@ $huafutong_phone = ['name' => 'huafutong', 'store_id' => 139, 'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$dinghui_phone = ['name' => 'dinghui', 'store_id' => 140, 'qualitys' => '5',
+    'amount' => [
+        10 => [['goods_id' => 7203, 'price' => 9.23, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7204, 'price' => 18.46, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7205, 'price' => 27.69, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7206, 'price' => 46.15, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7207, 'price' => 92.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7208, 'price' => 184.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7209, 'price' => 276.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7210, 'price' => 461.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -2920,7 +2933,8 @@ $phone_providers = [
     ['name' => 'kachong', 'cfg' => $kachong_phone],
     ['name' => 'xingzy_normal', 'cfg' => $xingzy_normal_phone],
     ['name' => 'pushang', 'cfg' => $pushang_phone],
-    ['name' => 'huafutong', 'cfg' => $huafutong_phone]
+    ['name' => 'huafutong', 'cfg' => $huafutong_phone],
+    ['name' => 'dinghui', 'cfg' => $dinghui_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

data/config/xyz/refill.ini.php

@@ -2815,6 +2815,19 @@ $huafutong_phone = ['name' => 'huafutong', 'store_id' => 139, 'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$dinghui_phone = ['name' => 'dinghui', 'store_id' => 140, 'qualitys' => '5',
+    'amount' => [
+        10 => [['goods_id' => 7203, 'price' => 9.23, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7204, 'price' => 18.46, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7205, 'price' => 27.69, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7206, 'price' => 46.15, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7207, 'price' => 92.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7208, 'price' => 184.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7209, 'price' => 276.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7210, 'price' => 461.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -2920,7 +2933,8 @@ $phone_providers = [
     ['name' => 'kachong', 'cfg' => $kachong_phone],
     ['name' => 'xingzy_normal', 'cfg' => $xingzy_normal_phone],
     ['name' => 'pushang', 'cfg' => $pushang_phone],
-    ['name' => 'huafutong', 'cfg' => $huafutong_phone]
+    ['name' => 'huafutong', 'cfg' => $huafutong_phone],
+    ['name' => 'dinghui', 'cfg' => $dinghui_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

data/config/xyzadm/refill.ini.php

@@ -2815,6 +2815,19 @@ $huafutong_phone = ['name' => 'huafutong', 'store_id' => 139, 'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$dinghui_phone = ['name' => 'dinghui', 'store_id' => 140, 'qualitys' => '5',
+    'amount' => [
+        10 => [['goods_id' => 7203, 'price' => 9.23, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7204, 'price' => 18.46, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7205, 'price' => 27.69, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7206, 'price' => 46.15, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7207, 'price' => 92.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7208, 'price' => 184.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7209, 'price' => 276.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7210, 'price' => 461.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -2920,7 +2933,8 @@ $phone_providers = [
     ['name' => 'kachong', 'cfg' => $kachong_phone],
     ['name' => 'xingzy_normal', 'cfg' => $xingzy_normal_phone],
     ['name' => 'pushang', 'cfg' => $pushang_phone],
-    ['name' => 'huafutong', 'cfg' => $huafutong_phone]
+    ['name' => 'huafutong', 'cfg' => $huafutong_phone],
+    ['name' => 'dinghui', 'cfg' => $dinghui_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

helper/refill/api/xyz/dinghui/RefillCallBack.php

@@ -27,7 +27,7 @@ class RefillCallBack implements refill\IRefillCallBack
         }
         $content = rtrim($content,'&');
 
-        return openssl_verify($content, hex2bin($sign), config::PUBLIC_KEY);
+        return openssl_verify($content, hex2bin($sign), config::PROVIDER_PUBLIC_KEY);
     }
 
     private function message_decrypt($message)

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

@@ -6,26 +6,32 @@ namespace refill\dinghui;
 use mtopcard;
 class config
 {
-    const API_URL = 'https://uat.dearvvip.cn/mini_shop/api2/common';
+    const API_URL = 'https://api.dearvvip.cn/mini_shop/api2/common/';
 
     const APP_ID = 'yeziapi';
-    const AES_KEY = '4828917c7356f66109d21ee680000003';
-//    const NOTIFY_URL = BASE_SITE_URL . "/mobile/callback/refill_dinghui.php";
-    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/signature.php";
+    const AES_KEY = '4813517c81fea41a09b16d4d8000040c';
+    const NOTIFY_URL = BASE_SITE_URL . "/mobile/callback/refill_dinghui.php";
     const ExtHeaders = ['Content-Type: application/json'];
 
     const SKU = [
         mtopcard\ChinaMobileCard => [
-
+            50 => 'YEZI_MBF050',
+            100 => 'YEZI_MBF100',
+            200 => 'YEZI_MBF200'
         ],
         mtopcard\ChinaUnicomCard => [
-            50 => 'YEZI_HF050',
+            50 => 'YEZI_MBF050',
+            100 => 'YEZI_MBF100',
+            200 => 'YEZI_MBF200'
         ],
         mtopcard\ChinaTelecomCard => [
-
+            50 => 'YEZI_MBF050',
+            100 => 'YEZI_MBF100',
+            200 => 'YEZI_MBF200'
         ],
     ];
 
+    //发给上游的椰子公钥
     const PUBLIC_KEY = <<<heredoc
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx0L4HWPiyrE7JRb1pnrW
@@ -38,6 +44,7 @@ nwIDAQAB
 -----END PUBLIC KEY-----
 heredoc;
 
+    //椰子私钥（接口请求加密需要）
     const PRIVATE_KEY = <<<heredoc
 -----BEGIN PRIVATE KEY-----
 MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDHQvgdY+LKsTsl
@@ -68,4 +75,17 @@ EjHI6crM3XtfwlCWuMATB2icRFwiC+GTI0EPqSAV0FpbkwlOwAhxnC6mCeZ5RFoE
 /tDVsHQKlok7+KkmqZme4QUzYQ==
 -----END PRIVATE KEY-----
 heredoc;
+
+    //平台公钥(回调验证需要)
+    const PROVIDER_PUBLIC_KEY = <<<heredoc
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OXvVgERl1up1o3Hrj9B
+GIwN280RG04YumITOwayErie2EO3+uVEiQaz6xXtagZuJeZaHGswYXdXXSNsRxYU
+B6Utun4lPlY/1kpnQs0DZySgiPqLTeA6BmgbIPW2fFCjF8zhQs5bagw9xDvKGktA
+e6EV5q4u5nBNn6HaRj5GevVNZqFoXABv8KE5u0mWc1hxEzSykxsRVDQLY6LIjjWD
+7MzRgPy9+P89bmPdAtrunzOnLfAFu7+awAU57kmjfgQIqQpTE3N3sERp33esH0wv
+q+WQcXTv4Y+IYjNPO9i1zMqW/MrbESmI+d7dnHFeSOYxuwaY02P6eW8wwvvpefIv
+ZwIDAQAB
+-----END PUBLIC KEY-----
+heredoc;
 }

helper/refill/api/xyz/dinghui/dhflash_prod_pubkey.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OXvVgERl1up1o3Hrj9B
+GIwN280RG04YumITOwayErie2EO3+uVEiQaz6xXtagZuJeZaHGswYXdXXSNsRxYU
+B6Utun4lPlY/1kpnQs0DZySgiPqLTeA6BmgbIPW2fFCjF8zhQs5bagw9xDvKGktA
+e6EV5q4u5nBNn6HaRj5GevVNZqFoXABv8KE5u0mWc1hxEzSykxsRVDQLY6LIjjWD
+7MzRgPy9+P89bmPdAtrunzOnLfAFu7+awAU57kmjfgQIqQpTE3N3sERp33esH0wv
+q+WQcXTv4Y+IYjNPO9i1zMqW/MrbESmI+d7dnHFeSOYxuwaY02P6eW8wwvvpefIv
+ZwIDAQAB
+-----END PUBLIC KEY-----

helper/refill/api/xyz/dinghui/readme.txt

@@ -0,0 +1,9 @@
+1、本次全部商品根据类型，需要指定同步、异步模式
+2、商品的SKU平台生成分配，参见excel文档
+3、平台公钥证书同目录 dhflash_prod_pubkey.pem
+4、生产AES加密KEY:yeziapi
+5、生产应用app_id:4813517c81fea41a09b16d4d8000040c
+
+后台地址:
+https://act.dearvvip.cn:20002/mini_shop_manage/views/index.html
+15811535608

mobile/callback/refill_dinghui.php

@@ -0,0 +1,4 @@
+<?php
+
+refill\util::push_notify('dinghui',$_POST);
+echo json_encode(['code' => '000000']);