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

admin/control/ordersendlist.php

@@ -813,4 +813,46 @@ class ordersendlistControl extends SystemControl
         Tpl::output('show_page', $mod_detail->showpage());
         Tpl::showpage('refill.detail.monitor');
     }
-}
+
+    public function query_errOp()
+    {
+        $mod = Model('refill_query_err');
+
+        $condition = [];
+        $_GET['query_start_time'] = $_GET['query_start_time'] ?? date("Y-m-d 00:00:00");
+        if(!empty($_GET['mchid'])) {
+            $condition['mchid'] = $_GET['mchid'];
+        }
+
+        if (!empty($_GET['mch_orders'])) {
+            $mch_orders = rtrim($_GET['mch_orders'],',');
+            $condition['mch_order'] = ['in', $mch_orders];
+        }
+
+        $start_unixtime = intval(strtotime($_GET['query_start_time']));
+        $end_unixtime = intval(strtotime($_GET['query_end_time']));
+        if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
+            $condition['query_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
+        } elseif ($start_unixtime > 0) {
+            $condition['query_time'] = ['egt', $start_unixtime];
+        } elseif ($end_unixtime > 0) {
+            $condition['query_time'] = ['lt', $end_unixtime];
+        } else {
+            $start = strtotime(date('Y-m-d', time()));
+            $condition['query_time'] = ['egt', $start];
+        }
+
+        $merchants = [];
+        $merchant_list = $this->merchants();
+        foreach ($merchant_list as  $value) {
+            $merchants[$value['mchid']] = $value;
+        }
+        $list = $mod->getRefillQueryErrList($condition, 200, 1000);
+
+        Tpl::output('merchant_list', $merchant_list);
+        Tpl::output('merchants', $merchants);
+        Tpl::output('list', $list);
+        Tpl::output('show_page', $mod->showpage());
+        Tpl::showpage('refill.query.err');
+    }
+}

admin/templates/default/refill.detail.monitor.php

@@ -76,6 +76,7 @@
                 <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span></a></li>
             </ul>
         </div>
@@ -300,4 +301,4 @@
         oInput.parentNode.removeChild(oInput)
     }
 
-</script> 
+</script>

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

