Merge branch 'raccount' into mctl

admin/control/provider_price.php

@@ -24,8 +24,16 @@ class provider_priceControl extends SystemControl
             showMessage('卡类型有误');
             exit;
         }
-
-        $providers = $this->providers(['type' => $card_type]);
+        $condition['type'] = $card_type;
+        $condition['opened'] = 1;
+        $all_providers = $this->providers($condition);
+        if(!empty($_GET['provider_id'])) {
+            $condition['provider_id'] = $_GET['provider_id'];
+        }
+        if(!empty($_GET['quality'])) {
+            $condition['qualitys'] = ['like', '%' . $_GET['quality'] . '%'];
+        }
+        $providers = $this->providers($condition);
 
         $data = [];
         foreach ($providers as $provider) {
@@ -38,12 +46,22 @@ class provider_priceControl extends SystemControl
             foreach ($card_types as $card_type) {
                 foreach ($specs as $spec) {
                     $key = "{$name}-{$card_type}-{$spec}";
-                    $price[$key] = $configs[$name][$key] ?? '/';
+                    if (!empty($configs[$name][$key]) && array_key_exists($key, $configs[$name])) {
+                        $price[$key] = $configs[$name][$key];
+                    } else {
+                        $price[$key] = '/';
+                    }
                 }
             }
             $data[$provider_id]['price'] = $price;
         }
+
+        $card_type_texts = [mtopcard\PetroChinaCard => '中石油', mtopcard\SinopecCard => '中石化', mtopcard\ChinaMobileCard => '中国移动', mtopcard\ChinaUnicomCard => '中国联通', mtopcard\ChinaTelecomCard => '中国电信'];
+        Tpl::output('provider_list', $all_providers);
+        Tpl::output('card_types', $card_types);
+        Tpl::output('card_type_text', $card_type_texts);
         Tpl::output('data', $data);
+        Tpl::output('specs', $specs);
         Tpl::showpage('provider.price');
     }
 

admin/include/menu.php

