diff --git a/CHANGELOG.md b/CHANGELOG.md index b5fbe0f3..95530986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### [v1.1.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.1.0)(2020-10-08) + +- 增加运营统计功能 +- 增加课程资料功能 +- 增加changelog +- 忽略schema +- 账户安全页面调整 +- 简化部分路由 +- 修复相关课程列表undefined问题 + ### [v1.0.0-beta1](https://gitee.com/koogua/course-tencent-cloud/releases/v1.0.0-beta1)(2020-09-26) 前台功能： diff --git a/app/Caches/SiteTodayStat.php b/app/Caches/SiteTodayStat.php index dde4824b..13c0ae66 100644 --- a/app/Caches/SiteTodayStat.php +++ b/app/Caches/SiteTodayStat.php @@ -2,8 +2,7 @@ namespace App\Caches; -use App\Models\Order as OrderModel; -use App\Models\User as UserModel; +use App\Repos\Stat as StatRepo; class SiteTodayStat extends Cache { @@ -22,42 +21,21 @@ class SiteTodayStat extends Cache public function getContent($id = null) { + $statRepo = new StatRepo(); + + $date = date('Y-m-d'); + + $saleCount = $statRepo->countDailySales($date); + $saleAmount = $statRepo->sumDailySales($date); + $refundAmount = $statRepo->sumDailyRefunds($date); + $registerCount = $statRepo->countDailyRegisteredUser($date); + return [ - 'user_count' => $this->countUsers(), - 'order_count' => $this->countOrders(), - 'sale_amount' => $this->sumSales(), + 'sale_count' => $saleCount, + 'sale_amount' => $saleAmount, + 'refund_amount' => $refundAmount, + 'register_count' => $registerCount, ]; } - protected function countUsers() - { - return (int)UserModel::count([ - 'conditions' => 'create_time > :time:', - 'bind' => ['time' => strtotime('today')], - ]); - } - - protected function countOrders() - { - return (int)OrderModel::count([ - 'conditions' => 'create_time > :time: AND status = :status:', - 'bind' => [ - 'time' => strtotime('today'), - 'status' => OrderModel::STATUS_FINISHED, - ], - ]); - } - - protected function sumSales() - { - return (float)OrderModel::sum([ - 'column' => 'amount', - 'conditions' => 'create_time > :time: AND status = :status:', - 'bind' => [ - 'time' => strtotime('today'), - 'status' => OrderModel::STATUS_FINISHED, - ], - ]); - } - } diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php index b38fabe5..058bfa77 100644 --- a/app/Http/Admin/Controllers/Controller.php +++ b/app/Http/Admin/Controllers/Controller.php @@ -49,7 +49,7 @@ class Controller extends \Phalcon\Mvc\Controller * 特例白名单 */ $whitelist = [ - 'controllers' => ['public', 'index', 'vod', 'test', 'xm_course'], + 'controllers' => ['public', 'index', 'vod', 'upload', 'test', 'xm_course'], 'routes' => ['admin.package.guiding'], ]; diff --git a/app/Http/Admin/Controllers/VodController.php b/app/Http/Admin/Controllers/VodController.php index d2ffdfa5..4ee0f40b 100644 --- a/app/Http/Admin/Controllers/VodController.php +++ b/app/Http/Admin/Controllers/VodController.php @@ -11,7 +11,7 @@ class VodController extends Controller { /** - * @Post("/upload/sign", name="admin.vod.upload_sign") + * @Get("/upload/sign", name="admin.vod.upload_sign") */ public function uploadSignatureAction() { diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt index 0db1db09..a676fc79 100644 --- a/app/Http/Admin/Views/index/index.volt +++ b/app/Http/Admin/Views/index/index.volt @@ -13,11 +13,14 @@
- +