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

admin/control/control.php

@@ -390,6 +390,7 @@ class SystemControl
         $items = Model('')->table('merchant')->limit(1000)->order('company_name asc')->select();
         foreach ($items as &$item) {
             $item['pinyin'] = Pinyin::getPinyin($item['company_name']);
+            $item['alpha'] = substr($item['pinyin'],0,1);
         }
 
         $asc = function ($l,$r)

admin/control/provider.php

@@ -23,7 +23,7 @@ class providerControl extends SystemControl
         }
 
         $provider_list = $provider_model->table('refill_provider,store')
-            ->field('refill_provider.*,store.store_name')
+            ->field('refill_provider.*,store.store_name,store.member_id')
             ->join('inner')
             ->on('store.store_id=refill_provider.store_id')
             ->where($condition)

admin/templates/default/css/skin_0.css

@@ -43,6 +43,9 @@ html{ -webkit-text-size-adjust: none;}
 .w400 { width: 400px;}
 .w830 { width: 830px;}
 
+.w1pre { width: 1%;}
+.w5pre { width: 5%;}
+.w10pre { width: 10%;}
 .w15pre { width: 15%;}
 .w17pre { width: 17%;}
 .w18pre { width: 18%;}

admin/templates/default/provider.index.php

@@ -81,14 +81,10 @@
             <tr class="thead">
                 <th>通道id</th>
                 <th>通道名称</th>
+                <th>店铺ID</th>
+                <th>会员ID</th>
                 <th>通道类型</th>
-                <th>对应店铺ID</th>
-                <th class="align-center">排序</th>
                 <th class="align-center">通道状态</th>
-                <th class="align-center">每单间隔秒数</th>
-                <th class="align-center">需要子进程数量</th>
-                <th class="align-center">每日额度</th>
-                <th class="align-center">每日时间段</th>
                 <th>余额</th>
                 <th class="align-center">操作</th>
             </tr>
@@ -99,9 +95,10 @@
                     <tr class="trFlex">
                         <td><?php echo $v['provider_id']; ?></td>
                         <td><?php echo $v['name']; ?> (<?php echo $v['store_name'];?>)</td>
-                        <td><?php echo $output['type_text'][$v['type']-1]; ?></td>
                         <td><?php echo $v['store_id']; ?></td>