@@ -113,7 +113,7 @@ $arr = array(
 					array('args'=>'index,refill_refund,merchant',			'text'=>'退款信息管理'),
 					array('args'=>'index,order_search,merchant',			'text'=>'客服订单查询'),
 					array('args'=>'index,refill_detail,merchant',			'text'=>'接单查询'),
-					array('args'=>'index,provider_price,merchant',			'text'=>'通道价格明细'),
+					array('args'=>'index,provider_price&card_type=2,merchant',			'text'=>'通道价格明细'),
 				)
 			),
 			4 => array(

admin/templates/default/merchant.index.php

@@ -70,10 +70,10 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                 <th class="align-center"><?php echo $lang['merchant_name']; ?>编号</th>
                 <th class="align-left" style="text-align: left">机构账号</th>
                 <th class="align-center">会员ID</th>
-                <th class="align-left">机构公司名称</th>
-                <th class="align-right" style="text-align: right">所剩余额</th>
-                <th class="align-right" style="text-align: right">授信额度</th>
-                <th class="align-right" style="text-align: right">预警余额</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-left">上次登录ip</th>
                 <th class="align-left">上次登录日期</th>
@@ -91,8 +91,8 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                         <td class="align-center"><?php echo $v['mchid']; ?></td>
                         <td class="align-left"><?php echo $v['name']; ?></td>
                         <td class="align-center"><?php echo $v['admin_id']; ?></td>
-                        <td class="align-left"><?php echo $v['company_name']; ?></td>
-                        <td id="just" class="" style="text-align: right">
+                        <td class="align-center"><?php echo $v['company_name']; ?></td>
+                        <td id="just" class="align-right">
                             <?php if($v['available_predeposit'] > 0){?>
                                 <span style="color: #0bb20c">
                             <?php }?>
@@ -102,8 +102,8 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                             <?php echo $v['available_predeposit'];?>
                                 </span>
                         </td>
-                        <td style="text-align: right" class="align-right"><?php echo $v['credit_bonus']; ?></td>
-                        <td class="align-right" style="text-align: right"><?php echo $v['alarm_amount']; ?></td>
+                        <td class="align-right"><?php echo $v['credit_bonus']; ?></td>
+                        <td class="align-right"><?php echo $v['alarm_amount']; ?></td>
                         <td  class="align-center">
                             <?php if($v['merchant_state'] == 1){?>
                                 <span style="color: #0bb20c">

admin/templates/default/merchant.ratios.php

@@ -11,8 +11,32 @@
     .layui-form-select .layui-input {
         height:26px;
     }
-    input::placeholder{ 
-        color:#333; 
+    input::placeholder{
+        color:#333;
+    }
+    #tablee tbody {
+        display:block;
+        height: 600px;
+        overflow-y:scroll;
+    }
+    #tablee thead,
+    .tbodyd tr {
+        display:table;
+        width:100%;
+        table-layout:fixed;
+    }
+    .w1pre {
+        width: 6%!important;
+    }
+    .w1p {
+        width: 3.5%!important;
+
+    }
+    #tablee thead {
+        width: calc( 100% - 1em )
+    }
+    .scrollTable .fixed-bar {
+        top: 115px!important;
     }
 </style>
 <div class="page">
@@ -33,11 +57,11 @@
         <div style="float: right; margin: 0px 69px 0 0">
             <p>三分钟：移 | 联 | 电(平均成功率/成功单量)</p>
             <?php if (!empty($output['list']) && is_array($output['list'])) { ?>
-            <p class="align-center"style=" margin: 7px 0">
-                <?php foreach ($output['stats'] as $stats){ ?>
-                    <?php echo (ncPriceFormat($stats['ratio'] / $stats['count']) * 100) ?? 0;?>%(<?php echo ncPriceFormat(($stats['success'] / $stats['count'])) ?? 0;?>)￥
-                <?php }?>
-            </p>
+                <p class="align-center"style=" margin: 7px 0">
+                    <?php foreach ($output['stats'] as $stats){ ?>
+                        <?php echo (ncPriceFormat($stats['ratio'] / $stats['count']) * 100) ?? 0;?>%(<?php echo ncPriceFormat(($stats['success'] / $stats['count'])) ?? 0;?>)￥
+                    <?php }?>
+                </p>
             <?php }else{?>
                 <p class="align-center"style=" margin: 7px 0">
                     0%(0)￥ 0%(0)￥ 0%(0)
@@ -51,84 +75,86 @@
             </tbody>
         </table>
     </form>
-    <form method="post" id="merchant_name_form">
+    <form method="post" id="merchant_name_form" class="scrollTable">
         <input type="hidden" name="form_submit" value="ok"/>
-        <table class="table tb-type2">
-            <thead>
-            <tr class="thead">
-                <th class="align-center w1pre">机构编码</th>
-                <th class="align-center w1pre">机构名称</th>
-                <th class="align-center w1pre">超时时间(秒)</th>
-                <th class="align-center w5pre">15分钟: 总(成功,失败,总订单数) <br> 移 | 联 | 电 (成功单量)</th>
-                <th class="align-center w10pre">30分钟</th>
-                <th class="align-center w10pre">1小时</th>
-                <th class="align-center w10pre">2小时</th>
-                <th class="align-center w10pre">当天</th>
-            </thead>
-            <tbody>
-            <?php if (!empty($output['list']) && is_array($output['list'])) { ?>
-                <?php foreach ($output['list'] as $k => $v) { ?>
-                    <tr class="trFlex">
-                        <td class="align-center"><?php echo $k;?></td>
-                        <td class="align-center"><?php echo $v['company_name'];?></td>
-                        <td class="align-center"><?php echo $v['time_out'];?></td>
-                        <td class="align-center">
-                            <?php if(($v['ratio']['ALL'][900][0] + $v['ratio']['ALL'][900][1]) > 0){?>
-                                <?php echo ($v['ratio']['ALL'][900][2] * 100) ?? 0;?>%(<span style="color: #2d7255; display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][900][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][900][1]) ?? 0;?></span> ,<?php echo ($v['ratio']['ALL'][900][0] + $v['ratio']['ALL'][900][1]) ?? 0;?>) <br>
-                                <?php echo ($v['ratio']['YD'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][900][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][900][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][900][0]) ?? 0;?>)
-                            <?php }else{?>
+        <div id='scrollTable' class="fixed-bar">
+            <table class="table tb-type2" id="tablee">
+                <thead>
+                <tr class="thead">
+                    <th class="align-center w1p">机构编码</th>
+                    <th class="align-center w1p">机构名称</th>
+                    <th class="align-center w1p">超时时间(秒)</th>
+                    <th class="align-center w10pre">15分钟: 总(成功,失败,总订单数) <br> 移 | 联 | 电 (成功单量)</th>
+                    <th class="align-center w10pre">30分钟</th>
+                    <th class="align-center w10pre">1小时</th>
+                    <th class="align-center w10pre">2小时</th>
+                    <th class="align-center w10pre">当天</th>
+                </thead>
+                <tbody class="tbodyd">
+                <?php if (!empty($output['list']) && is_array($output['list'])) { ?>
+                    <?php foreach ($output['list'] as $k => $v) { ?>
+                        <tr class="trFlex">
+                            <td class="align-center w1pre"><?php echo $k;?></td>
+                            <td class="align-center w1pre"><?php echo $v['company_name'];?></td>
+                            <td class="align-center w1pre"><?php echo $v['time_out'];?></td>
+                            <td class="align-center">
+                                <?php if(($v['ratio']['ALL'][900][0] + $v['ratio']['ALL'][900][1]) > 0){?>
+                                    <?php echo ($v['ratio']['ALL'][900][2] * 100) ?? 0;?>%(<span style="color: #2d7255; display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][900][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][900][1]) ?? 0;?></span> ,<?php echo ($v['ratio']['ALL'][900][0] + $v['ratio']['ALL'][900][1]) ?? 0;?>) <br>
+                                    <?php echo ($v['ratio']['YD'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][900][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][900][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][900][0]) ?? 0;?>)
+                                <?php }else{?>
+                                    ——
+                                <?php }?>
+                            </td>
+                            <td class="align-center">
+                                <?php if(($v['ratio']['ALL'][1800][0] + $v['ratio']['ALL'][1800][1]) > 0){?>
+                                    <?php echo ($v['ratio']['ALL'][1800][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][1800][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][1800][1]) ?? 0;?></span> ,<?php echo ($v['ratio']['ALL'][1800][0] + $v['ratio']['ALL'][1800][1]) ?? 0;?>) <br>
+                                    <?php echo ($v['ratio']['YD'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][1800][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][1800][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][1800][0]) ?? 0;?>)
+                                <?php }else{?>
+                                    ——
+                                <?php }?>
+                            </td>
+                            <td class="align-center">
+                                <?php if(($v['ratio']['ALL'][3600][0] + $v['ratio']['ALL'][3600][1]) > 0){?>
+                                    <?php echo ($v['ratio']['ALL'][3600][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][3600][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][3600][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][3600][0] + $v['ratio']['ALL'][3600][1]) ?? 0;?>) <br>
+                                    <?php echo ($v['ratio']['YD'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][3600][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][3600][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][3600][0]) ?? 0;?>)
+                                <?php }else{?>
+                                    ——
+                                <?php }?>
+                            </td>
+                            <td class="align-center">
+                                <?php if(($v['ratio']['ALL'][7200][0] + $v['ratio']['ALL'][7200][1]) > 0){?>
+                                    <?php echo ($v['ratio']['ALL'][7200][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][7200][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][7200][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][7200][0] + $v['ratio']['ALL'][7200][1]) ?? 0;?>) <br>
+                                    <?php echo ($v['ratio']['YD'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][7200][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][7200][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][7200][0]) ?? 0;?>)
+                                <?php }else{?>
+                                    ——
+                                <?php }?>
+                            </td>
+                            <td class="align-center">
+                                <?php if(($v['ratio']['ALL'][86400][0] + $v['ratio']['ALL'][86400][1]) > 0){?>
+                                    <?php echo ($v['ratio']['ALL'][86400][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][86400][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][86400][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][86400][0] + $v['ratio']['ALL'][86400][1]) ?? 0;?>) <br>
+                                    <?php echo ($v['ratio']['YD'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][86400][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][86400][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][86400][0]) ?? 0;?>)
+                                <?php }else{?>
                                     ——
-                            <?php }?>
-                        </td>
-                        <td class="align-center">
-                            <?php if(($v['ratio']['ALL'][1800][0] + $v['ratio']['ALL'][1800][1]) > 0){?>
-                                <?php echo ($v['ratio']['ALL'][1800][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][1800][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][1800][1]) ?? 0;?></span> ,<?php echo ($v['ratio']['ALL'][1800][0] + $v['ratio']['ALL'][1800][1]) ?? 0;?>) <br>
-                                <?php echo ($v['ratio']['YD'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][1800][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][1800][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][1800][0]) ?? 0;?>)
-                            <?php }else{?>
-                                    —— 
-                            <?php }?>
-                        </td>
-                        <td class="align-center">
-                            <?php if(($v['ratio']['ALL'][3600][0] + $v['ratio']['ALL'][3600][1]) > 0){?>
-                                <?php echo ($v['ratio']['ALL'][3600][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][3600][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][3600][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][3600][0] + $v['ratio']['ALL'][3600][1]) ?? 0;?>) <br>
-                                <?php echo ($v['ratio']['YD'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][3600][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][3600][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][3600][0]) ?? 0;?>)
-                            <?php }else{?>
-                                ——                                
-                            <?php }?>
-                        </td>
-                        <td class="align-center">
-                            <?php if(($v['ratio']['ALL'][7200][0] + $v['ratio']['ALL'][7200][1]) > 0){?>
-                                <?php echo ($v['ratio']['ALL'][7200][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][7200][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][7200][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][7200][0] + $v['ratio']['ALL'][7200][1]) ?? 0;?>) <br>
-                                <?php echo ($v['ratio']['YD'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][7200][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][7200][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][7200][0]) ?? 0;?>)
-                            <?php }else{?>
-                                —— 
-                            <?php }?>
-                        </td>
-                        <td class="align-center">
-                            <?php if(($v['ratio']['ALL'][86400][0] + $v['ratio']['ALL'][86400][1]) > 0){?>
-                                <?php echo ($v['ratio']['ALL'][86400][2] * 100) ?? 0;?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][86400][0]) ?? 0;?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][86400][1]) ?? 0;?></span>,<?php echo ($v['ratio']['ALL'][86400][0] + $v['ratio']['ALL'][86400][1]) ?? 0;?>) <br>
-                                <?php echo ($v['ratio']['YD'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][86400][0]) ?? 0;?>)￥<?php echo ($v['ratio']['LT'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][86400][0]) ?? 0;?>)￥<?php echo ($v['ratio']['DX'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][86400][0]) ?? 0;?>)
-                            <?php }else{?>
-                                —— 
-                            <?php }?>
-                        </td>
+                                <?php }?>
+                            </td>
+                        </tr>
+                    <?php } ?>
+                <?php } else { ?>
+                    <tr class="no_data">
+                        <td colspan="8"><?php echo $lang['nc_no_record']; ?></td>
                     </tr>
                 <?php } ?>
-            <?php } else { ?>
-                <tr class="no_data">
-                    <td colspan="8"><?php echo $lang['nc_no_record']; ?></td>
+                </tbody>
+                <tfoot>
+                <tr class="tfoot">
+                    <td></td>
+                    <td colspan="8">
+                        <div class="pagination"><?php echo $output['show_page']; ?></div>
+                    </td>
                 </tr>
-            <?php } ?>
-            </tbody>
-            <tfoot>
-            <tr class="tfoot">
-                <td></td>
-                <td colspan="8">
-                    <div class="pagination"><?php echo $output['show_page']; ?></div>
-                </td>
-            </tr>
-            </tfoot>
-        </table>
+                </tfoot>
+            </table>
+        </div>
         <!-- <span style="color: red;font-size: 16px;">移 | 联 | 电</span> -->
     </form>
 </div>
