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

data/config/win/refill.ini.php

@@ -683,6 +683,7 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
             ['goods_id' => 6470, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6471, 'price' => 502, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1657,22 +1658,22 @@ $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' =>
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6799, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6800, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6801, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6802, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -3276,13 +3277,13 @@ $lexiangdx_phone = ['name' => 'lexiangdx', 'store_id' => 155, 'qualitys' => '1',
 $guantu_phone = ['name' => 'guantu', 'store_id' => 157, 'qualitys' => '1',
     'amount' => [
 //        10 => [
-//            ['goods_id' => 7325, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 7325, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 7325, 'price' => 9.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7325, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
 //            ['goods_id' => 7325, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinatelecom']
 //        ],
 //        20 => [
-//            ['goods_id' => 7326, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile'],
-//            ['goods_id' => 7326, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 7326, 'price' => 19.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7326, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom'],
 //            ['goods_id' => 7326, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinatelecom']
 //        ],
         30 => [
@@ -3306,12 +3307,12 @@ $guantu_phone = ['name' => 'guantu', 'store_id' => 157, 'qualitys' => '1',
             ['goods_id' => 7330, 'price' => 191, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
-//            ['goods_id' => 7331, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7331, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7331, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom'],
 //            ['goods_id' => 7331, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
-//            ['goods_id' => 7332, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 7332, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7332, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom'],
 //            ['goods_id' => 7332, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]

data/config/xyz/refill.ini.php

@@ -683,6 +683,7 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
             ['goods_id' => 6470, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6471, 'price' => 502, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1657,22 +1658,22 @@ $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' =>
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6799, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6800, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6801, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6802, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

data/config/xyzadm/refill.ini.php

@@ -683,6 +683,7 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
             ['goods_id' => 6470, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6471, 'price' => 502, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1657,22 +1658,22 @@ $yunchonggong_phone = ['name' => 'yunchonggong', 'store_id' => 87,'qualitys' =>
 //            ['goods_id' => 6798, 'price' => 18.94, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
 //        ],
         30 => [
-            ['goods_id' => 6799, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6799, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6799, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6799, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6800, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6800, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6800, 'price' => 47.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6800, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6801, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6801, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6801, 'price' => 94.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6801, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6802, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6802, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6802, 'price' => 189.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6802, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

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

@@ -18,6 +18,7 @@ class RefillCallBack implements refill\IRefillCallBack
 
     private function sign($params)
     {
+        $params['price'] = number_format($params['price'], 3);
         $mchid = config::MCHID;
         $key = config::KEY;
         $content  = "mchid={$mchid}&orderid={$params['orderid']}&oid={$params['oid']}&status={$params['status']}&price={$params['price']}&key={$key}";

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

@@ -18,6 +18,7 @@ class RefillCallBack implements refill\IRefillCallBack
 
     private function sign($params)
     {
+        $params['price'] = number_format($params['price'], 3);
         $mchid = config::MCHID;
         $key = config::KEY;
         $content  = "mchid={$mchid}&orderid={$params['orderid']}&oid={$params['oid']}&status={$params['status']}&price={$params['price']}&key={$key}";

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

@@ -18,6 +18,7 @@ class RefillCallBack implements refill\IRefillCallBack
 
     private function sign($params)
     {
+        $params['price'] = number_format($params['price'], 3);
         $mchid = config::MCHID;
         $key = config::KEY;
         $content  = "mchid={$mchid}&orderid={$params['orderid']}&oid={$params['oid']}&status={$params['status']}&price={$params['price']}&key={$key}";

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

@@ -16,10 +16,11 @@ class config
     const PRODUCT = [
         mtopcard\ChinaMobileCard => [
             30  => 100088,
-            50  => 100089,
-            100 => 100090,
-            200 => 100091,
-            300 => 100092
+            50  => 100009,
+            100 => 100010,
+            200 => 100011,
+            300 => 100012,
+            500 => 100013
         ],
         mtopcard\ChinaUnicomCard => [
             1  	=> 100014,

test/TestRefill.php

@@ -1731,10 +1731,10 @@ class TestRefill extends TestCase
     {
 //        $provider = $this->getProvider('tianchen');
 //        $resp = $provider->balance();
-//        $resp = $provider->add(18500608333, mtopcard\ChinaUnicomCard, 30, ['order_sn' => $this->make_sn()]);
-//        $resp = $provider->query(['order_sn' => '98611642750278735113']);
+//        $resp = $provider->add(18500608333, mtopcard\ChinaUnicomCard, 500, ['order_sn' => $this->make_sn()]);
+//        $resp = $provider->query(['order_sn' => '60701644202744810497']);
 
-        $body = '{"mchid":"100125","msg":"充值失败","oid":"1000060134816","orderid":"98611642750278735113","price":30.06,"sign":"9f3ec3963d1d2659937b73ac53f5e397","status":2,"voucher":""}';
+        $body = '{"mchid":"100125","msg":"充值失败","oid":"1000061410881","orderid":"60701644202744810497","price":"501.000","sign":"5dc1f9e466f30f02f2756c886ad36020","status":"2","voucher":""}';
         $params = json_decode($body, true);
         $provider = $this->getProvider('tianchen','RefillCallBack');
         $ret = $provider->verify($params);