Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
李可松 5 years ago
parent
commit
ab2a800a24
  1. 41
      app/AdminAgent/Controllers/FinanceStatisticsController.php
  2. 84
      app/AdminAgent/Controllers/OrderStatisticsController.php
  3. 102
      app/AdminAgent/Controllers/ProductStatisticsController.php
  4. 57
      app/AdminAgent/Controllers/UserStatisticsController.php
  5. 43
      app/AdminAgent/Metrics/Examples/FinanceStatistics.php
  6. 133
      app/AdminAgent/Metrics/Examples/OrderStatistics.php
  7. 134
      app/AdminAgent/Metrics/Examples/ProductStatistics.php
  8. 142
      app/AdminAgent/Metrics/Examples/UserStatistics.php
  9. 3
      app/AdminAgent/routes.php
  10. 6
      app/Models/Order.php

41
app/AdminAgent/Controllers/FinanceStatisticsController.php

@ -3,6 +3,9 @@
namespace App\AdminAgent\Controllers;
use App\AdminAgent\Metrics\Examples\FinanceStatistics;
use App\Common\OrderStatus;
use App\Models\Order;
use App\Models\OrderProductItem;
use Dcat\Admin\Admin;
use Dcat\Admin\Layout\Column;
use Dcat\Admin\Layout\Content;
@ -21,7 +24,20 @@ class FinanceStatisticsController extends AdminController
}
CSS
);
$count = $total = $totalNon = 0;
//数据
//金额
$price = Order::query()->where('agent_id',Admin::user()->id)->complete()->sum('price');
//利润
$costPrice = OrderProductItem::query()->where('agent_id',Admin::user()->id)->whereHas('order',function ($query) {
$query->complete();
})->sum('price');
$profit = bcsub($price,$costPrice,2);
//已完成订单
$count = Order::query()->where('agent_id',Admin::user()->id)->complete()->count();
return $content
->body(
<<<HTML
@ -38,34 +54,34 @@ class FinanceStatisticsController extends AdminController
HTML
)
->body(function (Row $row) use ($count, $total, $totalNon) {
->body(function (Row $row) use ($price, $profit, $count) {
$row->column(4, function (Column $column) use ($count) {
$column->row(Card::make('金额', function () use ($count) {
$row->column(4, function (Column $column) use ($price) {
$column->row(Card::make('金额', function () use ($price) {
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$count</h2>
<h2 class="ml-1 font-large-1 text-primary">$price</h2>
</div>
HTML;
}));
});
$row->column(4, function (Column $column) use ($total) {
$column->row(Card::make('利润', function () use ($total) {
$row->column(4, function (Column $column) use ($profit) {
$column->row(Card::make('利润', function () use ($profit) {
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$total</h2>
<h2 class="ml-1 font-large-1 text-primary">$profit</h2>
</div>
HTML;
}));
});
$row->column(4, function (Column $column) use ($totalNon) {
$column->row(Card::make('已完成订单', function () use ($totalNon) {
$row->column(4, function (Column $column) use ($count) {
$column->row(Card::make('已完成订单', function () use ($count) {
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$totalNon</h2>
<h2 class="ml-1 font-large-1 text-primary">$count</h2>
</div>
HTML;
}));
@ -74,7 +90,8 @@ HTML;
})
->body(function (Row $row){
$row->column(12,new FinanceStatistics());
$row->column(12,new FinanceStatistics()
);
});
}
}

84
app/AdminAgent/Controllers/OrderStatisticsController.php

@ -0,0 +1,84 @@
<?php
namespace App\AdminAgent\Controllers;
use App\AdminAgent\Metrics\Examples\FinanceStatistics;
use App\AdminAgent\Metrics\Examples\OrderStatistics;
use App\Common\OrderStatus;
use App\Models\Order;
use App\Models\OrderProductItem;
use Dcat\Admin\Admin;
use Dcat\Admin\Layout\Column;
use Dcat\Admin\Layout\Content;
use Dcat\Admin\Layout\Row;
use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Card;
use Illuminate\Support\Arr;
class OrderStatisticsController extends AdminController
{
public function index(Content $content)
{
Admin::style(
<<<CSS
.col-sm-12.d-flex{
display: inline-block !important;
}
CSS
);
//数据
//订单
return $content
->body(
<<<HTML
<div class="content-header">
<section class="content-header breadcrumbs-top">
<h1 class=" float-left">
<span class="text-capitalize">订单统计</span>
</h1>
<div class="clearfix"></div>
</section>
</div>
HTML
)
->body(function (Row $row) {
$orders = Order::query()->where('agent_id',Admin::user()->id)->select('*')->selectRaw("count(id) as count_id")->groupBy('status')->get();
$count = Order::query()->where('agent_id',Admin::user()->id)->count();
$row->column(3, function (Column $column) use ($count) {
$column->row(Card::make('总数', function () use ($count) {
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$count</h2>
</div>
HTML;
}));
});
$arr = OrderStatus::array();
foreach ($orders as $order) {
$row->column(3, function (Column $column) use ($order,$arr) {
$column->row(Card::make($arr[$order->status], function () use ($order) {
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$order->count_id</h2>
</div>
HTML;
}));
});
}
})
->body(function (Row $row){
$row->column(12,new OrderStatistics()
);
});
}
}

102
app/AdminAgent/Controllers/ProductStatisticsController.php

@ -0,0 +1,102 @@
<?php
namespace App\AdminAgent\Controllers;
use App\AdminAgent\Metrics\Examples\FinanceStatistics;
use App\AdminAgent\Metrics\Examples\OrderStatistics;
use App\AdminAgent\Metrics\Examples\ProductStatistics;
use App\AdminAgent\Metrics\Examples\UserStatistics;
use App\Common\OrderStatus;
use App\Common\ProductStatus;
use App\Models\AgentProduct;
use App\Models\Order;
use App\Models\OrderProductItem;
use Dcat\Admin\Admin;
use Dcat\Admin\Layout\Column;
use Dcat\Admin\Layout\Content;
use Dcat\Admin\Layout\Row;
use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Card;
use Illuminate\Support\Arr;
class ProductStatisticsController extends AdminController
{
public function index(Content $content)
{
Admin::style(
<<<CSS
.col-sm-12.d-flex{
display: inline-block !important;
}
CSS
);
//数据
//订单
return $content
->body(
<<<HTML
<div class="content-header">
<section class="content-header breadcrumbs-top">
<h1 class=" float-left">
<span class="text-capitalize">商品统计</span>
</h1>
<div class="clearfix"></div>
</section>
</div>
HTML
)
->body(function (Row $row){
$row->column(4, function (Column $column) {
$column->row(Card::make('总数', function () {
$count = AgentProduct::query()->where('agent_id',Admin::user()->id)->count();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$count</h2>
</div>
HTML;
}));
});
$row->column(4, function (Column $column) {
$column->row(Card::make('上架', function () {
$profit = AgentProduct::query()->where('agent_id',Admin::user()->id)->where('status',ProductStatus::ON_SALE)->count();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$profit</h2>
</div>
HTML;
}));
});
$row->column(4, function (Column $column) {
$column->row(Card::make('下架', function () {
$unSale = AgentProduct::query()
->where('agent_id',Admin::user()->id)
->where('status',ProductStatus::SOLD_OUT)
->count();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1 text-primary">$unSale</h2>
</div>
HTML;
}));
});
})
->body(function (Row $row){
$row->column(12,new ProductStatistics()
);
});
}
}

57
app/AdminAgent/Controllers/UserStatisticsController.php

@ -0,0 +1,57 @@
<?php
namespace App\AdminAgent\Controllers;
use App\AdminAgent\Metrics\Examples\FinanceStatistics;
use App\AdminAgent\Metrics\Examples\OrderStatistics;
use App\AdminAgent\Metrics\Examples\UserStatistics;
use App\Common\OrderStatus;
use App\Models\Order;
use App\Models\OrderProductItem;
use Dcat\Admin\Admin;
use Dcat\Admin\Layout\Column;
use Dcat\Admin\Layout\Content;
use Dcat\Admin\Layout\Row;
use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Card;
use Illuminate\Support\Arr;
class UserStatisticsController extends AdminController
{
public function index(Content $content)
{
Admin::style(
<<<CSS
.col-sm-12.d-flex{
display: inline-block !important;
}
CSS
);
//数据
//订单
return $content
->body(
<<<HTML
<div class="content-header">
<section class="content-header breadcrumbs-top">
<h1 class=" float-left">
<span class="text-capitalize">用户统计</span>
</h1>
<div class="clearfix"></div>
</section>
</div>
HTML
)
->body(function (Row $row){
$row->column(12,new UserStatistics()
);
});
}
}

43
app/AdminAgent/Metrics/Examples/FinanceStatistics.php

@ -2,9 +2,13 @@
namespace App\AdminAgent\Metrics\Examples;
use App\Common\OrderStatus;
use App\Models\Order;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Metrics\Bar;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
class FinanceStatistics extends Bar
{
@ -23,7 +27,7 @@ class FinanceStatistics extends Bar
$this->chartHeight = 500;
// 设置下拉选项
$this->dropdown([
'7' => '日',
'1' => '日',
'30' => '月',
'365' => '年',
]);
@ -42,16 +46,33 @@ class FinanceStatistics extends Bar
*/
public function handle(Request $request)
{
$query = Order::query()
->where('agent_id',Admin::user()->id)
->complete()
->select('*');
switch ($request->get('option')) {
case '7':
case '1':
$query->addSelect(DB::raw("sum(price) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
break;
case '30':
$query->addSelect(DB::raw("sum(price) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at)) AS statistics_time"));
break;
case '365':
$query->addSelect(DB::raw("sum(price) as sum_price,CONCAT(YEAR(created_at)) AS statistics_time"));
break;
default:
// 图表数据
$this->withChart(
[75, 125, 225, 175, 125, 75, 25]
);
$query->addSelect(DB::raw("sum(price) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
}
$order = $query->groupBy('statistics_time')
->orderBy('created_at')
->get()
->toArray();
$this->withChart(
Arr::pluck($order,'sum_price')
);
$this->chartLabels(
Arr::pluck($order,'statistics_time')
);
}
/**
@ -89,9 +110,9 @@ class FinanceStatistics extends Bar
'show' => false
],
'xaxis' => [
'categories' =>
[75, 125, 225, 175, 125, 75, 25]
,
//'categories' =>
// [75, 125, 225, 175, 125, 75, 25]
//,
'labels' => [
'show' => true,
'style' => [

133
app/AdminAgent/Metrics/Examples/OrderStatistics.php

@ -0,0 +1,133 @@
<?php
namespace App\AdminAgent\Metrics\Examples;
use App\Common\DataTime;
use App\Common\OrderStatus;
use App\Models\Order;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Metrics\Bar;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
class OrderStatistics extends Bar
{
/**
* 初始化卡片内容
*/
protected function init()
{
parent::init();
$color = Admin::color();
// 卡片内容宽度
$this->contentWidth(0, 12);
// 标题
//$this->title('财务统计');
$this->chartHeight = 500;
// 设置下拉选项
$this->dropdown([
'1' => '日',
'30' => '月',
'365' => '年',
]);
// 设置图表颜色
$this->chartColors([
$color->green(),
]);
}
/**
* 处理请求
*
* @param Request $request
*
* @return mixed|void
*/
public function handle(Request $request)
{
$query = Order::query()
->where('agent_id',Admin::user()->id)
->select('*');
switch ($request->get('option')) {
case '1':
$query->selectRaw("count(id) as sum_price,date(created_at) AS statistics_time");
break;
case '30':
$query->selectRaw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at)) AS statistics_time");
break;
case '365':
$query->selectRaw("count(id) as sum_price,CONCAT(YEAR(created_at)) AS statistics_time");
break;
default:
$query->selectRaw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time");
}
$order = $query->groupBy('statistics_time')
->orderBy('created_at')
->get()
->toArray();
$this->withChart(
Arr::pluck($order,'sum_price')
);
$this->chartLabels(
Arr::pluck($order,'statistics_time')
);
}
/**
* 设置图表数据.
*
* @param array $data
*
* @return $this
*/
public function withChart(array $data)
{
return $this->chart([
'series' => [[
'name' => '订单数',
'data' => $data
]],
'chart' => [
//'width' => '180%',
'type' => 'bar',
'events' => [
],
'toolbar' => ['show' => false],
],
'colors' => $this->colors,
'plotOptions' => [
'bar' => [
//'columnWidth' => '45%',
'distributed' => true,
]
],
'dataLabels' => [
'enabled' => false
],
'legend' => [
'show' => false
],
'xaxis' => [
//'categories' =>
// [75, 125, 225, 175, 125, 75, 25]
//,
'labels' => [
'show' => true,
'style' => [
'colors' => $this->colors,
'fontSize' => '12px'
]
],
],
'yaxis' => [
'show' => true
],
'tooltip' => [
'x' => ['show' => true],
],
]);
}
}

134
app/AdminAgent/Metrics/Examples/ProductStatistics.php

@ -0,0 +1,134 @@
<?php
namespace App\AdminAgent\Metrics\Examples;
use App\Common\DataTime;
use App\Common\OrderStatus;
use App\Models\Order;
use App\Models\User;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Metrics\Bar;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
class ProductStatistics extends Bar
{
/**
* 初始化卡片内容
*/
protected function init()
{
parent::init();
$color = Admin::color();
// 卡片内容宽度
$this->contentWidth(0, 12);
// 标题
//$this->title('财务统计');
$this->chartHeight = 500;
// 设置下拉选项
$this->dropdown([
'1' => '日',
'30' => '月',
'365' => '年',
]);
// 设置图表颜色
$this->chartColors([
$color->green(),
]);
}
/**
* 处理请求
*
* @param Request $request
*
* @return mixed|void
*/
public function handle(Request $request)
{
$query = Order::query()
->where('agent_id',Admin::user()->id)
->select('*');
switch ($request->get('option')) {
case '1':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
break;
case '30':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at)) AS statistics_time"));
break;
case '365':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at)) AS statistics_time"));
break;
default:
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
}
$order = $query->groupBy('statistics_time')
->orderBy('statistics_time')
->get();
$this->withChart(
Arr::pluck($order,'sum_price')
);
$this->chartLabels(
Arr::pluck($order,'statistics_time')
);
}
/**
* 设置图表数据.
*
* @param array $data
*
* @return $this
*/
public function withChart(array $data)
{
return $this->chart([
'series' => [[
'name' => '销量',
'data' => $data
]],
'chart' => [
//'width' => '180%',
'type' => 'bar',
'events' => [
],
'toolbar' => ['show' => false],
],
'colors' => $this->colors,
'plotOptions' => [
'bar' => [
//'columnWidth' => '45%',
'distributed' => true,
]
],
'dataLabels' => [
'enabled' => false
],
'legend' => [
'show' => false
],
'xaxis' => [
//'categories' =>
// [75, 125, 225, 175, 125, 75, 25]
//,
'labels' => [
'show' => true,
'style' => [
'colors' => $this->colors,
'fontSize' => '12px'
]
],
],
'yaxis' => [
'show' => true
],
'tooltip' => [
'x' => ['show' => true],
],
]);
}
}

142
app/AdminAgent/Metrics/Examples/UserStatistics.php

@ -0,0 +1,142 @@
<?php
namespace App\AdminAgent\Metrics\Examples;
use App\Common\DataTime;
use App\Common\OrderStatus;
use App\Models\Order;
use App\Models\User;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Metrics\Bar;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
class UserStatistics extends Bar
{
/**
* 初始化卡片内容
*/
protected function init()
{
parent::init();
$color = Admin::color();
// 卡片内容宽度
$this->contentWidth(0, 12);
// 标题
//$this->title('财务统计');
$this->chartHeight = 500;
// 设置下拉选项
$this->dropdown([
'1' => '日',
'30' => '月',
'365' => '年',
]);
// 设置图表颜色
$this->chartColors([
$color->green(),
]);
}
/**
* 处理请求
*
* @param Request $request
*
* @return mixed|void
*/
public function handle(Request $request)
{
$query = User::query()
->where('agent_id',Admin::user()->id)
->select('*');
switch ($request->get('option')) {
case '1':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
break;
case '30':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at)) AS statistics_time"));
break;
case '365':
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at)) AS statistics_time"));
break;
default:
$query->addSelect(DB::raw("count(id) as sum_price,CONCAT(YEAR(created_at),'-',MONTH(created_at),'-',DAY(created_at)) AS statistics_time"));
}
$users = $query->groupBy('statistics_time')
->orderBy('statistics_time')
->get();
$userNum = 0;
$userArr = [];
foreach ($users as $user) {
$userNum += $user->sum_price;
array_push($userArr,$userNum);
}
$this->withChart(
$userArr
);
$this->chartLabels(
Arr::pluck($users,'statistics_time')
);
}
/**
* 设置图表数据.
*
* @param array $data
*
* @return $this
*/
public function withChart(array $data)
{
return $this->chart([
'series' => [[
'name' => '用户数',
'data' => $data
]],
'chart' => [
//'width' => '180%',
'type' => 'bar',
'events' => [
],
'toolbar' => ['show' => false],
],
'colors' => $this->colors,
'plotOptions' => [
'bar' => [
//'columnWidth' => '45%',
'distributed' => true,
]
],
'dataLabels' => [
'enabled' => false
],
'legend' => [
'show' => false
],
'xaxis' => [
//'categories' =>
// [75, 125, 225, 175, 125, 75, 25]
//,
'labels' => [
'show' => true,
'style' => [
'colors' => $this->colors,
'fontSize' => '12px'
]
],
],
'yaxis' => [
'show' => true
],
'tooltip' => [
'x' => ['show' => true],
],
]);
}
}

3
app/AdminAgent/routes.php

@ -38,4 +38,7 @@ Route::group([
$router->resource('channel/list', 'ChannelController');
$router->resource('group_order/list', 'GroupOrderController');
$router->resource('finance_statistics', 'FinanceStatisticsController');
$router->resource('order_statistics', 'OrderStatisticsController');
$router->resource('user_statistics', 'UserStatisticsController');
$router->resource('product_statistics', 'ProductStatisticsController');
});

6
app/Models/Order.php

@ -2,6 +2,7 @@
namespace App\Models;
use App\Common\OrderStatus;
use App\Common\PayType;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
@ -13,6 +14,11 @@ class Order extends BaseModel
use HasFactory, SoftDeletes;
protected $guarded = ['created_at', 'updated_at']; //不可批量赋值的属性
public function scopeComplete($query)
{
return $query->where('status',OrderStatus::SUCCESS);
}
public function getCouponIdAttribute($value)
{
return explode(',', $value);

Loading…
Cancel
Save