@@ -152,13 +178,13 @@
         });
         // 表格hover时背景
         $('.trFlex').each(function () {
-            $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#f5f6ff"); 
+            $("tbody>tr:odd").css("background-color","#FEF2E8");
+            $("tbody>tr:even").css("background-color","#f5f6ff");
             $(this).hover(function () {
-            $(this)[0].style.backgroundColor = '#cbe9f3'
+                $(this)[0].style.backgroundColor = '#cbe9f3'
             },function() {
-            $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#f5f6ff"); 
+                $("tbody>tr:odd").css("background-color","#FEF2E8");
+                $("tbody>tr:even").css("background-color","#f5f6ff");
             })
         })
         // 导出

admin/templates/default/provider.price.php

@@ -1,5 +1,7 @@
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 <style>
+    
+
     .page .fixed-bar .item-title h3 {
         margin-top:18px !important;
         margin-bottom:10px !important;
@@ -14,314 +16,139 @@
     input::placeholder{ 
         color:#333; 
     }
+    #tablee tbody {
+        display:block;
+        height: 600px;
+        overflow-y:scroll;
+    }
+    #tablee thead,
+    .tbodyd tr {
+        display:table;
+        width:100%;
+        table-layout:fixed;
+    }
+    #tablee thead {
+        width: calc( 100% - 1em )
+    }
+    .scrollTable .fixed-bar {
+        top: 115px!important;
+    }
+    .tbodyd tr:hover { background-color : #cbe9f3!important;}
+    .tbodyd tr:hover td { background : none!important;}
+
 </style>
 <div class="page">
     <div class="fixed-bar">
         <div class="item-title">
             <h3>通道金额明细</h3>
             <ul class="tab-base">
-                <li><a href="JavaScript:void(0);" class="current" ><span>折扣明细</span></a></li>
+                <li><a href="index.php?act=provider_price&op=index&card_type=<?php echo mtopcard\PhoneCardPaper?>" class="classA" data-type="<?php echo mtopcard\PhoneCardPaper;?>"><span>话费折扣</span></a></li>
+                <li><a href="index.php?act=provider_price&op=index&card_type=<?php echo mtopcard\OilCardPaper?>" class="classA" data-type="<?php echo mtopcard\OilCardPaper?>"><span>油卡折扣</span></a></li>
             </ul>
         </div>
     </div>
     <div class="fixed-empty"></div>
     <form method="get" name="formSearch" id="formSearch" class="layui-form">
-        <input type="hidden" value="refill_refund" name="act">
-        <input type="hidden" value="merchant_ratios" name="op">
+        <input type="hidden" value="provider_price" name="act">
+        <input type="hidden" value="index" name="op">
+        <input type="hidden" name="export" value=""/>
         <table class="tb-type1 noborder search">
-            <tbody>
+            <tbody id="tableHread">
             <tr>
+                <th><label>通道名称</label></th>
+                <td>
+                    <select name="provider_id" class="querySelect" lay-verify="" lay-search>
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <?php foreach($output['provider_list'] as $provider){?>
+                            <option value="<?php echo $provider['provider_id']?>"
+                                    <?php if ($_GET['provider_id'] == $provider['provider_id']){ ?>selected<?php } ?>><?php echo $provider['store_name']?>
+                            </option>
+                        <?php }?>
+                    </select>
+                </td>
+
+                <th><label style="margin-left: 15px;">通道质量</label></th>
+                <td>
+                    <select name="quality" class="querySelect">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="<?php echo refill\Quality::Normal;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::Normal){ ?>selected<?php } ?>>普充（无流水）
+                        </option>
+                        <option value="<?php echo refill\Quality::Quick;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::Quick){ ?>selected<?php } ?>>快充
+                        </option>
+                        <option value="<?php echo refill\Quality::CardKey;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::CardKey){ ?>selected<?php } ?>>卡密
+                        </option>
+                        <option value="<?php echo refill\Quality::ThirdShop;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::ThirdShop){ ?>selected<?php } ?>>三方
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowTwentyFour;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::SlowTwentyFour){ ?>selected<?php } ?>>慢24(有流水)
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowSix;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::SlowSix){ ?>selected<?php } ?>>慢6
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowTwo;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::SlowTwo){ ?>selected<?php } ?>>慢2
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowFortyEight;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::SlowFortyEight){ ?>selected<?php } ?>>慢48
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowSeventyTwo;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::SlowSeventyTwo){ ?>selected<?php } ?>>慢72
+                        </option>
+                        <option value="<?php echo refill\Quality::Fastest;?>"
+                                <?php if ($_GET['quality'] == refill\Quality::Fastest){ ?>selected<?php } ?>>速充
+                        </option>
+                    </select>
+                </td>
+                <td>
+                    <a style="margin-left: 15px;" href="javascript:void(0);" id="ncsubmit" class="btn-search "
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>
+                </td>
             </tr>
             </tbody>
         </table>
     </form>
-    <form method="post" id="merchant_name_form">
+    <form method="post" id="merchant_name_form" class="scrollTable">
         <input type="hidden" name="form_submit" value="ok"/>
-        <table class="table tb-type2">
-            <thead>
+        <div id='scrollTable' class="fixed-bar">
+        <table style="width: 100%" class="table tb-type2" id="tablee">
+            <thead id="tbody">
+            <tr class="thead">
+                <th rowspan="2" class="align-center">通道ID</th>
+                <th rowspan="2" class="align-center">通道名称</th>
+                <?php foreach ($output['card_types'] as $card_type) {?>
+                    <th colspan="<?php echo count($output['specs']);?>" class="align-center" data-type="<?php echo $card_type;?>">
+                        <?php echo $output['card_type_text'][$card_type];?>
+                    </th>
+                <?php }?>
+            </tr> 
+            
             <tr class="thead">
-                <th class="align-center w1pre">通道组ID</th>
-                <th class="align-center w1pre">通道组名称</th>
-                <th class="align-center w1pre">通道组编码</th>
-                <th class="align-center">10元</th>
-                <th class="align-center">20元</th>
-                <th class="align-center">30元</th>
-                <th class="align-center">50元</th>
-                <th class="align-center">100元</th>
-                <th class="align-center">200元</th>
-                <th class="align-center">300元</th>
-                <th class="align-center">500元</th>
-                <th class="align-center">1000元</th>
-                <th class="align-center">2000元</th>
-                <th class="align-center">实时余额</th>
+                <?php foreach ($output['card_types'] as $card_type) {?>
+                <?php foreach ($output['specs'] as $spec){ ?>
+                        <th class="align-center" data-type="<?php echo $card_type;?>"><?php echo $spec;?>元</th>
+                    <?php }?>
+                <?php }?>
+            </tr> 
             </thead>
