admin system successful

admin/control/merchant.php

@@ -247,10 +247,10 @@ class merchantControl extends SystemControl
                     $model_merchant->insertPrices($inserts);
                 }
                 $trans->commit();
-                showMessage('操作成功', 'index.php?act=merchant&op=merchant');
+                showMessage('操作成功');
             } catch (Exception $e) {
                 $trans->rollback();
-                showMessage('操作失败', 'index.php?act=merchant&op=merchant', 'html', 'error');
+                showMessage('操作失败');
             }
         }
         $mchid = $_GET['mchid'] ?? 0;

admin/control/refill_successful.php

@@ -9,7 +9,7 @@ class refill_successfulControl extends SystemControl
         parent::__construct();
     }
 
-    public function provider_successfulOp()
+    public function indexOp()
     {
         $days = $this->successful_where();
         Tpl::output('days', $days);
@@ -66,7 +66,7 @@ class refill_successfulControl extends SystemControl
         ksort($card_typeData);
         $result['card_type'] = $card_typeData;
 
-        $quality_txt = [1=>'普充', 2=>'快充', 3=>'卡密', 4=>'三方', 5=>'慢充'];
+        $quality_txt = [1=>'普充', 2=>'快充', 3=>'卡密', 4=>'三方', 5=>'慢充二十四小时', 6=>'慢充六小时', 7=>'慢充两小时'];
         foreach (array_unique($qualitys) as $quality) {
             $qualityData[$quality] = $quality_txt[$quality];
         }
@@ -88,6 +88,8 @@ class refill_successfulControl extends SystemControl
             return '中国联通';
         } elseif ($card_type == 6) { //中国电信
             return '中国电信';
+        } elseif ($card_type == 7) { //中国电信
+            return '增值业务';
         } else {
             return 'unknown';
         }

admin/include/menu.php

@@ -102,7 +102,7 @@ $arr = array(
 					array('args'=>'index,orderstats,merchant',				'text'=>'对账管理'),
 					array('args'=>'stats,card_key,merchant',				'text'=>'卡密管理'),
 					array('args'=>'index,refill_stock,merchant',			'text'=>'库存管理'),
-					array('args'=>'provider_successful,refill_successful,merchant',	'text'=>'成功率监控'),
+					array('args'=>'index,refill_successful,merchant',		'text'=>'成功率监控'),
 				)
 			),
 			4 => array(

admin/templates/default/merchant.order.stats.php

@@ -67,8 +67,8 @@
                 <ul>
                     <li class="lineLi" style="color:#000;">总计成功订单量： <?php echo $output['total_stats']['success_count_total'] ?? 0?></li>
                     <li class="lineLi" style="color:#000;">总计成功订单金额：<?php echo $output['total_stats']['success_refill_amounts_total'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计机构扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计通道扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计下游扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计上游扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
                 </ul>
             </td>
         </tr>
@@ -185,7 +185,7 @@
             // 标题
             for (const key in headData) {
                 var head = "<tr>";
-                var td = "<td colspan='13' style='font-size:16px;'>"+ headData[key] + '</td>';
+                var td = "<td colspan='12' style='font-size:16px;'>"+ headData[key] + '</td>';
                 excel += td + "</tr>";
             }
 
@@ -285,8 +285,8 @@
                     }
                     head.push('总计成功订单量:' + data.total_stats.success_count_total)
                     head.push('总计成功订单金额:' + data.total_stats.success_refill_amounts_total)
-                    head.push('总计机构扣款金额:' + data.total_stats.success_mch_amounts_toatl)
-                    head.push('总计通道扣款金额:' + data.total_stats.success_channel_amounts_total)
+                    head.push('总计下游扣款金额:' + data.total_stats.success_mch_amounts_toatl)
+                    head.push('总计上游扣款金额:' + data.total_stats.success_channel_amounts_total)
                     head.push('总计利润金额:' + data.total_stats.profit_amounts_total)
                     let title = [{value: "序号"},{value: "统计日期"},{value: "主体名称"},{value: "主体ID"},{value: "成功订单数"},{value: "成功金额"},{value: "下游金额"},{value: "上游金额"},{value: "利润"},{value: "订单总量"}, {value: "失败订单数量"},{value: "成功占比"}]
                     JSONToExcelConvertor(data.data, '下游对账记录', title, head)

admin/templates/default/provider.order.stats.php

@@ -67,8 +67,8 @@
                 <ul>
                     <li class="lineLi" style="color:#000;">总计成功订单量： <?php echo $output['total_stats']['success_count_total'] ?? 0?></li>
                     <li class="lineLi" style="color:#000;">总计成功订单金额：<?php echo $output['total_stats']['success_refill_amounts_total'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计机构扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计通道扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计下游扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计上游扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
                 </ul>
             </td>
         </tr>
@@ -185,7 +185,7 @@
             // 标题
             for (const key in headData) {
                 var head = "<tr>";
-                var td = "<td colspan='13' style='font-size:16px;'>"+ headData[key] + '</td>';
+                var td = "<td colspan='12' style='font-size:16px;'>"+ headData[key] + '</td>';
                 excel += td + "</tr>";
             }
 
@@ -209,8 +209,8 @@
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].cid + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].success_count + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].success_refill_amounts + '</td>';
-                row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].success_mch_amounts + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].success_channel_amounts + '</td>';
+                row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].success_mch_amounts + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].profit_amounts + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].order_count + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].cancel_count + '</td>';
@@ -285,10 +285,10 @@
                     }
                     head.push('总计成功订单量:' + data.total_stats.success_count_total)
                     head.push('总计成功订单金额:' + data.total_stats.success_refill_amounts_total)