@@ -91,6 +91,7 @@
                 <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li>
                     <a href="JavaScript:void(0);" class="current"><span>异常订单监控</span>
                         <?php if($output['except_stat'] > 0){?>
@@ -310,4 +311,4 @@
         document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
-</script>
+</script>

admin/templates/default/refill.order.monitor.notify.php

@@ -72,6 +72,7 @@
                 <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li>
                     <a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span>
                         <?php if($output['except_stat'] > 0){?>

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

@@ -72,6 +72,7 @@
                 <li><a href="JavaScript:void(0);" class="current"><span>网络错误订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span></a></li>
             </ul>
         </div>

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

@@ -73,6 +73,7 @@
                 <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>未回调订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span></a></li>
             </ul>
         </div>

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

@@ -72,6 +72,7 @@
                 <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
                 <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=query_err"><span>机构查单错误列表</span></a></li>
                 <li>
                     <a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span>
                         <?php if($output['except_stat'] > 0){?>

admin/templates/default/refill.query.err.php

@@ -0,0 +1,246 @@
+<style>
+    th label {
+        display: inline-block;
+        width: 60px;
+        margin-left: 10px;
+    }
+    .lineLi {
+        display: inline-block;
+        min-width: 150px;
+        font-size: 14px;
+    }
+    .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: 23px;
+        padding-left: 11px;
+        padding-right: 0 !important;
+    }
+    input::placeholder {
+        color: #333;
+    }
+    .layui-form-selected dl {
+        display: flex !important;
+        flex-wrap: wrap !important;
+    }
+    .layui-form-select dl {
+        top: 29px !important;
+        left: 4px !important;
+        min-width: 802% !important;
+        max-height: 280px !important;
+        padding: 14px 0 !important;
+    }
+    .layui-form-select dl dd.layui-this {
+        display: none;
+    }
+    .layui-form-select dl dd {
+        cursor: pointer;
+        width: 130px;
+    }
+    .lefto {
+        margin-left: 6px;
+    }
+    .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;
+    }
+    #selectAll {
+        cursor: pointer;
+    }
+    .query_ors {
+        width: 140px;
+    }
+</style>
+
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>问题订单监控</h3>
+            <ul class="tab-base">
+                <li><a href="index.php?act=ordersendlist&op=index"><span>商户超时订单监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=monitor_notify"><span>渠道回调超时监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=neterr_order"><span>网络错误订单监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=notify_err_order"><span>未回调订单监控</span></a></li>
+                <li><a href="index.php?act=ordersendlist&op=refill_detail_monitor"><span>接单记录监控</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>机构查单错误列表</span></a></li>
+                <li>
+                    <a href="index.php?act=ordersendlist&op=order_exception"><span>异常订单监控</span>
+                        <?php if($output['except_stat'] > 0){?>
+                            <span class="badge"><?php echo $output['except_stat'];?></span>
+                        <?php }?>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+    <form method="get" action="index.php" name="formSearch" id="formSearch">
+        <input type="hidden" name="act" value="ordersendlist"/>
+        <input type="hidden" name="op" value="query_err"/>
+        <table class="tb-type1 noborder search">
+            <tr>
+                <th><label>客户名称</label></th>
+                <td class="layui-form">
+                    <select name="mchid" class="querySelect" lay-verify="">
+                        <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']; ?></option>
+                        <?php } ?>
+                    </select>
+                </td>
+
+                <th><label for="query_start_time">查询时间</label></th>
+                <td>
+                    <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>"
+                           id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
+                    <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" />
+                </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>
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                    </a>
+                </td>
+            </tr>
+        </table>
+    </form>
+    <table class="table tb-type2 nobdb">
+        <thead>
+        <tr class="thead">
+            <th class="align-left">编号</th>
+            <th class="align-left">机构编号</th>
+            <th class="align-left">机构名称</th>
+            <th class="align-left">商家单号</th>
+            <th class="align-left">查询时间</th>
+            <th class="align-left">错误code</th>
+            <th class="align-left">错误信息</th>
+        </tr>
+        </thead>
+        <tbody id="tbody">
+        <?php if (count($output['list']) > 0) { ?>
+            <?php
+            foreach ($output['list'] as $key => $item) { ?>
+                <tr class="hover trFlex">
+                    <td class="align-left"><?php echo $key+1;?></td>
+                    <td class="align-left"><?php echo $item['mchid']; ?></td>
+                    <td class="align-left"><?php echo $output['merchants'][$item['mchid']]['company_name'];?></td>
+                    <td class="align-left"><?php echo $item['mch_order']; ?></td>
+                    <td class="align-left"><?php echo date('Y-m-d H:i:s', $item['query_time']) ?? '/'; ?></td>
+                    <td class="align-left"><?php echo $item['code']; ?></td>
+                    <td class="align-left"><?php echo $item['msg']; ?></td>
+                </tr>
+            <?php } ?>
+        <?php } else { ?>
+            <tr class="no_data">
+                <td colspan="7"><?php echo $lang['nc_no_record']; ?></td>
+            </tr>
+        <?php } ?>
+        </tbody>
+        <tfoot>
+        <tr class="tfoot">
+            <td colspan="7" id="dataFuncs">
+                <div class="pagination"> <?php echo $output['show_page']; ?> </div>
+            </td>
+        </tr>
+        </tfoot>
+    </table>
+    <!-- 预警提示 -->
+    <audio id="auto" src="<?php echo RESOURCE_SITE_URL; ?>/warning.mp3"></audio>
+</div>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/jquery.ui.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"
+        charset="utf-8"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.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"/>
+<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">
+    $(function () {
+        $('#ncsubmit').click(function () {
+            $('#formSearch').submit();
+        });
+        $('#query_start_time').datepicker({dateFormat: 'yy-mm-dd'});
+        $('#query_end_time').datepicker({dateFormat: 'yy-mm-dd'});
+        // 日期选择器
+        laydate.render({
+            elem: '#startTime',
+            type: 'datetime'
+        });
+        laydate.render({
+            elem: '#endTime',
+            type: 'datetime'
+        });
+
+        //过滤
+        $("#mch_orders").blur(function () {
+            let test_mch = $("#mch_orders").val();
+            let result = test_mch.replace(/[\  \r\n\,]+/g, ",");
+            $(this).val(result)
+        })
+
+
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            let data_color = $(this).attr('data-timeout_State');
+            $(this).css('background', '#fff')
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            }, function () {
+                $(this).css('background', '#fff')
+            })
+        })
+    });
+    function hCopyOrder(e) {
+        let str = ''
+        $('#tbody tr').each(function () {
+            let res = $(this).find('td').eq(4).text()
+            str += res + '\n'
+        })
+        let oInput = document.createElement("textarea");
+        oInput.style.border = "0 none";
+        oInput.style.color = "transparent";
+        oInput.value = str;
+        document.body.appendChild(oInput);
+        oInput.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
+        oInput.parentNode.removeChild(oInput)
+    }
+
+    function hCopyCardNo(e) {
+        let str = ''
+        $('#tbody tr').each(function () {
+            let res = $(this).find('td').eq(5).text()
+            str += res + '\n'
+        })
+        let oInput = document.createElement("textarea");
+        oInput.style.border = "0 none";
+        oInput.style.color = "transparent";
+        oInput.value = str;
+        document.body.appendChild(oInput);
+        oInput.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
+        oInput.parentNode.removeChild(oInput)
+    }
+
+</script>