-            <tbody>
-            <tr class="trFlex">
-                <td rowspan="3" class="align-center" style="color: red">中国移动</td>
-                        <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    
-            <tr class="trFlex">
-                        <td class="align-center">11</td>
-                        <!-- <td class="align-center">中国移动</td> -->
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <!-- <td class="align-center">中国移动</td> -->
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                        <td rowspan="3" class="align-center" style="color: red">中国联通</td>
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    
-                    <tr  class="trFlex"> 
-                        <td rowspan="3" class="align-center" style="color: red">中国电信</td>
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    
-                    <tr  class="trFlex"> 
-                        <td rowspan="3" class="align-center" style="color: red">石油</td>
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    
-                    <tr  class="trFlex"> 
-                        <td rowspan="3" class="align-center" style="color: red">石化</td>
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-                    <tr  class="trFlex"> 
-                    <td class="align-center">11</td>
-                        <td class="align-center">2211</td>
-                        <th class="align-center">10元</th>
-                <td class="align-center">20元</td>
-                <td class="align-center">30元</td>
-                <td class="align-center">50元</td>
-                <td class="align-center">100元</td>
-                <td class="align-center">200元</td>
-                <td class="align-center">300元</td>
-                <td class="align-center">500元</td>
-                <td class="align-center">1000元</td>
-                <td class="align-center">2200元</td>
-                <td class="align-center">2200元</td>
-          
-                    </tr>
-            <!-- <?php if (!empty($output['list']) && is_array($output['list'])) { ?>
-                <?php foreach ($output['list'] as $k => $v) { ?>
-                    <tr class="trFlex">
-                        <td class="align-center"><?php echo $k; ?></td>
-                        <td class="align-center"><?php echo $v['company_name']; ?></td>
-                        <td class="align-center"><?php echo $v['time_out']; ?></td>
-                        <td class="align-center"><?php echo ($v['ratio']['ALL'][900] * 100) ?? 0; ?>% <br> <br>
-          
-                    </tr>
-                <?php } ?>
-            <?php } else { ?>
-                <tr class="no_data">
-                    <td colspan="7"><?php echo $lang['nc_no_record']; ?></td>
+            <tbody class="tbody tbodyd">
+
+            <?php if(!empty($output['data'])){ ?>
+            <?php foreach ($output['data'] as $key => $value){?>
+                <tr class="trFlex" id="trFlex">
+                    <td class="align-center"><?php echo $key;?></td>
+                    <td class="align-center"><?php echo $value['store_name'];?></td>
+                    <?php foreach ($output['card_types'] as $card_type) {?>
+                        <?php foreach ($output['specs'] as $spec){ ?>
+                            <td class="align-center" data-type="<?php echo $card_type;?>"><?php echo $value['price'][$value['name'].'-'.$card_type.'-'.$spec];?></td>
+                        <?php }?>
+                    <?php } ?>
                 </tr>
-            <?php } ?> -->
+            <?php } ?>
+            <?php } ?>
             </tbody>
             <tfoot>
             <tr class="tfoot">
@@ -332,7 +159,10 @@
             </tr>
             </tfoot>
         </table>
-        <!-- <span style="color: red;font-size: 16px;">移 | 联 | 电</span> -->
+        </div>
+
+      
+
     </form>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.edit.js" charset="utf-8"></script>
@@ -353,16 +183,28 @@
         $('#ncsubmit').click(function () {
             $('#formSearch').submit();
         });
-        // 表格hover时背景
-        $('.trFlex').each(function () {
-            $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#ebf1de"); 
-            $(this).hover(function () {
-                $(this)[0].style.backgroundColor = '#cbe9f3'
-            },function() {
-            $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#ebf1de"); 
-            })
+
+        let type = '<?php echo $_GET['card_type'];?>';
+        $(".classA").each(function () {
+            if (type == $(this).attr("data-type")) {
+                $(this).addClass('current')
+                $(this).attr('href','JavaScript:void(0);')
+            }
+        })
+
+
+         
+        $('.trFlex td').each(function (index, item) {
+            let color = $(this).attr('data-type')
+            if (color ==  4 || color ==  1) {
+                $(this).css('background', '#f1dde6')
+            } else if (color == 5 || color ==  2) {
+                $(this).css('background', '#c8c6f3')
+            } else if (color == 6) {
+                $(this).css('background', '#f2f3c6')
+            } else {
+                $(this).css('background', '#fff')
+            }
         })
         // 导出
         $('#ncexport').click(function () {
@@ -377,7 +219,39 @@
                 layer.close(ii);
             }, 800);
         })
-        
+        //表头颜色
+        $('.thead th').each(function () {
+            let color = $(this).attr('data-type')
+            if (color == 4 || color ==  1) {
+                $(this).css('background', '#f1dde6')
+            } else if (color == 5 || color ==  2) {
+                $(this).css('background', '#c8c6f3')
+            } else if (color == 6) {
+                $(this).css('background', '#f2f3c6')
+            } else {
+                $(this).css('background', '#fff')
+            }            
+        })
 
+        let newArr = [];
+        let html = [];
+        $('.tbody tr').each(function () {
+            let res = $(this).find('td').eq(2).text();
+            if (!isNaN(res)) {
+                newArr.push(res);
+            }
+        })
+            newArr.forEach(item => {
+                html.push (item * 1)
+        });
+        function avg() {
+			let sum = 0;
+			for (var i = 0, j = arguments.length; i < j; i++) {
+				sum += arguments[i];
+			}
+			return sum / arguments.length;
+		}
+            let retain = avg.apply(null, html).toFixed(4);
+            console.log(retain);
     });
 </script>

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

@@ -4,60 +4,76 @@
         width: 60px;
         margin-left: 10px;
     }
+
     .db-right {
         padding-right: 134px !important;
         border-bottom: 1px solid #ccc;
     }
+
     .db-center {
         padding: 9px 0;
         border-bottom: 1px solid #ccc;
     }
+
     .db-top {
         padding: 0 30px;
     }
+
     .page .fixed-bar .item-title h3 {
         margin-top: 18px !important;
         margin-bottom: 10px !important;
         font-weight: 700 !important;
     }
+
     .tab-base li span {
         font-size: 12px !important;
     }
+
     .query_ors {
         width: 125px;
     }
+
     th label {
         display: inline-block;
         width: 60px;
     }
+
     .lineLi {
         min-width: 150px;
         font-size: 12px;
         color: #000;
     }
+
     #prompt ul .noLineLi {
         background: none;
     }
+
     #prompt div {
         display: inline-block;
         background: none
     }
+
     #prompt ul .lineLi {
         color: #000;
     }
+
     #selest_nc {
         width: 220px
     }
+
     tbody {
         font-size: 12px;
     }
+
     .layui-form-select .layui-input {
         padding: 13px 5px;
     }
+
     .layui-form-selected dl {
         display: flex !important;
         flex-wrap: wrap !important;
     }
+
     .layui-form-select dl {
 
         top: 29px !important;
@@ -66,50 +82,63 @@
         padding: 14px 0 !important;
         left: -599px !important;
     }
+
     .layui-form-select {
         width: 45%;
     }
+
     .layui-select-title {
         width: 104%;
     }
+
     .layui-form-select .layui-input {
 
         padding-left: 11px;
     }
+
     .page .fixed-bar .item-title h3 {
         margin-top: 18px !important;
         margin-bottom: 10px !important;
         font-weight: 700 !important;
     }
+
     .tab-base li span {
         font-size: 12px !important;
     }
+
     .layui-form-select .layui-input {
         height: 26px;
     }
+
     input::placeholder {
         color: #333;
     }
+
     .xm-tips {
         color: #333 !important;
         font-size: 12px;
     }
+
     .layui-form-select dl dd.layui-this {
         display: none;
     }
+
     .layui-form-select dl dd {
         cursor: pointer;
         width: 130px;
     }
+
     .tb-type1 td select {
         width: 201px;
     }
+
     .tb-type1 td input[type="text"],
     .tb-type1 td select {
         margin-right: 4px;
         margin-left: 0;
         width: 195px;
     }
+
     .layui-form-select .layui-edge {
         right: -91px !important;
     }
@@ -134,10 +163,10 @@
                 <th><label for="query_start_time">下单时间</label></th>
                 <td style="width: 327px">
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
-                           id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
+                           id="startTime" name="query_start_time" autocomplete="off" style="width:120px"/>
                     <label for="query_start_time">~</label>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>"
-                           id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
+                           id="endTime" name="query_end_time" autocomplete="off" style="width:120px"/>
                 </td>
                 <th><label>订单状态</label></th>
                 <td>
@@ -156,37 +185,42 @@
                     </select>
                 </td>
                 <th><label class="query_ors">供方名称</label></th>