-                    head.push('总计机构扣款金额:' + data.total_stats.success_mch_amounts_toatl)
-                    head.push('总计通道扣款金额:' + data.total_stats.success_channel_amounts_total)
+                    head.push('总计下游扣款金额:' + data.total_stats.success_mch_amounts_toatl)
+                    head.push('总计上游扣款金额:' + data.total_stats.success_channel_amounts_total)
                     head.push('总计利润金额:' + data.total_stats.profit_amounts_total)
-                    let title = [{value: "序号"},{value: "统计日期"},{value: "主体名称"},{value: "主体ID"},{value: "成功订单数"},{value: "成功金额"},{value: "下游金额"},{value: "上游金额"},{value: "利润"},{value: "订单总量"}, {value: "失败订单数量"},{value: "成功占比"}]
+                    let title = [{value: "序号"},{value: "统计日期"},{value: "主体名称"},{value: "主体ID"},{value: "成功订单数"},{value: "成功金额"},{value: "上游金额"},{value: "下游金额"},{value: "利润"},{value: "订单总量"}, {value: "失败订单数量"},{value: "成功占比"}]
                     JSONToExcelConvertor(data.data, '上游对账记录', title, head)
                 }
                 // console.log('data', data);

admin/templates/default/provider.successful.php

@@ -3,7 +3,8 @@
         <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=refill_successful&op=index&type=provider" class="classA" data-type="provider" ><span>通道成功率监控</span></a></li>
+                <li><a href="?index.php&act=refill_successful&op=index&type=system" class="classA" data-type="system" ><span>平台成功率监控</span></a></li>
             </ul>
         </div>
     </div>
@@ -99,6 +100,15 @@
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
 <script type="text/javascript">
     $(function () {
+        // 开始获取当前地址
+        let type = '<?php echo $_GET['type'];?>';
+        $(".classA").each(function () {
+            if (type == $(this).attr("data-type")) {
+                $(this).addClass('current')
+                $(this).attr('href','JavaScript:void(0);')
+            }
+        })
+
         $("#Iframe").load(function(){
             $(this).css("min-height", '900px')
             $(this).css("min-width", '1650px')

admin/templates/default/system.order.stats.php

@@ -54,8 +54,8 @@
                 <ul>
                     <li class="lineLi" style="color:#000;">总计成功订单量： <?php echo $output['total_stats']['success_count_total'] ?? 0?></li>
                     <li class="lineLi" style="color:#000;">总计成功订单金额：<?php echo $output['total_stats']['success_refill_amounts_total'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计机构扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
-                    <li class="lineLi" style="color:#000;">总计通道扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计下游扣款金额：<?php echo $output['total_stats']['success_mch_amounts_toatl'] ?? 0?></li>
+                    <li class="lineLi" style="color:#000;">总计上游扣款金额：<?php echo $output['total_stats']['success_channel_amounts_total'] ?? 0?></li>
                 </ul>
             </td>
           </tr>
@@ -247,8 +247,8 @@
                     }
                     head.push('总计成功订单量:' + data.total_stats.success_count_total)
                     head.push('总计成功订单金额:' + data.total_stats.success_refill_amounts_total)
-                    head.push('总计机构扣款金额:' + data.total_stats.success_mch_amounts_toatl)
-                    head.push('总计通道扣款金额:' + data.total_stats.success_channel_amounts_total)
+                    head.push('总计下游扣款金额:' + data.total_stats.success_mch_amounts_toatl)
+                    head.push('总计上游扣款金额:' + data.total_stats.success_channel_amounts_total)
                     head.push('总计利润金额:' + data.total_stats.profit_amounts_total)
                     let title = [{value: "序号"},{value: "统计日期"},{value: "主体名称"},{value: "主体ID"},{value: "成功订单数"},{value: "成功金额"},{value: "下游金额"},{value: "上游金额"},{value: "利润"},{value: "服务费"},{value: "订单总量"}, {value: "失败订单数量"},{value: "成功占比"}]
                     JSONToExcelConvertor(data.data, '平台对账记录', title, head)