Browse Source

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

stanley-king 3 years ago
parent
commit
d829806d2b

+ 38 - 42
admin/templates/default/merchant.ratios.php

@@ -42,12 +42,12 @@
         <table class="table tb-type2">
             <thead>
             <tr class="thead">
-                <th class="align-center w10pre">机构编码</th>
-                <th class="align-center w10pre">机构名称</th>
-                <th class="align-center w10pre">超时时间(秒)</th>
-                <th class="align-center w15pre">15分钟(移 | 联 | 电)</th>
+                <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 w15pre">1小时</th>
+                <th class="align-center w10pre">1小时</th>
                 <th class="align-center w10pre">2小时</th>
                 <th class="align-center w10pre">当天</th>
             </thead>
@@ -55,49 +55,46 @@
             <?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>
-                        <?php echo ($v['ratio']['YD'][900] * 100) ?? 0; ?>%
-                        &emsp;|&emsp;<?php echo ($v['ratio']['LT'][1800] * 100) ?? 0; ?>%&emsp;|&emsp;
-                        <?php echo ($v['ratio']['DX'][900] * 100) ?? 0; ?>%
-                    
-                    </td>
-                        <td class="align-center"><?php echo ($v['ratio']['ALL'][1800] * 100) ?? 0; ?>% <br> <br>
-                        <?php echo ($v['ratio']['YD'][1800] * 100) ?? 0; ?>%
-                        &emsp;|&emsp;<?php echo ($v['ratio']['LT'][1800] * 100) ?? 0; ?>%&emsp;|&emsp;
-                        <?php echo ($v['ratio']['DX'][1800] * 100) ?? 0; ?>%
-                    
-                    </td>
-                        <td class="align-center"><?php echo ($v['ratio']['ALL'][3600] * 100) ?? 0; ?>% <br> <br>
-                        <?php echo ($v['ratio']['YD'][3600] * 100) ?? 0; ?>%
-                        &emsp;|&emsp;<?php echo ($v['ratio']['LT'][3600] * 100) ?? 0; ?>%&emsp;|&emsp;
-                        <?php echo ($v['ratio']['DX'][3600] * 100) ?? 0; ?>%
-                    
-                    </td>
-                        <td class="align-center"><?php echo ($v['ratio']['ALL'][7200] * 100) ?? 0; ?>% <br> <br>
-                        <?php echo ($v['ratio']['YD'][7200] * 100) ?? 0; ?>%
-                        &emsp;|&emsp;<?php echo ($v['ratio']['LT'][7200] * 100) ?? 0; ?>%&emsp;|&emsp;
-                        <?php echo ($v['ratio']['DX'][7200] * 100) ?? 0; ?>%
-                    </td>
-                        <td class="align-center"><?php echo ($v['ratio']['ALL'][86400] * 100) ?? 0; ?>% <br> <br>
-                        <?php echo ($v['ratio']['YD'][86400] * 100) ?? 0; ?>%
-                        &emsp;|&emsp;<?php echo ($v['ratio']['LT'][86400] * 100) ?? 0; ?>%&emsp;|&emsp;
-                        <?php echo ($v['ratio']['DX'][86400] * 100) ?? 0; ?>%
-                    </td>
+                        <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][2] * 100) ?? 0;?>%(<span style="color: #0ee710;"><?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> <br>
+                            <?php echo ($v['ratio']['YD'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][900][0] + $v['ratio']['YD'][900][1]) ?? 0;?>)&emsp;
+                            |&emsp;<?php echo ($v['ratio']['LT'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][900][0] + $v['ratio']['LT'][900][1]) ?? 0;?>)&emsp;|&emsp;
+                            <?php echo ($v['ratio']['DX'][900][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][900][0] + $v['ratio']['DX'][900][1]) ?? 0;?>)
+                        </td>
+                        <td class="align-center"><?php echo ($v['ratio']['ALL'][1800][2] * 100) ?? 0;?>%(<span style="color: #0ee710;"><?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> <br>
+                            <?php echo ($v['ratio']['YD'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][1800][0] + $v['ratio']['YD'][1800][1]) ?? 0;?>)&emsp;
+                            |&emsp;<?php echo ($v['ratio']['LT'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][1800][0] + $v['ratio']['LT'][1800][1]) ?? 0;?>)&emsp;|&emsp;
+                            <?php echo ($v['ratio']['DX'][1800][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][1800][0] + $v['ratio']['DX'][1800][1]) ?? 0;?>)
+                        </td>
+                        <td class="align-center"><?php echo ($v['ratio']['ALL'][3600][2] * 100) ?? 0;?>%(<span style="color: #0ee710;"><?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> <br>
+                            <?php echo ($v['ratio']['YD'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][3600][0] + $v['ratio']['YD'][3600][1]) ?? 0;?>)&emsp;
+                            |&emsp;<?php echo ($v['ratio']['LT'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][3600][0] + $v['ratio']['LT'][3600][1]) ?? 0;?>)&emsp;|&emsp;
+                            <?php echo ($v['ratio']['DX'][3600][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][3600][0] + $v['ratio']['DX'][3600][1]) ?? 0;?>)
+                        </td>
+                        <td class="align-center"><?php echo ($v['ratio']['ALL'][7200][2] * 100) ?? 0;?>%(<span style="color: #0ee710;"><?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> <br>
+                            <?php echo ($v['ratio']['YD'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][7200][0] + $v['ratio']['YD'][7200][1]) ?? 0;?>)&emsp;
+                            |&emsp;<?php echo ($v['ratio']['LT'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][7200][0] + $v['ratio']['LT'][7200][1]) ?? 0;?>)&emsp;|&emsp;
+                            <?php echo ($v['ratio']['DX'][7200][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][7200][0] + $v['ratio']['DX'][7200][1]) ?? 0;?>)
+                        </td>
+                        <td class="align-center"><?php echo ($v['ratio']['ALL'][86400][2] * 100) ?? 0;?>%(<span style="color: #0ee710;"><?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> <br>
+                            <?php echo ($v['ratio']['YD'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['YD'][86400][0] + $v['ratio']['YD'][86400][1]) ?? 0;?>)&emsp;
+                            |&emsp;<?php echo ($v['ratio']['LT'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['LT'][86400][0] + $v['ratio']['LT'][86400][1]) ?? 0;?>)&emsp;|&emsp;
+                            <?php echo ($v['ratio']['DX'][86400][2] * 100) ?? 0;?>%(<?php echo ($v['ratio']['DX'][86400][0] + $v['ratio']['DX'][86400][1]) ?? 0;?>)
+                        </td>
                     </tr>
                 <?php } ?>
             <?php } else { ?>
                 <tr class="no_data">
-                    <td colspan="7"><?php echo $lang['nc_no_record']; ?></td>
+                    <td colspan="8"><?php echo $lang['nc_no_record']; ?></td>
                 </tr>
             <?php } ?>
             </tbody>
             <tfoot>
             <tr class="tfoot">
                 <td></td>
