diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html index d354a947a..177cb034a 100755 --- a/app/admin/view/default/index/init.html +++ b/app/admin/view/default/index/init.html @@ -173,25 +173,27 @@ - -
-
- - 订单成交金额走势 - -
- {{if !empty($time_data)}} - - {{foreach $time_data as $k=>$v}} - {{$v.name}} - {{/foreach}} - - {{/if}} - {{include file="/index/stats_where" /}} + + {{if isset($is_income) and $is_income eq true}} +
+
+ + 订单成交金额走势 + +
+ {{if !empty($time_data)}} + + {{foreach $time_data as $k=>$v}} + {{$v.name}} + {{/foreach}} + + {{/if}} + {{include file="/index/stats_where" /}} +
+
-
-
+ {{/if}}
diff --git a/app/service/StatisticalService.php b/app/service/StatisticalService.php index 07d6d3ac3..701a7a52c 100755 --- a/app/service/StatisticalService.php +++ b/app/service/StatisticalService.php @@ -637,37 +637,42 @@ class StatisticalService $data = []; $value_arr = []; $name_arr = []; - if(!empty($status_arr)) - { - $date = self::DayCreate($params['start'], $params['end']); - foreach($date as $day) - { - // 当前日期名称 - $name_arr[] = date('Y-m-d', $day['start']); - // 根据状态获取数量 - foreach($status_arr as $status) + // 订单收入总计、是否有收入统计权限 + if(AdminIsPower('index', 'income')) + { + if(!empty($status_arr)) + { + $date = self::DayCreate($params['start'], $params['end']); + foreach($date as $day) { - // 获取订单 - $where = [ - ['status', '=', $status], - ['add_time', '>=', $day['start']], - ['add_time', '<=', $day['end']], - ]; - $value_arr[$status][] = Db::name('Order')->where($where)->sum('pay_price'); + // 当前日期名称 + $name_arr[] = date('Y-m-d', $day['start']); + + // 根据状态获取数量 + foreach($status_arr as $status) + { + // 获取订单 + $where = [ + ['status', '=', $status], + ['add_time', '>=', $day['start']], + ['add_time', '<=', $day['end']], + ]; + $value_arr[$status][] = Db::name('Order')->where($where)->sum('pay_price'); + } } } - } - // 数据格式组装 - foreach($status_arr as $status) - { - $data[] = [ - 'name' => $order_status_list[$status]['name'], - 'type' => ($status == 4) ? 'line' : 'bar', - 'tiled' => '总量', - 'data' => empty($value_arr[$status]) ? [] : $value_arr[$status], - ]; + // 数据格式组装 + foreach($status_arr as $status) + { + $data[] = [ + 'name' => $order_status_list[$status]['name'], + 'type' => ($status == 4) ? 'line' : 'bar', + 'tiled' => '总量', + 'data' => empty($value_arr[$status]) ? [] : $value_arr[$status], + ]; + } } // 数据组装