data/config/xyz/refill.ini.php

@@ -8164,25 +8164,31 @@ $quanmiao_phone = ['name' => 'quanmiao', 'store_id' => 299, 'qualitys' => '3',
         30 => [
             ['goods_id' => 8474, 'price' => 31.2, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8474, 'price' => 31.14, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8474, 'price' => 31.29, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 8475, 'price' => 52, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8475, 'price' => 51.9, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8475, 'price' => 52.15, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 8476, 'price' => 104, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8476, 'price' => 103.8, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8476, 'price' => 104.3, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 8477, 'price' => 208, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8477, 'price' => 207.6, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8477, 'price' => 208.6, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 8478, 'price' => 312, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8478, 'price' => 311.4, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8478, 'price' => 312.9, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         500 => [
-            ['goods_id' => 8479, 'price' => 520, 'quality' => 3, 'card_type' => 'chinamobile']
+            ['goods_id' => 8479, 'price' => 520, 'quality' => 3, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8479, 'price' => 521.5, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -8194,25 +8200,31 @@ $quanmiao_ylyw_phone = ['name' => 'quanmiao_ylyw', 'store_id' => 300, 'qualitys'
         30 => [
             ['goods_id' => 8482, 'price' => 31.2, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8482, 'price' => 31.14, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8482, 'price' => 31.29, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 8483, 'price' => 52, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8483, 'price' => 51.9, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8483, 'price' => 52.15, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 8484, 'price' => 104, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8484, 'price' => 103.8, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8484, 'price' => 104.3, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 8485, 'price' => 208, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8485, 'price' => 207.6, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8485, 'price' => 208.6, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         300 => [
             ['goods_id' => 8486, 'price' => 312, 'quality' => 3, 'card_type' => 'chinamobile'],
             ['goods_id' => 8486, 'price' => 311.4, 'quality' => 3, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8486, 'price' => 312.9, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ],
         500 => [
-            ['goods_id' => 8487, 'price' => 520, 'quality' => 3, 'card_type' => 'chinamobile']
+            ['goods_id' => 8487, 'price' => 520, 'quality' => 3, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8487, 'price' => 521.5, 'quality' => 3, 'card_type' => 'chinatelecom'],
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -8345,22 +8357,22 @@ $siyicheng_phone = ['name' => 'siyicheng', 'store_id' => 304, 'qualitys' => '1',
         30 => [
 //            ['goods_id' => 8514, 'price' => 30.03, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8514, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8514, 'price' => 30.03, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8514, 'price' => 29.19, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 8515, 'price' => 48.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8515, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8515, 'price' => 51.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8515, 'price' => 48.65, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 8516, 'price' => 96.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8516, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8516, 'price' => 100.05, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8516, 'price' => 97.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 8517, 'price' => 193.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8517, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8517, 'price' => 200.1, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8517, 'price' => 194.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
 //        300 => [
 //            ['goods_id' => 8518, 'price' => 300.15, 'quality' => 1, 'card_type' => 'chinamobile'],

data/config/yl/refill.ini.php

@@ -7074,22 +7074,22 @@ $siyicheng_phone = ['name' => 'siyicheng', 'store_id' => 265, 'qualitys' => '1',
         30 => [
 //            ['goods_id' => 8196, 'price' => 30.03, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8196, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8196, 'price' => 30.03, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8196, 'price' => 29.19, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 8197, 'price' => 48.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8197, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8197, 'price' => 51.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8197, 'price' => 48.65, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 8198, 'price' => 96.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8198, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8198, 'price' => 100.05, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8198, 'price' => 97.3, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 8199, 'price' => 193.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 8199, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
-//            ['goods_id' => 8199, 'price' => 200.1, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 8199, 'price' => 194.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
 //        300 => [
 //            ['goods_id' => 8200, 'price' => 300.15, 'quality' => 1, 'card_type' => 'chinamobile'],

data/model/refill_query_err.model.php

@@ -14,4 +14,11 @@ class refill_query_errModel extends Model
         $insert['query_time'] = time();
         return $this->insert($insert);
     }
+
+    public function getRefillQueryErrList($condition, $pagesize = '',$total = 0, $field = '*', $order = 'query_time desc', $limit = '', $master = false)
+    {
+        $list = $this->field($field)->where($condition)->page($pagesize,$total)->order($order)->limit($limit)->master($master)->select();
+        if (empty($list)) return [];
+        return $list;
+    }
 }

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

@@ -72,7 +72,7 @@ class config
         "4-10-13" => 10, "4-20-13" => 20, "4-30-13" => 30, "4-50-13" => 50, "4-100-13" => 100, "4-200-13" => 200, "4-300-13" => 300, "4-500-13" => 500,//福建 13
         "4-10-5" => 10.035, "4-20-5" => 20.07, "4-30-5" => 30.09, "4-50-5" => 50.15, "4-100-5" => 100.3, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
-        "4-10-19" => 9.99, "4-20-19" => 19.98, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
+        "4-10-19" => 10.005, "4-20-19" => 20.1, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22
@@ -93,7 +93,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 9.93, "6-20-27" => 19.86, "6-30-27" => 29.79, "6-50-27" => 49.65, "6-100-27" => 99.3, "6-200-27" => 198.6, "6-300-27" => 298.2, "6-500-27" => 497,//陕西 27
+        "6-10-27" => 9.935, "6-20-27" => 19.87, "6-30-27" => 29.805, "6-50-27" => 49.675, "6-100-27" => 99.35, "6-200-27" => 198.7, "6-300-27" => 298.2, "6-500-27" => 497,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/xyz/hanwei_fs/api.txt

@@ -92,3 +92,11 @@ ID：200047
 天津电信50元	3120050
 天津电信100元	3120100
 天津电信200元	3120200
+
+2023.3.21
+1210030  辽宁移动30元
+1210050   辽宁移动50元
+1210100   辽宁移动100元
+1210200   辽宁移动200元
+1210300   辽宁移动300元
+1210500    辽宁移动500元

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

@@ -87,6 +87,13 @@ class config
                 100 => 1510100,
                 200 => 1510200,
             ],
+            //辽宁
+            6 => [
+                30  => 1210030,
+                50  => 1210050,
+                100 => 1210100,
+                200 => 1210200,
+            ],
         ],
         mtopcard\ChinaTelecomCard => [
             //广东
@@ -153,6 +160,7 @@ class config
         "4-30-20" => 28.5, "4-50-20" => 47.5, "4-100-20" => 95, "4-200-20" => 190,//广西 20
         "4-50-22" => 47.4, "4-100-22" => 94.8, "4-200-22" => 189.6,//重庆 22
         "4-50-23" => 47.4, "4-100-23" => 94.8, "4-200-23" => 189.6,//四川 23
+        "4-30-6" => 28.65, "4-50-6" => 47.75, "4-100-6" => 95.5, "4-200-6" => 191,//辽宁 6
 
         //电信
         "6-30-11" => 28.2, "6-50-11" => 47, "6-100-11" => 94, "6-200-11" => 188,//浙江 11

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

@@ -114,7 +114,7 @@ class config
     const Price = [
         //移动
         "4-10-6" => 9.708, "4-20-6" => 19.416, "4-30-6" => 29.124, "4-50-6" => 48.54, "4-100-6" => 97.08, "4-200-6" => 194.16, "4-300-6" => 291.24, "4-500-6" => 485.4,//辽宁 6
-        "4-30-19" => 29.979, "4-50-19" => 49.965, "4-100-19" => 99.93, "4-200-19" => 199.86, "4-300-19" => 299.79, "4-500-19" => 499.65,//广东 19
+        "4-30-19" => 29.949, "4-50-19" => 49.915, "4-100-19" => 99.83, "4-200-19" => 199.66, "4-300-19" => 299.49, "4-500-19" => 499.15,//广东 19
         "4-10-13" => 9.973, "4-20-13" => 19.946, "4-30-13" => 29.919, "4-50-13" => 49.865, "4-100-13" => 99.73, "4-200-13" => 199.46, "4-300-13" => 299.19, "4-500-13" => 498.65,//福建 13
         "4-10-29" => 9.91, "4-20-29" => 19.82, "4-30-29" => 29.73, "4-50-29" => 49.55, "4-100-29" => 99.1, "4-200-29" => 198.2, "4-300-29" => 297.3, "4-500-29" => 495.5,//青海 29
         "4-50-10" => 49.85, "4-100-10" => 99.7, "4-200-10" => 199.4,//江苏 10

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

@@ -30,7 +30,12 @@ class config
             300 => 'PLM100180'
         ],
         mtopcard\ChinaTelecomCard => [
-
+            30 => 'SKU100255',
+            50 => 'SKU100256',
+            100 => 'SKU100257',
+            200 => 'SKU100258',
+            300 => 'SKU100259',
+            500 => 'SKU100260'
         ],
     ];
 }

helper/refill/api/xyz/quanmiao/产品编码.txt

@@ -10,3 +10,10 @@
 全国联通DP100元	直充	100	PLM100178
 全国联通DP200元	直充	200	PLM100179
 全国联通DP300元	直充	300	PLM100180
+
+电信DQ(限)-30	直充	30	SKU100255	1.043
+电信DQ(限)-50	直充	50	SKU100256	1.043
+电信DQ(限)-100	直充	100	SKU100257	1.043
+电信DQ(限)-200	直充	200	SKU100258	1.043
+电信DQ(限)-300	直充	300	SKU100259	1.043
+电信DQ(限)-500	直充	500	SKU100260	1.043

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

@@ -30,7 +30,12 @@ class config
             300 => 'PLM100180'
         ],
         mtopcard\ChinaTelecomCard => [
-
+            30 => 'SKU100255',
+            50 => 'SKU100256',
+            100 => 'SKU100257',
+            200 => 'SKU100258',
+            300 => 'SKU100259',
+            500 => 'SKU100260'
         ],
     ];
 }

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

@@ -29,7 +29,10 @@ class config
         ],
 
         mtopcard\ChinaTelecomCard => [
-
+            30  => 100214,
+            50  => 100215,
+            100 => 100216,
+            200 => 100217,
         ]
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];

helper/refill/api/xyz/siyicheng/开户信息.txt

@@ -22,3 +22,8 @@ appSecret：XtcfHywlUEfPdaZw
 100219  全国联通50
 100220  全国联通100
 100221  全国联通200
+
+100214 全国电信30
+100215 全国电信50
+100216 全国电信100
+100217 全国电信200

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

@@ -197,10 +197,10 @@ class config
     //key格式 卡类型-面值-regin_no
     const Price = [
         //移动
-        "4-30-24" => 27.6, "4-50-24" => 46, "4-100-24" => 92, "4-200-24" => 184,//贵州 24
+        "4-30-24" => 27.48, "4-50-24" => 45.8, "4-100-24" => 91.6, "4-200-24" => 183.2,//贵州 24
         "4-30-13" => 28.08, "4-50-13" => 46.8, "4-100-13" => 93.6, "4-200-13" => 187.2,//福建 13
         "4-30-15" => 28.65, "4-50-15" => 47.75, "4-100-15" => 95.5, "4-200-15" => 191,//山东 15
-        "4-30-10" => 28.41, "4-50-10" => 47.35, "4-100-10" => 94.7, "4-200-10" => 189.4,//江苏 10
+        "4-30-10" => 28.29, "4-50-10" => 47.15, "4-100-10" => 94.3, "4-200-10" => 188.6,//江苏 10
         "4-50-19" => 47.35, "4-100-19" => 94.7, "4-200-19" => 189.4,//广东 19
         "4-30-25" => 28.05, "4-50-25" => 46.75, "4-100-25" => 93.5, "4-200-25" => 187,//云南 25
         "4-50-16" => 47.25, "4-100-16" => 94.5, "4-200-16" => 189,//河南 16

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

@@ -72,7 +72,7 @@ class config
         "4-10-13" => 10, "4-20-13" => 20, "4-30-13" => 30, "4-50-13" => 50, "4-100-13" => 100, "4-200-13" => 200, "4-300-13" => 300, "4-500-13" => 500,//福建 13
         "4-10-5" => 10.035, "4-20-5" => 20.07, "4-30-5" => 30.09, "4-50-5" => 50.15, "4-100-5" => 100.3, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
-        "4-10-19" => 9.99, "4-20-19" => 19.98, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
+        "4-10-19" => 10.005, "4-20-19" => 20.1, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22
@@ -93,7 +93,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 9.93, "6-20-27" => 19.86, "6-30-27" => 29.79, "6-50-27" => 49.65, "6-100-27" => 99.3, "6-200-27" => 198.6, "6-300-27" => 298.2, "6-500-27" => 497,//陕西 27
+        "6-10-27" => 9.935, "6-20-27" => 19.87, "6-30-27" => 29.805, "6-50-27" => 49.675, "6-100-27" => 99.35, "6-200-27" => 198.7, "6-300-27" => 298.2, "6-500-27" => 497,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/yl/hanwei_fs/config.php

@@ -87,6 +87,13 @@ class config
                 100 => 1510100,
                 200 => 1510200,
             ],
+            //辽宁
+            6 => [
+                30  => 1210030,
+                50  => 1210050,
+                100 => 1210100,
+                200 => 1210200,
+            ],
         ],
         mtopcard\ChinaTelecomCard => [
             //广东
@@ -153,6 +160,7 @@ class config
         "4-30-20" => 28.5, "4-50-20" => 47.5, "4-100-20" => 95, "4-200-20" => 190,//广西 20
         "4-50-22" => 47.4, "4-100-22" => 94.8, "4-200-22" => 189.6,//重庆 22
         "4-50-23" => 47.4, "4-100-23" => 94.8, "4-200-23" => 189.6,//四川 23
+        "4-30-6" => 28.65, "4-50-6" => 47.75, "4-100-6" => 95.5, "4-200-6" => 191,//辽宁 6
 
         //电信
         "6-30-11" => 28.2, "6-50-11" => 47, "6-100-11" => 94, "6-200-11" => 188,//浙江 11

helper/refill/api/yl/siyicheng/config.php

@@ -29,7 +29,10 @@ class config
         ],
 
         mtopcard\ChinaTelecomCard => [
-
+            30  => 100214,
+            50  => 100215,
+            100 => 100216,
+            200 => 100217,
         ]
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];

helper/refill/api/yl/yangchi_fs/config.php

@@ -197,10 +197,10 @@ class config
     //key格式 卡类型-面值-regin_no
     const Price = [
         //移动
-        "4-30-24" => 27.6, "4-50-24" => 46, "4-100-24" => 92, "4-200-24" => 184,//贵州 24
+        "4-30-24" => 27.48, "4-50-24" => 45.8, "4-100-24" => 91.6, "4-200-24" => 183.2,//贵州 24
         "4-30-13" => 28.08, "4-50-13" => 46.8, "4-100-13" => 93.6, "4-200-13" => 187.2,//福建 13
         "4-30-15" => 28.65, "4-50-15" => 47.75, "4-100-15" => 95.5, "4-200-15" => 191,//山东 15
-        "4-30-10" => 28.41, "4-50-10" => 47.35, "4-100-10" => 94.7, "4-200-10" => 189.4,//江苏 10
+        "4-30-10" => 28.29, "4-50-10" => 47.15, "4-100-10" => 94.3, "4-200-10" => 188.6,//江苏 10
         "4-50-19" => 47.35, "4-100-19" => 94.7, "4-200-19" => 189.4,//广东 19
         "4-30-25" => 28.05, "4-50-25" => 46.75, "4-100-25" => 93.5, "4-200-25" => 187,//云南 25
         "4-50-16" => 47.25, "4-100-16" => 94.5, "4-200-16" => 189,//河南 16