-                        <td class="align-center"><?php echo $v['sort']; ?></td>
+                        <td><?php echo $v['member_id']; ?></td>
+                        <td><?php echo $output['type_text'][$v['type']-1]; ?></td>
+
                         <td class="align-center">
                             <?php if($v['opened'] == 1){?>
                             <span style="color: #0bb20c">
@@ -112,10 +109,6 @@
                             <?php echo $output['opened_text'][$v['opened']-1]; ?>
                                 </span>
                         </td>
-                        <td class="align-center"><?php echo $v['interval_sec']?></td>
-                        <td class="align-center"><?php echo $v['process_num']?></td>
-                        <td class="align-center"><?php echo $v['every_amt']?></td>
-                        <td class="align-center"><?php echo $v['period']?></td>
                         <td>
                             <span class="balance"  data_id="<?php echo $v['provider_id'] ?>" >查询余额</span>
                         </td>
@@ -191,10 +184,10 @@
             }, function(data) {
                 data = JSON.parse(data)
                 // console.log(data);
-                if(data.code == 200) {
+                if(data.code === 200) {
                   var balance = data.balance
                   console.log(balance);
-                } else if (data.code == 500) {
+                } else if (data.code === 500) {
                   var msg = data.msg
                     console.log(msg);
                 }

admin/templates/default/refill.order.index.php

@@ -185,7 +185,7 @@
             </tr>
             <tr>
 
-                <th><label for="query_start_time">下单时间</label></th>
+                <th><label for="query_start_time">接单时间</label></th>
                 <td>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
                            id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
@@ -451,7 +451,7 @@
             <th class="align-center">充值卡号</th>
             <th class="align-center">充值卡类型</th>
             <th class="align-center">充值额度</th>
-            <th class="align-right">下单日期</th>
+            <th class="align-right">接单日期</th>
             <th class="align-right">耗时</th>
             <th class="align-center">订单状态</th>
             <th class="align-center">运营商流水号</th>
@@ -629,7 +629,7 @@
                    <thead>
                              <tr>
                                         <th class="db-right">订单号</th>
-                                         <th class="db-right">下单日期</th>
+                                         <th class="db-right">提单日期</th>
                                          <th class="db-right">回调日期</th>
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>

admin/templates/default/refill.order.search.php

@@ -222,6 +222,7 @@
             <th class="align-right">下单日期</th>
             <th class="align-right">耗时</th>
             <th class="align-center">订单状态</th>
+            <th class="align-center">运营商流水号</th>
             <th class="align-center">通道质量</th>
             <th class="align-center">失败原因</th>
             <th class="align-center">商家单号</th>
@@ -263,6 +264,7 @@
                         <?php } ?>
                     </td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
+                    <td class="align-left"><?php echo $order['official_sn']; ?></td>
                     <td class="align-left"><?php echo $order['quality_text']; ?></td>
                     <td class="align-left"><?php echo $order['err_msg']; ?></td>
                     <td class="align-left"><?php echo $order['mch_order']; ?></td>

data/config/win/refill.ini.php

@@ -199,11 +199,11 @@ $xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '2',
             ['goods_id' => 6965, 'price' => 50.25, 'quality' => 2, 'card_type' => 'petrochina']
         ],
         100 => [
-            ['goods_id' => 6966, 'price' => 101, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6966, 'price' => 100.8, 'quality' => 2, 'card_type' => 'sinopec'],
             ['goods_id' => 6966, 'price' => 100.5, 'quality' => 2, 'card_type' => 'petrochina']
         ],
         200 => [
-            ['goods_id' => 6967, 'price' => 202, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6967, 'price' => 201.6, 'quality' => 2, 'card_type' => 'sinopec'],
             ['goods_id' => 6967, 'price' => 201, 'quality' => 2, 'card_type' => 'petrochina']
         ],
         500 => [
@@ -566,11 +566,11 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6441, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6442, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
@@ -2311,80 +2311,80 @@ $yunchonggong_yd_phone = ['name' => 'yunchonggong_yd', 'store_id' => 120, 'quali
 $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qualitys' => '2',
     'amount' => [
         1  => [
-            ['goods_id' => 7051, 'price' => 1.029, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7051, 'price' => 1.031, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         2  => [
-            ['goods_id' => 7052, 'price' => 2.058, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7052, 'price' => 2.062, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         3  => [
-            ['goods_id' => 7053, 'price' => 3.087, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7053, 'price' => 3.093, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         4  => [
-            ['goods_id' => 7054, 'price' => 4.116, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7054, 'price' => 4.124, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         5  => [
             ['goods_id' => 7055, 'price' => 5.205, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7055, 'price' => 5.145, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7055, 'price' => 5.155, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7055, 'price' => 5.175, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         6  => [
             ['goods_id' => 7056, 'price' => 6.206, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7056, 'price' => 6.174, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7056, 'price' => 6.186, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7056, 'price' => 6.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         7  => [
             ['goods_id' => 7057, 'price' => 7.207, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7057, 'price' => 7.203, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7057, 'price' => 7.217, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7057, 'price' => 7.245, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         8  => [
             ['goods_id' => 7058, 'price' => 8.208, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7058, 'price' => 8.232, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7058, 'price' => 8.248, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7058, 'price' => 8.28, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         9  => [
             ['goods_id' => 7059, 'price' => 9.209, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7059, 'price' => 9.261, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7059, 'price' => 9.279, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7059, 'price' => 9.315, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.07, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7064, 'price' => 100.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7065, 'price' => 201.4, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 302.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7067, 'price' => 503.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
@@ -2661,7 +2661,7 @@ $phone_providers = [
     ['name' => 'yikatong', 'cfg' => $yikatong_phone],
     ['name' => 'sialan_tax', 'cfg' => $sialan_tax_phone],
     ['name' => 'yunchonggong_yd', 'cfg' => $yunchonggong_yd_phone],
-//    ['name' => 'guochuang_nation', 'cfg' => $guochuang_nation_phone],
+    ['name' => 'guochuang_nation', 'cfg' => $guochuang_nation_phone],
     ['name' => 'tianyanman', 'cfg' => $tianyanman_phone],
     ['name' => 'shimier', 'cfg' => $shimier_phone],
     ['name' => 'zhongst_mix', 'cfg' => $zhongst_mix_phone],
@@ -2717,7 +2717,7 @@ $config['merchant_retry_times'] = [
     ],
     10216 => [
         'qualities' => [1 => ['secs' => 530, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
-        'lower_ratio' => ['ratio' => 0.6,'period' => 3600]
+        'lower_ratio' => ['ratio' => 0.4,'period' => 3600]
     ],
     10217 => [
         'qualities' => [1 => ['secs' => 530, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],

data/config/xyz/refill.ini.php

@@ -566,11 +566,11 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6441, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6442, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
@@ -2311,80 +2311,80 @@ $yunchonggong_yd_phone = ['name' => 'yunchonggong_yd', 'store_id' => 120, 'quali
 $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qualitys' => '2',
     'amount' => [
         1  => [
-            ['goods_id' => 7051, 'price' => 1.029, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7051, 'price' => 1.031, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         2  => [
-            ['goods_id' => 7052, 'price' => 2.058, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7052, 'price' => 2.062, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         3  => [
-            ['goods_id' => 7053, 'price' => 3.087, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7053, 'price' => 3.093, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         4  => [
-            ['goods_id' => 7054, 'price' => 4.116, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7054, 'price' => 4.124, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         5  => [
             ['goods_id' => 7055, 'price' => 5.205, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7055, 'price' => 5.145, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7055, 'price' => 5.155, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7055, 'price' => 5.175, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         6  => [
             ['goods_id' => 7056, 'price' => 6.206, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7056, 'price' => 6.174, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7056, 'price' => 6.186, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7056, 'price' => 6.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         7  => [
             ['goods_id' => 7057, 'price' => 7.207, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7057, 'price' => 7.203, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7057, 'price' => 7.217, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7057, 'price' => 7.245, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         8  => [
             ['goods_id' => 7058, 'price' => 8.208, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7058, 'price' => 8.232, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7058, 'price' => 8.248, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7058, 'price' => 8.28, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         9  => [
             ['goods_id' => 7059, 'price' => 9.209, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7059, 'price' => 9.261, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7059, 'price' => 9.279, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7059, 'price' => 9.315, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.07, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7064, 'price' => 100.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7065, 'price' => 201.4, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 302.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7067, 'price' => 503.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]

data/config/xyzadm/refill.ini.php

@@ -566,11 +566,11 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6441, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6442, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
@@ -2311,80 +2311,80 @@ $yunchonggong_yd_phone = ['name' => 'yunchonggong_yd', 'store_id' => 120, 'quali
 $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qualitys' => '2',
     'amount' => [
         1  => [
-            ['goods_id' => 7051, 'price' => 1.029, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7051, 'price' => 1.031, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         2  => [
-            ['goods_id' => 7052, 'price' => 2.058, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7052, 'price' => 2.062, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         3  => [
-            ['goods_id' => 7053, 'price' => 3.087, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7053, 'price' => 3.093, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         4  => [
-            ['goods_id' => 7054, 'price' => 4.116, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7054, 'price' => 4.124, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         5  => [
             ['goods_id' => 7055, 'price' => 5.205, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7055, 'price' => 5.145, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7055, 'price' => 5.155, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7055, 'price' => 5.175, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         6  => [
             ['goods_id' => 7056, 'price' => 6.206, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7056, 'price' => 6.174, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7056, 'price' => 6.186, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7056, 'price' => 6.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         7  => [
             ['goods_id' => 7057, 'price' => 7.207, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7057, 'price' => 7.203, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7057, 'price' => 7.217, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7057, 'price' => 7.245, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         8  => [
             ['goods_id' => 7058, 'price' => 8.208, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7058, 'price' => 8.232, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7058, 'price' => 8.248, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7058, 'price' => 8.28, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         9  => [
             ['goods_id' => 7059, 'price' => 9.209, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7059, 'price' => 9.261, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7059, 'price' => 9.279, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7059, 'price' => 9.315, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.07, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.18, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7064, 'price' => 100.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7064, 'price' => 100.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7065, 'price' => 200.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7065, 'price' => 201.4, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7066, 'price' => 300.9, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7066, 'price' => 302.1, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7067, 'price' => 501.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7067, 'price' => 503.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]

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

@@ -71,7 +71,7 @@ class config
         "4-10-28" => 9.925, "4-20-28" => 19.85, "4-30-28" => 29.775, "4-50-28" => 49.625, "4-100-28" => 99.25, "4-200-28" => 198.5, "4-300-28" => 297.75, "4-500-28" => 496.25,//甘肃 28
         "4-10-13" => 10.02, "4-20-13" => 20.04, "4-30-13" => 30.06, "4-50-13" => 51, "4-100-13" => 100.2, "4-200-13" => 200.4, "4-300-13" => 300.6, "4-500-13" => 501,//福建 13
         "4-10-5" => 9.965, "4-20-5" => 19.93, "4-30-5" => 29.895, "4-50-5" => 49.825, "4-100-5" => 99.65, "4-200-5" => 199.3, "4-300-5" => 298.95, "4-500-5" => 498.25,//内蒙古 5
-        "4-50-18" => 49.575, "4-100-18" => 99.15, "4-200-18" => 198.3,//湖南 18
+        "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
         "4-10-19" => 9.965, "4-20-19" => 19.93, "4-30-19" => 29.895, "4-50-19" => 49.825, "4-100-19" => 99.65, "4-200-19" => 199.3, "4-300-19" => 298.95, "4-500-19" => 498.25,//广东 19
         "4-10-7" => 9.85, "4-20-7" => 19.7, "4-30-7" => 29.55, "4-50-7" => 49.25, "4-100-7" => 98.5, "4-200-7" => 197, "4-300-7" => 295.5, "4-500-7" => 492.5,//吉林 7
         "4-10-1" => 9.99, "4-20-1" => 19.98, "4-30-1" => 29.97, "4-50-1" => 49.95, "4-100-1" => 99.9, "4-200-1" => 199.8, "4-300-1" => 299.7, "4-500-1" => 499.5,//北京 1