-                <td >
-                    <select name="store_id" class="" >
+                <td>
+                    <select name="store_id" class="">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <?php foreach($output['provider_list'] as $provider){?>
-                            <option value="<?php echo $provider['store_id']?>"
-                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?> data-color="<?php echo $provider['opened']?>" class="textColor"><?php echo $provider['store_name']?>
+                        <?php foreach ($output['provider_list'] as $provider) { ?>
+                            <option value="<?php echo $provider['store_id'] ?>"
+                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?>
+                                    data-color="<?php echo $provider['opened'] ?>"
+                                    class="textColor"><?php echo $provider['store_name'] ?>
                             </option>
-                        <?php }?>
+                        <?php } ?>
                     </select>
                 </td>
                 <th><label class="">客户名称</label></th>
-                <td  class="layui-form td_time" style="width: 110px;">
+                <td class="layui-form td_time" style="width: 110px;">
                     <select name="mchid" class="querySelect" lay-verify="" lay-search>
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
-                        <?php foreach($output['merchant_list'] as $merchant){?>
-                            <option value="<?php echo $merchant['mchid']?>"
-                                    <?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
+                        <?php foreach ($output['merchant_list'] as $merchant) { ?>
+                            <option value="<?php echo $merchant['mchid'] ?>"
+                                    <?php if ($_GET['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name']; ?>
                             </option>
-                        <?php }?>
+                        <?php } ?>
                     </select>
                 </td>
-       
+
             </tr>
             <tr>
-   
-                <th><label  class="query_ors">订单号（多行查询）</label></th>
-                <td><textarea style="width: 324px;" name="order_sns" id="order_sns" cols="30" rows="10"><?php echo $_GET['order_sns'];?></textarea></td>
+
+                <th><label class="query_ors">订单号（多行查询）</label></th>
+                <td><textarea style="width: 324px;" name="order_sns" id="order_sns" cols="30"
+                              rows="10"><?php echo $_GET['order_sns']; ?></textarea></td>
                 <th><label class="query_ors">充值卡号（多行查询）</label></th>
-                <td><textarea name="card_nos" id="card_nos" cols="30" rows="10"><?php echo $_GET['card_nos'];?></textarea></td>
+                <td><textarea name="card_nos" id="card_nos" cols="30"
+                              rows="10"><?php echo $_GET['card_nos']; ?></textarea></td>
                 <th><label class="query_ors">商家单号（多行查询）</label></th>
-                <td><textarea name="mch_orders" id="mch_orders" cols="30" rows="10"><?php echo $_GET['mch_orders'];?></textarea></td>
+                <td><textarea name="mch_orders" id="mch_orders" cols="30"
+                              rows="10"><?php echo $_GET['mch_orders']; ?></textarea></td>
                 <td>
                     <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
@@ -247,7 +281,7 @@
                     <td class="align-center"><?php echo $order['card_type_text']; ?></td>
                     <td class="align-center"><?php echo $order['refill_amount']; ?></td>
                     <td class="align-right">
-                        <span class="doubleclick"  data-order="<?php echo $order['order_sn'];?>">
+                        <span class="doubleclick" data-order="<?php echo $order['order_sn']; ?>">
                             <?php echo date('Y-m-d H:i:s', $order['order_time']); ?>
                         </span>
                     </td>
@@ -299,7 +333,7 @@
         charset="utf-8"></script>
 <link rel="stylesheet" type="text/css"
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
-      <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/layui.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script type="text/javascript">
     $(function () {
@@ -317,33 +351,19 @@
             elem: '#endTime',
             type: 'datetime'
         });
-        let isWring = '<?php echo $output['count'][1];?>';
-        let setTimer
-        let num
-        if (Number(isWring) > 0) {
-            window.clearTimeout(setTimer)
-            setTimer = setTimeout(function () {
-                $("#auto")[0].play();
-                // $("#auto").attr("src", '<?php echo RESOURCE_SITE_URL; ?>/warning.mp3');
-            }, 1000);
-            window.clearTimeout(num)
-            num = setTimeout(function () {
-                window.location.reload();
-            }, 60000);
-        }
-                //双击
-        $('.doubleclick').dblclick(function() {
+        //双击
+        $('.doubleclick').dblclick(function () {
             let order_sn = $(this).attr('data-order')
             $.get('index.php?act=refill_order&op=showOrders', {
-                order_sn:order_sn
-            }, function(data) {
+                order_sn: order_sn
+            }, function (data) {
                 data = JSON.parse(data)
-                if (data.state == 1) {
-                let order_item = data.data
-                let html = ''; 
-                for (let i = 0; i < order_item.length; i++) {
-                    var item = order_item[i];
-                    html += `
+                if (data.state === 1) {
+                    let order_item = data.data
+                    let html = '';
+                    for (let i = 0; i < order_item.length; i++) {
+                        var item = order_item[i];
+                        html += `
                     <tr>
                          <td class="db-center">${item.order_sn}</td>
                          <td class="db-center">${item.commit_time_text}</td>
@@ -353,8 +373,8 @@
                          <td class="db-center">${item.channel_name}</td>
                          <td class="db-center">${item.err_msg}</td>
                     <tr>`
-                }
-                let content =  `<table>
+                    }
+                    let content = `<table>
                                 <thead>
                                     <tr>
                                         <th class="db-right">订单号</th>
@@ -368,10 +388,10 @@
                                 </thead>
                                 <tbody>${html}</tbody>
                             </table>`
-                layer.open({
-                   title: `<span>共${data.count}单</span> <span class="db-top">回调状态：${data.mch_notify_state}</span> <span>回调次数：${data.mch_notify_times}</span>` ,
-                   content:content
-                        });
+                    layer.open({
+                        title: `<span>共${data.count}单</span> <span class="db-top">回调状态：${data.mch_notify_state}</span> <span>回调次数：${data.mch_notify_times}</span>`,
+                        content: content
+                    });
                 } else {
                     alert("没有此订单");
                 }
@@ -379,20 +399,20 @@
         })
         //过滤
         $("#card_nos").blur(function () {
-            let test_mch =  $("#card_nos").val();
+            let test_mch = $("#card_nos").val();
             let result = test_mch.replace(/[\  \r\n\,]+/g, ",");
             $(this).val(result)
-            })
+        })
         $("#mch_orders").blur(function () {
-            let test_mch =  $("#mch_orders").val();
+            let test_mch = $("#mch_orders").val();
             let result = test_mch.replace(/[\  \r\n\,]+/g, ",");
             $(this).val(result)
-            })
+        })
         $("#order_sns").blur(function () {
-            let test_mch =  $("#order_sns").val();
+            let test_mch = $("#order_sns").val();
             let result = test_mch.replace(/[\  \r\n\,]+/g, ",");
             $(this).val(result)
-            })
+        })
         // 表格hover时背景
         $('.trFlex').each(function () {
             $(this).hover(function () {

crontab/control/minutes.php

@@ -14,6 +14,7 @@ require_once(BASE_HELPER_PATH . '/refill/util.php');
 require_once(BASE_HELPER_PATH . '/refill/divert_account.php');
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 require_once(BASE_CORE_PATH . '/framework/function/http.php');
+require_once(BASE_HELPER_PATH . '/PHPExcel/PHPExcel.php');
 
 
 class minutesControl extends BaseCronControl
@@ -31,6 +32,7 @@ class minutesControl extends BaseCronControl
         $this->_cron_common([1,2,3,4,5,6,7]);
         $this->_fetch_order_unavaliable();
         $this->_check_merchant_alarm_amount();
+//        $this->_refill_task();
         Log::record(__FUNCTION__ . " end",Log::DEBUG);
 
 //        $this->_web_index_update();
@@ -639,4 +641,176 @@ class minutesControl extends BaseCronControl
             }
         }
     }
+
+    public function _refill_task(): bool
+    {
+        Log::record(__FUNCTION__,Log::DEBUG);
+        $model_refill_task = Model('refill_task');
+
+        $task = $model_refill_task->TaskUnDispose('order_export');
+        if (empty($task)) return false;
+
+        $task_id = $task['task_id'];
+        $task_condition = unserialize($task['task_condition']);
+        if (empty($task_condition)) {
+            Log::record("refill task condition unserialize err, task_id：{$task_id}");
+            return false;
+        }
+
+        $type = $task['type'];
+        $cid = $task['cid'];
+        if ($type === 'merchant') {
+            $condition['refill_order.mchid'] = $cid;
+        } elseif ($type === 'provider') {
+            $condition['vr_order.store_id'] = $cid;
+        } else {
+            Log::record("refill task type err, task_id：{$task_id}");
+            return false;
+        }
+        $order_time_type = $task_condition['order_time_type'];
+        $start_unixtime = $task_condition['start_unixtime'];
+        $end_unixtime = $task_condition['end_unixtime'];
+        $order_state = $task_condition['order_state'];
+        if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
+            $condition["refill_order.{$order_time_type}"] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
+            $condition['vr_order.add_time'] = ['egt', $start_unixtime-1];
+        } elseif ($start_unixtime > 0) {
+            $condition["refill_order.{$order_time_type}"] = ['egt', $start_unixtime];
+            $condition['vr_order.add_time'] = ['egt', $start_unixtime-1];
+        }
+        if (in_array($order_state, ['0', '10', '20', '30', '40'], true)) {
+            $condition['order_state'] = $order_state;
+        }
+
+        $model_refill_task->TaskDispose($task_id);
+        [$state, $task_result] = $this->order_export($condition, $type, $task_id);
+        if ($state) {
+            $model_refill_task->TaskDisposeFinish($task_id, $task_result);
+        } else {
+            $model_refill_task->TaskDisposeErr($task_id, $task_result);
+        }
+        return true;
+    }
+
+    /**
+     * @throws PHPExcel_Exception
+     */
+    private function order_export($condition, $type, $task_id)
+    {
+        $orders = $this->getAllOrders($condition);
+        if(empty($orders)) {
+            return [false, '统计数据为空'];
+        }
+        $orders = $this->orderFormat($orders);
+        $objPHPExcel = new PHPExcel();
+
+        if ($type === 'merchant') {
+            $column_keys = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K'];
+            $column_values = ['商户号', '客户订单号', '平台单号', '面额', '充值卡号', '充值卡类型', '下单日期', '完成日期', '官方流水号', '订单状态', '扣款金额'];
+            $data_keys = ['mchid', 'mch_order', 'order_sn', 'refill_amount', 'card_no', 'card_type_text', 'order_time_text', 'notify_time_text', 'official_sn', 'order_state_text', 'mch_amount'];
+        } elseif ($type === 'provider') {
+            $column_keys = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'];
+            $column_values = ['上游订单号', '平台单号', '面额', '充值卡号', '充值卡类型', '下单日期', '完成日期', '官方流水号', '订单状态', '扣款金额'];
+            $data_keys = ['ch_trade_no', 'order_sn', 'refill_amount', 'card_no', 'card_type_text', 'order_time_text', 'notify_time_text', 'official_sn', 'order_state_text', 'channel_amount'];
+        } else {
+            return [false, '主体类型错误'];
+        }
+
+        $objPHPExcel->setActiveSheetIndex(0);
+        $objPHPExcel->getDefaultStyle()->getFont()->setName('Arial')->setSize(10);
+        foreach ($column_keys as $key => $column_key) {
+            $objPHPExcel->getActiveSheet()->getColumnDimension($column_key)->setWidth(25);
+            $cell_value = $column_key . 1;
+            $objPHPExcel->getActiveSheet()->setCellValue($cell_value, $column_values[$key]);
+        }
+
+        foreach ($orders as $k => $order) {
+            foreach ($column_keys as $key => $column_key) {
+                $field = $column_key.($k+2);
+                $objPHPExcel->getActiveSheet()->setCellValueExplicit($field, $order[$data_keys[$key]],
+                    PHPExcel_Cell_DataType::TYPE_STRING);
+            }
+        }
+        try {
+            $path = BASE_ROOT_PATH . "/data/upload/task/";
+            if(!is_dir($path)){
+                mkdir($path, 0755);
+            }
+            $filename = date('YmdHis',time())."-任务导出-任务ID:{$task_id}.xlsx";
+
+            $file_path = $path . $filename;
+            $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+
+            $objWriter->save($file_path);
+            return [true, $filename];
+        } catch (Exception $e) {
+            return [false, $e->getMessage()];
+        }
+    }
+
+    private function getAllOrders($condition): array
+    {
+        $len = 1000;
+
+        $i = 0;
+        $orders = [];
+        while (true)
+        {
+            $start = $i * $len;
+            $items = Model('')->table('refill_order,vr_order')
+                ->field('refill_order.*,vr_order.order_state')
+                ->join('inner')
+                ->on('refill_order.order_id=vr_order.order_id')
+                ->where($condition)
+                ->order('refill_order.order_time desc')
+                ->limit("{$start},{$len}")
+                ->select();
+            $orders = array_merge($orders,$items);
+            if (empty($items) || count($items) < $len) {
+                break;
+            }
+            $i++;
+        }
+        return $orders;
+    }
+
+    private function orderFormat($orders): array
+    {
+        $card_type_texts = [mtopcard\PetroChinaCard => '中石油', mtopcard\SinopecCard => '中石化', mtopcard\ChinaMobileCard => '中国移动', mtopcard\ChinaUnicomCard => '中国联通', mtopcard\ChinaTelecomCard => '中国电信'];
+        $orderState = function ($order_info) {
+            $is_retrying = $order_info['is_retrying'];
+            switch ($order_info['order_state']) {
+                case ORDER_STATE_CANCEL:
+                    if ($is_retrying) {
+                        $order_state = '重试中';
+                    } else {
+                        $order_state = '已取消';
+                    }
+                    break;
+                case ORDER_STATE_NEW:
+                    $order_state = '待付款';
+                    break;
+                case ORDER_STATE_PAY:
+                    $order_state = '待发货';
+                    break;
+                case ORDER_STATE_SEND:
+                    $order_state = '待收货';
+                    break;
+                case ORDER_STATE_SUCCESS:
+                    $order_state = '交易完成';
+                    break;
+                default :
+                    $order_state = '未知状态';
+            }
+            return $order_state;
+        };
+        foreach($orders as $key => $order)
+        {
+            $orders[$key]['card_type_text'] = $card_type_texts[$order['card_type']];
+            $orders[$key]['order_time_text'] = $order['order_time'] ? date('Y-m-d H:i:s', $order['order_time']) : '';
+            $orders[$key]['notify_time_text'] = $order['notify_time'] ? date('Y-m-d H:i:s', $order['notify_time']) : '';
+            $orders[$key]['order_state_text'] = $orderState($order);
+        }
+        return $orders;
+    }
 }

