order stats list export bug

admin/control/orderstats.php

@@ -96,11 +96,11 @@ class orderstatsControl extends SystemControl
                 $profit_amounts_total += $stats['profit_amounts'];
             }
             $total_stats[$type] = [
-                'success_count_total' => $success_count_total,
-                'success_refill_amounts_total' => $success_refill_amounts_total,
-                'success_mch_amounts_toatl' => $success_mch_amounts_total,
-                'success_channel_amounts_total' => $success_channel_amounts_total,
-                'profit_amounts_total' => $profit_amounts_total
+                'success_count_total' => ncPriceFormat($success_count_total),
+                'success_refill_amounts_total' => ncPriceFormat($success_refill_amounts_total),
+                'success_mch_amounts_toatl' => ncPriceFormat($success_mch_amounts_total),
+                'success_channel_amounts_total' => ncPriceFormat($success_channel_amounts_total),
+                'profit_amounts_total' => ncPriceFormat($profit_amounts_total)
             ];
         }
         return $total_stats;

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

@@ -339,11 +339,17 @@
             document.body.removeChild(link); 
         }
         $('#ncexport').click(function () {
+            let selectArr = selest_nc.getValue();
+            let selectStr = ''
+            for (let i = 0; i < selectArr.length; i++) {
+                selectStr += selectArr[i].value+','
+            }
+            selectStr = selectStr.substr(0, selectStr.length-1)
+
             let starTime = new Date($('input[name="query_start_time"]').val()).getTime()/1000;
             let endTime = new Date($('input[name="query_end_time"]').val()).getTime()/1000;
-            let cid = $('#cid').val()
+            let cid = selectStr
             let order_time_type = $('#order_time_type').val()
-            let text = $("#cid").find("option:selected").text();
 
             $.get('index.php?act=orderstats&op=ExportData&type=merchant', {
                 query_start_time: starTime,
@@ -360,9 +366,6 @@
                     } else if (starTime) {
                         time = '统计时间：'+$('input[name="query_start_time"]').val()
                     }
-                    if (text && cid) {
-                        time += '   下游名称：'+text
-                    }
                     if (time) {
                         head.push(time)
                     }

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

@@ -234,6 +234,7 @@
             
             $('input[name="cid"]').val(selectStr);
             $('#formSearch').submit();
+            $('input[name="cid"]').val('');
         });
         // 日期选择器
         laydate.render({
@@ -335,11 +336,17 @@
             document.body.removeChild(link); 
         }
         $('#ncexport').click(function () {
+            let selectArr = selest_nc.getValue();
+            let selectStr = ''
+            for (let i = 0; i < selectArr.length; i++) {
+                selectStr += selectArr[i].value+','
+            }
+            selectStr = selectStr.substr(0, selectStr.length-1)
+
             let starTime = new Date($('input[name="query_start_time"]').val()).getTime()/1000;
             let endTime = new Date($('input[name="query_end_time"]').val()).getTime()/1000;
-            let cid = $('#cid').val()
+            let cid = selectStr
             let order_time_type = $('#order_time_type').val()
-            let text = $("#cid").find("option:selected").text();
 
             $.get('index.php?act=orderstats&op=ExportData&type=provider', {
                 query_start_time: starTime,
@@ -356,9 +363,6 @@
                     } else if (starTime) {
                         time = '统计时间：'+$('input[name="query_start_time"]').val()
                     }
-                    if (text && cid) {
-                        time += '         上游名称：'+text
-                    }
                     if (time) {
                         head.push(time)
                     }