-                <td colspan="7">
+                <td colspan="8">
                     <div class="pagination"><?php echo $output['show_page']; ?></div>
                 </td>
             </tr>
@@ -127,12 +124,12 @@
         // 表格hover时背景
         $('.trFlex').each(function () {
             $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#ebf1de"); 
+            $("tbody>tr:even").css("background-color","#f5f6ff"); 
             $(this).hover(function () {
                 $(this)[0].style.backgroundColor = '#cbe9f3'
             },function() {
             $("tbody>tr:odd").css("background-color","#FEF2E8");  
-            $("tbody>tr:even").css("background-color","#ebf1de"); 
+            $("tbody>tr:even").css("background-color","#f5f6ff"); 
             })
         })
         // 导出
@@ -147,8 +144,7 @@
             setTimeout(function(){
                 layer.close(ii);
             }, 800);
-        })
-        
+        });
 
     });
 </script>

+ 10 - 1
admin/templates/default/provider.index.php

@@ -147,7 +147,7 @@
                             <?php echo $output['opened_text'][$v['opened']-1]; ?>
                                 </span>
                         </td>
-                        <td>
+                        <td  id="money">
                             <span><?php echo $v['balance'] ?? '';?></span>
                         </td>
                         <td class="align-center w200">
@@ -211,6 +211,15 @@
             }, function() {
 
             })
+        });
+        // 负数余额变红
+        $('#money span').each(function(index, item) {
+            let text = $(item).text();
+            if(!isNaN(text) && text < 0 ) {
+                $(this).css('color', 'red')
+            } else{
+                $(this).css('color', '#555')
+            }
         })
     });
 </script>

+ 2 - 2
admin/templates/default/refill.order.index.php

@@ -949,7 +949,7 @@
     function hCopyChannel(e) {
         let str = ''
         $('#tbody tr').each(function () {
-            let res = $(this).find('td').eq(13).text()
+            let res = $(this).find('td').eq(15).text()
             str += res + '\n'
         })
         let oInput = document.createElement("textarea");
@@ -996,7 +996,7 @@
     function hCopyMchOrder(e) {
         let str = ''
         $('#tbody tr').each(function () {
-            let res = $(this).find('td').eq(12).text()
+            let res = $(this).find('td').eq(13).text()
             str += res + '\n'
         })
         let oInput = document.createElement("textarea");

+ 8 - 8
data/config/win/refill.ini.php

@@ -613,46 +613,46 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6464, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6464, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         20 => [
             ['goods_id' => 6465, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6465, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         30 => [
             ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6466, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         50 => [
             ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         100 => [
             ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

+ 8 - 8
data/config/xyz/refill.ini.php

@@ -613,46 +613,46 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6464, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6464, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         20 => [
             ['goods_id' => 6465, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6465, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         30 => [
             ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6466, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         50 => [
             ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         100 => [
             ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

+ 8 - 8
data/config/xyzadm/refill.ini.php

@@ -613,46 +613,46 @@ $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6464, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6464, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         20 => [
             ['goods_id' => 6465, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6465, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         30 => [
             ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6466, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         50 => [
             ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         100 => [
             ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],

+ 2 - 2
test/TestRefill.php

@@ -1195,11 +1195,11 @@ class TestRefill extends TestCase
     {
         $providers = $this->getProvider('xiaoniu','RefillOil');
 //        $resp = $providers->add(1000111100021211884, mtopcard\SinopecCard, 500, ['order_sn' => $this->make_sn()]);
-//        $resp = $providers->query(['order_sn' => '39911625819031601073']);
+        $resp = $providers->query(['order_sn' => '15981632813532634860']);
 //        $data = '{"content":"\u3010\u4e2d\u56fd\u77f3\u5316\u3011\u60a8\u5c3e\u53f7\u4e3a211884\u7684\u52a0\u6cb9\u5361\u4e8e07\u670809\u65e5 16\u65f630\u5206\u5145\u503c\u6210\u529f,\u91d1\u989d500\u5143,\u8ba2\u5355\u53f7:2521070916304172","realAmt":"490.0000","status":"1","timestamp":"20210709163042","sign":"110aaae89243c9ed2d6aa4d753597224","orderNo":"XN20210709162351796707722","mOrderNo":"39911625819031601073"}';
 //        $input = json_decode($data, true);
 //        refill\RefillFactory::instance()->notify('xiaoniu',$input);
-        $resp = $providers->balance();
+//        $resp = $providers->balance();
     }
 
     public function testYingdian()