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

admin/control/refill_analysis.php

@@ -159,12 +159,50 @@ class refill_analysisControl extends SystemControl
     {
         $type = $_GET['type'] ?? 'provider';
         $page = "analysis.new_version.{$type}";
+        if($type == 'provider')
+        {
+            global $config;
+            $cond['type'] = ['in', [mtopcard\OilCardPaper, mtopcard\PhoneCardPaper]];
+            $cond['opened'] = 1;
+            $open_providers = $this->providers($cond);
+            $cond['opened'] = 2;
+            $cond['oper_time'] = ['gt', time() - 86400 * 7];
+            $close_providers = $this->providers($cond);
+            $provider_items = array_merge($open_providers, $close_providers);
+
+            foreach ($provider_items as $item) {
+                $provider_list[$item['type']][] = $item;
+            }
+            foreach ($provider_list as $provider_type => $providers)
+            {
+                $data = [];
+                foreach ($providers as $provider) {
+                    $quality = $provider['qualitys'];
+                    if (empty($data[$quality]['name'])) {
+                        $quality_text = $provider['type'] == mtopcard\OilCardPaper ? $config['oil_quality_text'] : $config['phone_quality_text'];
+                        $data[$quality]['name'] = $quality_text[$quality];
+                    }
+                    $data[$quality]['params'][] = [
+                        'name' => $provider['store_name'],
+                        'value' => $provider['name']
+                    ];
+                }
+                ksort($data);
+                $result[$provider_type] = $data;
+            }
+            ksort($result);
+            Tpl::output('providers', $result);
+        }
         Tpl::showpage($page);
     }
 
     public function provider_dataOp()
     {
-        $provider_list = $this->providers();
+        if(empty($_GET['quality'])){
+            echo json_encode([]);
+        }
+        $cond['qualitys'] = $_GET['quality'];
+        $provider_list = $this->providers($cond);
         $result = [];
         foreach ($provider_list as $value) {
             $data['name'] = $value['store_name'] ?? $value['name'];

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

@@ -20,11 +20,35 @@
             <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" />
+                    <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" />
+                    <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>
+                    <select name="quality" class="querySelect">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="<?php echo refill\Quality::Normal; ?>">普充（无流水）
+                        </option>
+                        <option value="<?php echo refill\Quality::Quick; ?>">快充
+                        </option>
+                        <option value="<?php echo refill\Quality::CardKey; ?>">卡密
+                        </option>
+                        <option value="<?php echo refill\Quality::ThirdShop; ?>">三方
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowTwentyFour; ?>">慢24(有流水)
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowSix; ?>">慢6
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowTwo; ?>">慢2
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowFortyEight; ?>">慢48
+                        </option>
+                        <option value="<?php echo refill\Quality::SlowSeventyTwo; ?>">慢72
+                        </option>
+                        <option value="<?php echo refill\Quality::Fastest; ?>">速充
+                        </option>
+                    </select>
                 </td>
                 <th><label>通道选择</label></th>
                 <td>
@@ -62,8 +86,7 @@
                     </select>
                 </td>
                 <td>
-                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search"
-                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search" title="<?php echo $lang['nc_query']; ?>">&nbsp;
                     </a>
                 </td>
             </tr>
@@ -76,15 +99,17 @@
 </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" 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 () {
+    $(function() {
+
+        var provider = <?php echo json_encode($output['providers']) ?>
+
+
         laydate.render({
             elem: '#startTime',
             type: 'datetime'
@@ -95,7 +120,7 @@
         });
 
         let select_chnames
-        $.get('index.php?act=refill_analysis&op=provider_data', function (data) {
+        $.get('index.php?act=refill_analysis&op=provider_data', function(data) {
             data = JSON.parse(data)
             select_chnames = xmSelect.render({
                 el: '#select_chnames',
@@ -113,7 +138,7 @@
         })
 
         let select_cardtypes
-        $.get('index.php?act=refill_analysis&op=card_type_data', function (data) {
+        $.get('index.php?act=refill_analysis&op=card_type_data', function(data) {
             data = JSON.parse(data)
             select_cardtypes = xmSelect.render({
                 el: '#select_cardtypes',
@@ -130,20 +155,20 @@
             })
         })
 
-        function select_set(selectArr){
+        function select_set(selectArr) {
             let selectStr = ''
             for (let i = 0; i < selectArr.length; i++) {
-                selectStr += selectArr[i].value+','
+                selectStr += selectArr[i].value + ','
             }
-            selectStr = selectStr.substr(0, selectStr.length-1)
+            selectStr = selectStr.substr(0, selectStr.length - 1)
             return selectStr
         }
 
-        $('#ncsubmit').click(function () {
+        $('#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 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 end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
 
             let chnames = select_set(select_chnames.getValue())
             let card_types = select_set(select_cardtypes.getValue())
@@ -154,8 +179,7 @@
                 src += "&start_time=" + start_time;
             }
             if (end_time) {
-                if(end_time < start_time || !start_time)
-                {
+                if (end_time < start_time || !start_time) {
                     layer.msg('日期有误，结束日期需大于开始日期');
                     return
                 }
@@ -170,10 +194,10 @@
             if (spec) {
                 src += "&spec=" + spec;
             }
-            if(filter_wave > 0) {
+            if (filter_wave > 0) {
                 src += '&filter_wave=' + filter_wave;
             }
-            $.get(src, function (data){
+            $.get(src, function(data) {
                 if (!data) {
                     return
                 }
@@ -181,4 +205,4 @@
             });
         });
     })
-</script> 
+</script>