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

admin/control/refill_analysis.php

@@ -198,10 +198,11 @@ class refill_analysisControl extends SystemControl
 
     public function provider_dataOp()
     {
-        if(empty($_GET['quality'])){
-            echo json_encode([]);
+        $cond = [];
+        if(!empty($_GET['quality'])){
+//            echo json_encode([]);
+            $cond['qualitys'] = $_GET['quality'];
         }
-        $cond['qualitys'] = $_GET['quality'];
         $provider_list = $this->providers($cond);
         $result = [];
         foreach ($provider_list as $value) {

admin/templates/default/analysis.new_version.mch_order_send.php

@@ -0,0 +1,185 @@
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>成功率监控列表</h3>
+            <ul class="tab-base">
+                <li><a href="?index.php&act=refill_analysis&op=index&type=provider"><span>通道成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=index&type=system"><span>平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider"><span>新通道成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>新平台成功率监控</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>充值中订单监控</span></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+    <div style="margin-top: 10px;color: #e60d0d;">
+        请先选择时间
+    </div>
+    <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
+        <table class="tb-type1 noborder search tableFixed">
+            <tr>
+                <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>机构选择</label></th>
+                <td>
+                    <div id="select_merchants"></div>
+                </td>
+                <th><label>卡类型</label></th>
+                <td>
+                    <div id="select_cardtypes"></div>
+                </td>
+                <th><label>面额</label></th>
+                <td>
+                    <select name="amount">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="10" <?php if ($_GET['refill_amount'] == '10') { ?>selected<?php } ?>>10</option>
+                        <option value="20" <?php if ($_GET['refill_amount'] == '20') { ?>selected<?php } ?>>20</option>
+                        <option value="30" <?php if ($_GET['refill_amount'] == '30') { ?>selected<?php } ?>>30</option>
+                        <option value="50" <?php if ($_GET['refill_amount'] == '50') { ?>selected<?php } ?>>50</option>
+                        <option value="100" <?php if ($_GET['refill_amount'] == '100') { ?>selected<?php } ?>>100</option>
+                        <option value="200" <?php if ($_GET['refill_amount'] == '200') { ?>selected<?php } ?>>200</option>
+                        <option value="300" <?php if ($_GET['refill_amount'] == '300') { ?>selected<?php } ?>>300</option>
+                        <option value="500" <?php if ($_GET['refill_amount'] == '500') { ?>selected<?php } ?>>500</option>
+                        <option value="1000" <?php if ($_GET['refill_amount'] == '1000') { ?>selected<?php } ?>>1000</option>
+                        <option value="2000" <?php if ($_GET['refill_amount'] == '2000') { ?>selected<?php } ?>>2000</option>
+                    </select>
+                </td>
+                <th><label>滤波器</label></th>
+                <td>
+                    <select name="filter_wave">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="60">1分钟</option>
+                        <option value="300">5分钟</option>
+                        <option value="600">10分钟</option>
+                        <option value="900">15分钟</option>
+                        <option value="0" selected>关闭</option>
+                    </select>
+                </td>
+                <td>
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search"
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                    </a>
+                </td>
+            </tr>
+        </table>
+    </form>
+    <div id="box">
+        <!-- <iframe
+            src="https://www.xyzshops.cn/plot/index?time_stamp=1621488600&interval=60" scrolling="no" id="Iframe" frameborder="0"></iframe> -->
+    </div>
+</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 ADMIN_TEMPLATES_URL;?>/js/xm-select.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/moment-with-locales.js"></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">
+    $(function () {
+        laydate.render({
+            elem: '#startTime',
+            type: 'datetime'
+        });
+        laydate.render({
+            elem: '#endTime',
+            type: 'datetime'
+        });
+
+        let select_merchants
+        $.get('index.php?act=refill_analysis&op=merchant_data', function (data) {
+            data = JSON.parse(data)
+            select_merchants = xmSelect.render({
+                el: '#select_merchants',
+                size: 'mini',
+                filterable: true,
+                style: {
+                    minHeight: '27px',
+                    lineHeight: '27px',
+                    marginLeft: '4px',
+                    width: '250px'
+                },
+                language: 'zn',
+                data: data
+            })
+        })
+
+        let select_cardtypes
+        $.get('index.php?act=refill_analysis&op=card_type_data', function (data) {
+            data = JSON.parse(data)
+            select_cardtypes = xmSelect.render({
+                el: '#select_cardtypes',
+                size: 'mini',
+                filterable: true,
+                style: {
+                    minHeight: '27px',
+                    lineHeight: '27px',
+                    marginLeft: '4px',
+                    width: '250px'
+                },
+                language: 'zn',
+                data: data
+            })
+        })
+
+        function select_set(selectArr){
+            let selectStr = ''
+            for (let i = 0; i < selectArr.length; i++) {
+                selectStr += selectArr[i].value+','
+            }
+            selectStr = selectStr.substr(0, selectStr.length-1)
+            return selectStr
+        }
+
+        $('#ncsubmit').click(function () {
+            let query_start_time = $("input[name=query_start_time]").val()
+            let start_time = parseInt((new Date(query_start_time)).getTime()/1000);
+            let query_end_time = $("input[name=query_end_time]").val()
+            let end_time = parseInt((new Date(query_end_time)).getTime()/1000);
+
+            let mchids = select_set(select_merchants.getValue())
+            let card_types = select_set(select_cardtypes.getValue())
+            let spec = $("select[name=amount]").val()
+            let filter_wave = $("select[name=filter_wave]").val()
+            let src = window.location.origin + "/plot/mch_order_send?"
+            if (start_time) {
+                src += "&start_time=" + start_time;
+            }
+            if (end_time) {
+                if(end_time < start_time || !start_time)
+                {
+                    layer.msg('日期有误，结束日期需大于开始日期');
+                    return
+                }
+                src += "&end_time=" + end_time;
+            }
+            if (mchids) {
+                src += "&mchids=" + mchids;
+            }
+            if (card_types) {
+                src += "&card_types=" + card_types;
+            }
+            if (spec) {
+                src += "&spec=" + spec;
+            }
+            if(filter_wave > 0) {
+                src += '&filter_wave=' + filter_wave;
+            }
+            $.get(src, function (data){
+                if (!data) {
+                    return
+                }
+                $('#box').html(data)
+            });
+        });
+    })
+</script>

admin/templates/default/analysis.new_version.provider.php

@@ -8,6 +8,7 @@
                 <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>新通道成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>新平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=mch_order_send"><span>充值中订单监控</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/analysis.new_version.system.php

@@ -8,6 +8,7 @@
                 <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider"><span>新通道成功率监控</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>新平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=mch_order_send"><span>充值中订单监控</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/analysis.provider.php

@@ -8,6 +8,8 @@
                 <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider"><span>新通道成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>新平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=mch_order_send"><span>充值中订单监控</span></a></li>
+
             </ul>
         </div>
     </div>

admin/templates/default/analysis.system.php

@@ -8,6 +8,7 @@
                 <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider"><span>新通道成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>新平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=mch_order_send"><span>充值中订单监控</span></a></li>
 
             </ul>
         </div>

admin/templates/default/merchant.ratios.php

@@ -52,6 +52,7 @@
                 <li><a href="JavaScript:void(0);" class="current" ><span>机构成功率统计</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider"><span>新通道成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>新平台成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_analysis&op=new_version&type=mch_order_send"><span>充值中订单监控</span></a></li>
             </ul>
         </div>
     </div>