data/config/win/refill.ini.php

@@ -1471,42 +1471,42 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6744, 'price' => 9.54, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6745, 'price' => 19.08, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6750, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6751, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
@@ -1850,14 +1850,34 @@ $lechong_phone = ['name' => 'lechong', 'store_id' => 99, 'qualitys' => '1',
 
 $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6895, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6896, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6897, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6898, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6899, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+//        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+//        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6895, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6896, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6897, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6898, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6899, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+//        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -1880,27 +1900,27 @@ $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
         ],
         50 => [
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6904, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6905, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6906, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6907, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6908, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1921,14 +1941,14 @@ $tianyan_phone = ['name' => 'tianyan', 'store_id' => 102, 'qualitys' => '1',
 
 $yunsuoyaoman_phone = ['name' => 'yunsuoyaoman', 'store_id' => 110,'qualitys' => '5',
     'amount' => [
-        10 => [['goods_id' => 6970, 'price' => 9.16, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6971, 'price' => 18.32, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6972, 'price' => 27.48, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6973, 'price' => 45.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6974, 'price' => 91.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6975, 'price' => 183.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6976, 'price' => 274.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6977, 'price' => 458, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 6970, 'price' => 9.22, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6971, 'price' => 18.44, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6972, 'price' => 27.66, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6973, 'price' => 46.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6974, 'price' => 92.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6975, 'price' => 184.4, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6976, 'price' => 276.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6977, 'price' => 461, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2189,22 +2209,22 @@ $yilin_phone = ['name' => 'yilin', 'store_id' => 115, 'qualitys' => '1',
         30 => [
             ['goods_id' => 7005, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7005, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7005, 'price' => 28.89, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7005, 'price' => 28.83, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7006, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7006, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7006, 'price' => 48.15, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7006, 'price' => 48.05, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7007, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7007, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7007, 'price' => 96.3, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7007, 'price' => 96.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7008, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7008, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7008, 'price' => 192.6, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7008, 'price' => 192.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7009, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -2401,17 +2421,17 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
 
         10 => [
-            ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7060, 'price' => 10.24, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.48, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.135, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
@@ -2480,14 +2500,14 @@ $shimier_phone = ['name' => 'shimier', 'store_id' => 123,'qualitys' => '1',
 
 $zhongst_mix_phone = ['name' => 'zhongst_mix', 'store_id' => 124, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 7084, 'price' => 9.95, 'quality' => 2, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 7085, 'price' => 19.9, 'quality' => 2, 'card_type' => 'chinamobile']],
-        30 => [['goods_id' => 7086, 'price' => 29.85, 'quality' => 2, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 7087, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 7088, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 7089, 'price' => 199, 'quality' => 2, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 7090, 'price' => 298.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 7091, 'price' => 497.5, 'quality' => 2, 'card_type' => 'chinamobile']]
+        10 => [['goods_id' => 7084, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7085, 'price' => 19.86, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7086, 'price' => 29.79, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7087, 'price' => 49.65, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7088, 'price' => 99.3, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7089, 'price' => 198.6, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7090, 'price' => 297.9, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7091, 'price' => 496.5, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2544,35 +2564,35 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7111, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7112, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7113, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7114, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7115, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2989,7 +3009,10 @@ $config['merchant_retry_times'] = [
 
     10231 => [ //汇通-普充2号
         'qualities' => [1 => ['secs' => 1000, 'times' => 200], 2 => ['secs' => 200, 'times' => 20]],
-        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003]
+        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003],
+    10233 => [ //瑾相联-10分
+        'qualities' => [1 => ['secs' => 630, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
+        'lower_ratio' => ['ratio' => 0.4, 'period' => 3600], 'profit_ratio' => 0.015],
 ];
 
 //// "status": 1 //状态 0:空号；1:实号；2:停机；3:库无；4:沉默号；5:风险号

data/config/xyz/refill.ini.php

@@ -1471,42 +1471,42 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6744, 'price' => 9.54, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6745, 'price' => 19.08, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6750, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6751, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
@@ -1850,14 +1850,34 @@ $lechong_phone = ['name' => 'lechong', 'store_id' => 99, 'qualitys' => '1',
 
 $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6895, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6896, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6897, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6898, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6899, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+//        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+//        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6895, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6896, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6897, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6898, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6899, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+//        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -1880,27 +1900,27 @@ $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
         ],
         50 => [
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6904, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6905, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6906, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6907, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6908, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1921,14 +1941,14 @@ $tianyan_phone = ['name' => 'tianyan', 'store_id' => 102, 'qualitys' => '1',
 
 $yunsuoyaoman_phone = ['name' => 'yunsuoyaoman', 'store_id' => 110,'qualitys' => '5',
     'amount' => [
-        10 => [['goods_id' => 6970, 'price' => 9.16, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6971, 'price' => 18.32, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6972, 'price' => 27.48, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6973, 'price' => 45.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6974, 'price' => 91.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6975, 'price' => 183.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6976, 'price' => 274.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6977, 'price' => 458, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 6970, 'price' => 9.22, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6971, 'price' => 18.44, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6972, 'price' => 27.66, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6973, 'price' => 46.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6974, 'price' => 92.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6975, 'price' => 184.4, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6976, 'price' => 276.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6977, 'price' => 461, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2189,22 +2209,22 @@ $yilin_phone = ['name' => 'yilin', 'store_id' => 115, 'qualitys' => '1',
         30 => [
             ['goods_id' => 7005, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7005, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7005, 'price' => 28.89, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7005, 'price' => 28.83, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7006, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7006, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7006, 'price' => 48.15, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7006, 'price' => 48.05, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7007, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7007, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7007, 'price' => 96.3, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7007, 'price' => 96.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7008, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7008, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7008, 'price' => 192.6, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7008, 'price' => 192.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7009, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -2401,17 +2421,17 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
 
         10 => [
-            ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7060, 'price' => 10.24, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.48, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.135, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
@@ -2480,14 +2500,14 @@ $shimier_phone = ['name' => 'shimier', 'store_id' => 123,'qualitys' => '1',
 
 $zhongst_mix_phone = ['name' => 'zhongst_mix', 'store_id' => 124, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 7084, 'price' => 9.95, 'quality' => 2, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 7085, 'price' => 19.9, 'quality' => 2, 'card_type' => 'chinamobile']],
-        30 => [['goods_id' => 7086, 'price' => 29.85, 'quality' => 2, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 7087, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 7088, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 7089, 'price' => 199, 'quality' => 2, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 7090, 'price' => 298.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 7091, 'price' => 497.5, 'quality' => 2, 'card_type' => 'chinamobile']]
+        10 => [['goods_id' => 7084, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7085, 'price' => 19.86, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7086, 'price' => 29.79, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7087, 'price' => 49.65, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7088, 'price' => 99.3, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7089, 'price' => 198.6, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7090, 'price' => 297.9, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7091, 'price' => 496.5, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2544,35 +2564,35 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7111, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7112, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7113, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7114, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7115, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2981,7 +3001,7 @@ $config['merchant_retry_times'] = [
         'qualities' => [1 => ['secs' => 1200, 'times' => 100], 2 => ['secs' => 100, 'times' => 5]],
         'lower_ratio' => ['ratio' => 0.9, 'period' => 3600], 'profit_ratio' => 0.003],
     10216 => [ //飘逸-10分
-        'qualities' => [1 => ['secs' => 630, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
+        'qualities' => [1 => ['secs' => 530, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
         'lower_ratio' => ['ratio' => 0.4, 'period' => 3600], 'profit_ratio' => 0.015],
     10217 => [ //天采-混充50m
         'qualities' => [1 => ['secs' => 2400, 'times' => 200], 2 => ['secs' => 600, 'times' => 20]],
@@ -2989,7 +3009,13 @@ $config['merchant_retry_times'] = [
 
     10231 => [ //汇通-普充2号
         'qualities' => [1 => ['secs' => 1000, 'times' => 200], 2 => ['secs' => 200, 'times' => 20]],
-        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003]
+        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003],
+    10233 => [ //瑾相联-10分
+        'qualities' => [1 => ['secs' => 630, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
+        'lower_ratio' => ['ratio' => 0.4, 'period' => 3600], 'profit_ratio' => 0.015],
+    10236 => [ //邀友補充-05號通道
+        'qualities' => [1 => ['secs' => 3300, 'times' => 1000], 2 => ['secs' => 300, 'times' => 5]],
+        'lower_ratio' => ['ratio' => 0.99, 'period' => 3600], 'profit_ratio' => 0.015],
 ];
 
 //// "status": 1 //状态 0:空号；1:实号；2:停机；3:库无；4:沉默号；5:风险号

data/config/xyzadm/refill.ini.php

@@ -1471,42 +1471,42 @@ $lingzhman48_phone = ['name' => 'lingzhman48', 'store_id' => 76, 'qualitys' => '
 $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6744, 'price' => 9.54, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6744, 'price' => 9.57, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6744, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6744, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6745, 'price' => 19.08, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6745, 'price' => 19.14, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6745, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6745, 'price' => 19, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6750, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6750, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6750, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6750, 'price' => 285, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6751, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6751, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6751, 'price' => 472.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6751, 'price' => 475, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
@@ -1850,14 +1850,34 @@ $lechong_phone = ['name' => 'lechong', 'store_id' => 99, 'qualitys' => '1',
 
 $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6895, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6896, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6897, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6898, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6899, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+//        10 => [['goods_id' => 6893, 'price' => 9.56, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+//        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6895, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6896, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6897, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6898, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6899, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinatelecom']
+        ],
+//        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -1880,27 +1900,27 @@ $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
         ],
         50 => [
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6904, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6905, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6906, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6907, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6908, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -1921,14 +1941,14 @@ $tianyan_phone = ['name' => 'tianyan', 'store_id' => 102, 'qualitys' => '1',
 
 $yunsuoyaoman_phone = ['name' => 'yunsuoyaoman', 'store_id' => 110,'qualitys' => '5',
     'amount' => [
-        10 => [['goods_id' => 6970, 'price' => 9.16, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6971, 'price' => 18.32, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6972, 'price' => 27.48, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6973, 'price' => 45.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6974, 'price' => 91.6, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6975, 'price' => 183.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6976, 'price' => 274.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6977, 'price' => 458, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [['goods_id' => 6970, 'price' => 9.22, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6971, 'price' => 18.44, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6972, 'price' => 27.66, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6973, 'price' => 46.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6974, 'price' => 92.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6975, 'price' => 184.4, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6976, 'price' => 276.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6977, 'price' => 461, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2189,22 +2209,22 @@ $yilin_phone = ['name' => 'yilin', 'store_id' => 115, 'qualitys' => '1',
         30 => [
             ['goods_id' => 7005, 'price' => 28.68, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7005, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7005, 'price' => 28.89, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7005, 'price' => 28.83, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7006, 'price' => 47.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7006, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7006, 'price' => 48.15, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7006, 'price' => 48.05, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7007, 'price' => 95.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7007, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7007, 'price' => 96.3, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7007, 'price' => 96.1, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7008, 'price' => 191.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7008, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7008, 'price' => 192.6, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7008, 'price' => 192.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7009, 'price' => 286.8, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -2401,17 +2421,17 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
 
         10 => [
-            ['goods_id' => 7060, 'price' => 10.21, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7060, 'price' => 10.24, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['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.09, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7061, 'price' => 20.48, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7061, 'price' => 20.52, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7061, 'price' => 20.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 30.135, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
@@ -2480,14 +2500,14 @@ $shimier_phone = ['name' => 'shimier', 'store_id' => 123,'qualitys' => '1',
 
 $zhongst_mix_phone = ['name' => 'zhongst_mix', 'store_id' => 124, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 7084, 'price' => 9.95, 'quality' => 2, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 7085, 'price' => 19.9, 'quality' => 2, 'card_type' => 'chinamobile']],
-        30 => [['goods_id' => 7086, 'price' => 29.85, 'quality' => 2, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 7087, 'price' => 49.75, 'quality' => 2, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 7088, 'price' => 99.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 7089, 'price' => 199, 'quality' => 2, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 7090, 'price' => 298.5, 'quality' => 2, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 7091, 'price' => 497.5, 'quality' => 2, 'card_type' => 'chinamobile']]
+        10 => [['goods_id' => 7084, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 7085, 'price' => 19.86, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 7086, 'price' => 29.79, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 7087, 'price' => 49.65, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 7088, 'price' => 99.3, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 7089, 'price' => 198.6, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 7090, 'price' => 297.9, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 7091, 'price' => 496.5, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -2544,35 +2564,35 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7111, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7111, 'price' => 49.9, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7112, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7112, 'price' => 99.8, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7113, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7113, 'price' => 199.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7114, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7114, 'price' => 299.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7115, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7115, 'price' => 499, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2981,7 +3001,7 @@ $config['merchant_retry_times'] = [
         'qualities' => [1 => ['secs' => 1200, 'times' => 100], 2 => ['secs' => 100, 'times' => 5]],
         'lower_ratio' => ['ratio' => 0.9, 'period' => 3600], 'profit_ratio' => 0.003],
     10216 => [ //飘逸-10分
-        'qualities' => [1 => ['secs' => 630, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
+        'qualities' => [1 => ['secs' => 530, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
         'lower_ratio' => ['ratio' => 0.4, 'period' => 3600], 'profit_ratio' => 0.015],
     10217 => [ //天采-混充50m
         'qualities' => [1 => ['secs' => 2400, 'times' => 200], 2 => ['secs' => 600, 'times' => 20]],
@@ -2989,7 +3009,13 @@ $config['merchant_retry_times'] = [
 
     10231 => [ //汇通-普充2号
         'qualities' => [1 => ['secs' => 1000, 'times' => 200], 2 => ['secs' => 200, 'times' => 20]],
-        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003]
+        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003],
+    10233 => [ //瑾相联-10分
+        'qualities' => [1 => ['secs' => 630, 'times' => 100], 2 => ['secs' => 70, 'times' => 5]],
+        'lower_ratio' => ['ratio' => 0.4, 'period' => 3600], 'profit_ratio' => 0.015],
+    10236 => [ //邀友補充-05號通道
+        'qualities' => [1 => ['secs' => 3300, 'times' => 1000], 2 => ['secs' => 300, 'times' => 5]],
+        'lower_ratio' => ['ratio' => 0.99, 'period' => 3600], 'profit_ratio' => 0.015],
 ];
 
 //// "status": 1 //状态 0:空号；1:实号；2:停机；3:库无；4:沉默号；5:风险号

global.php

@@ -64,6 +64,7 @@ define('ATTACH_CIRCLE','circle');
 define('ATTACH_CMS','cms');
 define('ATTACH_LIVE','live');
 define('ATTACH_UPFILE','upfile');
+define('ATTACH_TASK','task');
 define('ATTACH_REFILL_EVIDENCE','refill_evidence');
 define('ATTACH_MALBUM', ATTACH_PATH.'/member');
 define('ATTACH_MQRCODE',ATTACH_PATH.'/qrcode');

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

@@ -66,7 +66,7 @@ class config
         "4-10-2" => 9.94, "4-20-2" => 19.88, "4-30-2" => 29.82, "4-50-2" => 49.7, "4-100-2" => 99.4, "4-200-2" => 198.8, "4-300-2" => 298.2, "4-500-2" => 497,//天津 2
         "4-10-6" => 9.72, "4-20-6" => 19.44, "4-30-6" => 29.16, "4-50-6" => 48.6, "4-100-6" => 97.2, "4-200-6" => 194.4, "4-300-6" => 291.6, "4-500-6" => 486,//辽宁 6
         "4-10-9" => 9.93, "4-20-9" => 19.86, "4-30-9" => 29.79, "4-50-9" => 49.65, "4-100-9" => 99.3,//上海 9
-        "4-10-8" => 9.995, "4-20-8" => 19.99, "4-30-8" => 29.985, "4-50-8" => 49.975, "4-100-8" => 99.95, "4-200-8" => 199.9, "4-300-8" => 299.85, "4-500-8" => 499.75,//黑龙江 8
+        "4-10-8" => 10.012, "4-20-8" => 20.024, "4-30-8" => 30.036, "4-50-8" => 50.06, "4-100-8" => 100.12, "4-200-8" => 200.24, "4-300-8" => 300.36, "4-500-8" => 500.6,//黑龙江 8
         "4-10-29" => 9.82, "4-20-29" => 19.64, "4-30-29" => 29.46, "4-50-29" => 49.1, "4-100-29" => 98.2, "4-200-29" => 196.4, "4-300-29" => 294.6, "4-500-29" => 491,//青海 29
         "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