From 0155e55e4b76f720959149e319dd2aacf1dd453a Mon Sep 17 00:00:00 2001 From: koogua Date: Tue, 18 Jan 2022 18:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + app/Caches/SiteTodayStat.php | 2 +- app/Console/Tasks/PointGiftDeliverTask.php | 22 ++++----- .../Admin/Controllers/ImGroupController.php | 10 +--- .../Admin/Controllers/PointGiftController.php | 8 ---- ...ller.php => PointGiftRedeemController.php} | 20 ++++---- .../Controllers/PointHistoryController.php | 3 -- app/Http/Admin/Services/AuthNode.php | 2 +- .../{PointRedeem.php => PointGiftRedeem.php} | 16 +++---- app/Http/Admin/Views/course/list.volt | 4 +- .../Views/{im/group => im_group}/add.volt | 0 .../Views/{im/group => im_group}/edit.volt | 0 .../Views/{im/group => im_group}/list.volt | 0 .../Views/{im/group => im_group}/search.volt | 0 .../Views/{im/group => im_group}/users.volt | 0 app/Http/Admin/Views/macros/course.volt | 4 +- app/Http/Admin/Views/macros/point_gift.volt | 19 ++++++++ .../macros/{point.volt => point_history.volt} | 24 +--------- .../Views/{point/gift => point_gift}/add.volt | 0 .../{point/gift => point_gift}/edit.volt | 4 +- .../gift => point_gift}/edit_course.volt | 0 .../gift => point_gift}/edit_goods.volt | 0 .../{point/gift => point_gift}/list.volt | 8 +++- .../{point/gift => point_gift}/search.volt | 0 .../redeem => point_gift_redeem}/list.volt | 8 ++-- .../redeem => point_gift_redeem}/search.volt | 2 +- .../history => point_history}/list.volt | 0 .../history => point_history}/search.volt | 0 .../Home/Controllers/PointGiftController.php | 12 ++--- .../Controllers/PointRedeemController.php | 30 ------------ .../Controllers/UserConsoleController.php | 10 ++-- app/Http/Home/Views/course/show_meta.volt | 3 +- app/Http/Home/Views/macros/course.volt | 18 ++++---- app/Http/Home/Views/macros/point_gift.volt | 19 ++++++++ .../macros/{point.volt => point_history.volt} | 28 ++--------- app/Http/Home/Views/order/confirm.volt | 2 +- .../{point/gift => point_gift}/list.volt | 0 .../{point/gift => point_gift}/pager.volt | 2 +- .../{point/gift => point_gift}/show.volt | 36 ++++++++------- app/Http/Home/Views/search/course.volt | 2 +- .../Home/Views/teacher/console/courses.volt | 2 +- app/Http/Home/Views/user/console/courses.volt | 2 +- app/Http/Home/Views/user/console/menu.volt | 2 +- ...t_redeems.volt => point_gift_redeems.volt} | 2 +- .../Views/user/console/point_history.volt | 2 +- .../{PointRedeem.php => PointGiftRedeem.php} | 4 +- app/Models/Task.php | 4 +- .../{PointRedeem.php => PointGiftRedeem.php} | 12 ++--- app/Repos/Stat.php | 8 ++-- .../{PointRedeem.php => PointGiftRedeem.php} | 14 +++--- .../Logic/Notice/PointGoodsDeliver.php | 10 ++-- app/Services/Logic/Point/GiftInfo.php | 21 +++++++++ .../Point/{PointRedeem.php => GiftRedeem.php} | 38 ++++++++------- .../Logic/Point/History/PointRedeem.php | 8 ++-- .../Logic/Point/History/PointRefund.php | 6 +-- ...RedeemList.php => PointGiftRedeemList.php} | 10 ++-- .../{PointRedeem.php => PointGiftRedeem.php} | 24 +++++----- config/errors.php | 16 +++---- db/migrations/20220117122902.php | 46 +++++++++++++++++++ public/static/home/css/common.css | 30 ++++++++---- public/static/home/js/point.gift.show.js | 4 +- 61 files changed, 305 insertions(+), 279 deletions(-) rename app/Http/Admin/Controllers/{PointRedeemController.php => PointGiftRedeemController.php} (53%) rename app/Http/Admin/Services/{PointRedeem.php => PointGiftRedeem.php} (73%) rename app/Http/Admin/Views/{im/group => im_group}/add.volt (100%) rename app/Http/Admin/Views/{im/group => im_group}/edit.volt (100%) rename app/Http/Admin/Views/{im/group => im_group}/list.volt (100%) rename app/Http/Admin/Views/{im/group => im_group}/search.volt (100%) rename app/Http/Admin/Views/{im/group => im_group}/users.volt (100%) create mode 100644 app/Http/Admin/Views/macros/point_gift.volt rename app/Http/Admin/Views/macros/{point.volt => point_history.volt} (72%) rename app/Http/Admin/Views/{point/gift => point_gift}/add.volt (100%) rename app/Http/Admin/Views/{point/gift => point_gift}/edit.volt (85%) rename app/Http/Admin/Views/{point/gift => point_gift}/edit_course.volt (100%) rename app/Http/Admin/Views/{point/gift => point_gift}/edit_goods.volt (100%) rename app/Http/Admin/Views/{point/gift => point_gift}/list.volt (90%) rename app/Http/Admin/Views/{point/gift => point_gift}/search.volt (100%) rename app/Http/Admin/Views/{point/redeem => point_gift_redeem}/list.volt (90%) rename app/Http/Admin/Views/{point/redeem => point_gift_redeem}/search.volt (97%) rename app/Http/Admin/Views/{point/history => point_history}/list.volt (100%) rename app/Http/Admin/Views/{point/history => point_history}/search.volt (100%) delete mode 100644 app/Http/Home/Controllers/PointRedeemController.php create mode 100644 app/Http/Home/Views/macros/point_gift.volt rename app/Http/Home/Views/macros/{point.volt => point_history.volt} (83%) rename app/Http/Home/Views/{point/gift => point_gift}/list.volt (100%) rename app/Http/Home/Views/{point/gift => point_gift}/pager.volt (96%) rename app/Http/Home/Views/{point/gift => point_gift}/show.volt (85%) rename app/Http/Home/Views/user/console/{point_redeems.volt => point_gift_redeems.volt} (97%) rename app/Models/{PointRedeem.php => PointGiftRedeem.php} (96%) rename app/Repos/{PointRedeem.php => PointGiftRedeem.php} (85%) rename app/Services/Logic/Notice/DingTalk/{PointRedeem.php => PointGiftRedeem.php} (74%) rename app/Services/Logic/Point/{PointRedeem.php => GiftRedeem.php} (74%) rename app/Services/Logic/User/Console/{PointRedeemList.php => PointGiftRedeemList.php} (88%) rename app/Validators/{PointRedeem.php => PointGiftRedeem.php} (75%) create mode 100644 db/migrations/20220117122902.php diff --git a/CHANGELOG.md b/CHANGELOG.md index daed8aea..76e883b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - 优化账户创建数据流 - 优化课程创建数据流 - 优化章节创建数据流 +- 优化积分商品兑换 - 优化发货逻辑 ### [v1.4.9](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.9)(2022-01-01) diff --git a/app/Caches/SiteTodayStat.php b/app/Caches/SiteTodayStat.php index 6cb59a86..285a34aa 100644 --- a/app/Caches/SiteTodayStat.php +++ b/app/Caches/SiteTodayStat.php @@ -35,7 +35,7 @@ class SiteTodayStat extends Cache $saleAmount = $statRepo->sumDailySales($date); $refundAmount = $statRepo->sumDailyRefunds($date); $registerCount = $statRepo->countDailyRegisteredUsers($date); - $pointRedeemCount = $statRepo->countDailyPointRedeems($date); + $pointRedeemCount = $statRepo->countDailyPointGiftRedeems($date); return [ 'sale_count' => $saleCount, diff --git a/app/Console/Tasks/PointGiftDeliverTask.php b/app/Console/Tasks/PointGiftDeliverTask.php index 946945a2..8edc51d7 100644 --- a/app/Console/Tasks/PointGiftDeliverTask.php +++ b/app/Console/Tasks/PointGiftDeliverTask.php @@ -10,15 +10,15 @@ namespace App\Console\Tasks; use App\Models\CourseUser as CourseUserModel; use App\Models\ImGroupUser as ImGroupUserModel; use App\Models\PointGift as PointGiftModel; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\Task as TaskModel; use App\Repos\Course as CourseRepo; use App\Repos\CourseUser as CourseUserRepo; use App\Repos\ImGroup as ImGroupRepo; use App\Repos\ImGroupUser as ImGroupUserRepo; use App\Repos\PointGift as PointGiftRepo; -use App\Repos\PointRedeem as PointRedeemRepo; -use App\Services\Logic\Notice\DingTalk\PointRedeem as PointRedeemNotice; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; +use App\Services\Logic\Notice\DingTalk\PointGiftRedeem as PointGiftRedeemNotice; use App\Services\Logic\Point\History\PointRefund as PointRefundPointHistory; use Phalcon\Mvc\Model\Resultset; use Phalcon\Mvc\Model\ResultsetInterface; @@ -38,13 +38,11 @@ class PointGiftDeliverTask extends Task echo '------ start deliver task ------' . PHP_EOL; - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); foreach ($tasks as $task) { - $redeemId = $task->item_info['point_redeem']['id'] ?? 0; - - $redeem = $redeemRepo->findById($redeemId); + $redeem = $redeemRepo->findById($task->item_id); if (!$redeem) { $task->status = TaskModel::STATUS_FAILED; @@ -102,7 +100,7 @@ class PointGiftDeliverTask extends Task echo '------ end deliver task ------' . PHP_EOL; } - protected function handleCourseRedeem(PointRedeemModel $redeem) + protected function handleCourseRedeem(PointGiftRedeemModel $redeem) { $giftRepo = new PointGiftRepo(); @@ -163,21 +161,21 @@ class PointGiftDeliverTask extends Task } } - $redeem->status = PointRedeemModel::STATUS_FINISHED; + $redeem->status = PointGiftRedeemModel::STATUS_FINISHED; if ($redeem->update() === false) { throw new \RuntimeException('Update Redeem Status Failed'); } } - protected function handleGoodsRedeem(PointRedeemModel $redeem) + protected function handleGoodsRedeem(PointGiftRedeemModel $redeem) { - $notice = new PointRedeemNotice(); + $notice = new PointGiftRedeemNotice(); $notice->createTask($redeem); } - protected function handlePointRefund(PointRedeemModel $redeem) + protected function handlePointRefund(PointGiftRedeemModel $redeem) { $service = new PointRefundPointHistory(); diff --git a/app/Http/Admin/Controllers/ImGroupController.php b/app/Http/Admin/Controllers/ImGroupController.php index f95bf21b..e22e0086 100644 --- a/app/Http/Admin/Controllers/ImGroupController.php +++ b/app/Http/Admin/Controllers/ImGroupController.php @@ -25,8 +25,6 @@ class ImGroupController extends Controller $group = $service->getGroup($id); $pager = $service->getGroupUsers($id); - $this->view->pick('im/group/users'); - $this->view->setVar('group', $group); $this->view->setVar('pager', $pager); } @@ -40,8 +38,6 @@ class ImGroupController extends Controller $pager = $groupService->getGroups(); - $this->view->pick('im/group/list'); - $this->view->setVar('pager', $pager); } @@ -54,8 +50,6 @@ class ImGroupController extends Controller $types = $groupService->getGroupTypes(); - $this->view->pick('im/group/search'); - $this->view->setVar('types', $types); } @@ -64,7 +58,7 @@ class ImGroupController extends Controller */ public function addAction() { - $this->view->pick('im/group/add'); + } /** @@ -76,8 +70,6 @@ class ImGroupController extends Controller $group = $groupService->getGroup($id); - $this->view->pick('im/group/edit'); - $this->view->setVar('group', $group); } diff --git a/app/Http/Admin/Controllers/PointGiftController.php b/app/Http/Admin/Controllers/PointGiftController.php index 245eaa6b..433308a5 100644 --- a/app/Http/Admin/Controllers/PointGiftController.php +++ b/app/Http/Admin/Controllers/PointGiftController.php @@ -24,8 +24,6 @@ class PointGiftController extends Controller $pager = $service->getPointGifts(); - $this->view->pick('point/gift/list'); - $this->view->setVar('pager', $pager); } @@ -38,8 +36,6 @@ class PointGiftController extends Controller $types = $service->getTypes(); - $this->view->pick('point/gift/search'); - $this->view->setVar('types', $types); } @@ -53,8 +49,6 @@ class PointGiftController extends Controller $xmCourses = $service->getXmCourses(); $types = $service->getTypes(); - $this->view->pick('point/gift/add'); - $this->view->setVar('xm_courses', $xmCourses); $this->view->setVar('types', $types); } @@ -68,8 +62,6 @@ class PointGiftController extends Controller $gift = $service->getPointGift($id); - $this->view->pick('point/gift/edit'); - $this->view->setVar('gift', $gift); } diff --git a/app/Http/Admin/Controllers/PointRedeemController.php b/app/Http/Admin/Controllers/PointGiftRedeemController.php similarity index 53% rename from app/Http/Admin/Controllers/PointRedeemController.php rename to app/Http/Admin/Controllers/PointGiftRedeemController.php index f821fc34..38fe5b5d 100644 --- a/app/Http/Admin/Controllers/PointRedeemController.php +++ b/app/Http/Admin/Controllers/PointGiftRedeemController.php @@ -7,42 +7,40 @@ namespace App\Http\Admin\Controllers; -use App\Http\Admin\Services\PointRedeem as PointRedeemService; +use App\Http\Admin\Services\PointGiftRedeem as PointGiftRedeemService; /** - * @RoutePrefix("/admin/point/redeem") + * @RoutePrefix("/admin/point/gift/redeem") */ -class PointRedeemController extends Controller +class PointGiftRedeemController extends Controller { /** - * @Get("/search", name="admin.point_redeem.search") + * @Get("/search", name="admin.point_gift_redeem.search") */ public function searchAction() { - $this->view->pick('point/redeem/search'); + } /** - * @Get("/list", name="admin.point_redeem.list") + * @Get("/list", name="admin.point_gift_redeem.list") */ public function listAction() { - $redeemService = new PointRedeemService(); + $redeemService = new PointGiftRedeemService(); $pager = $redeemService->getRedeems(); - $this->view->pick('point/redeem/list'); - $this->view->setVar('pager', $pager); } /** - * @Post("/{id:[0-9]+}/deliver", name="admin.point_redeem.deliver") + * @Post("/{id:[0-9]+}/deliver", name="admin.point_gift_redeem.deliver") */ public function deliverAction($id) { - $redeemService = new PointRedeemService(); + $redeemService = new PointGiftRedeemService(); $redeemService->deliver($id); diff --git a/app/Http/Admin/Controllers/PointHistoryController.php b/app/Http/Admin/Controllers/PointHistoryController.php index 73bc2ef0..c8b8d3f6 100644 --- a/app/Http/Admin/Controllers/PointHistoryController.php +++ b/app/Http/Admin/Controllers/PointHistoryController.php @@ -24,7 +24,6 @@ class PointHistoryController extends Controller $eventTypes = $historyService->getEventTypes(); - $this->view->pick('point/history/search'); $this->view->setVar('event_types', $eventTypes); } @@ -37,8 +36,6 @@ class PointHistoryController extends Controller $pager = $historyService->getHistories(); - $this->view->pick('point/history/list'); - $this->view->setVar('pager', $pager); } diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php index 032657a4..274c3b5f 100644 --- a/app/Http/Admin/Services/AuthNode.php +++ b/app/Http/Admin/Services/AuthNode.php @@ -871,7 +871,7 @@ class AuthNode extends Service 'id' => '2-20-2', 'title' => '兑换记录', 'type' => 'button', - 'route' => 'admin.point_redeem.list', + 'route' => 'admin.point_gift_redeem.list', ], [ 'id' => '2-20-3', diff --git a/app/Http/Admin/Services/PointRedeem.php b/app/Http/Admin/Services/PointGiftRedeem.php similarity index 73% rename from app/Http/Admin/Services/PointRedeem.php rename to app/Http/Admin/Services/PointGiftRedeem.php index 992271b4..da0705f4 100644 --- a/app/Http/Admin/Services/PointRedeem.php +++ b/app/Http/Admin/Services/PointGiftRedeem.php @@ -9,12 +9,12 @@ namespace App\Http\Admin\Services; use App\Library\Paginator\Query as PagerQuery; use App\Models\PointGift as PointGiftModel; -use App\Models\PointRedeem as PointRedeemModel; -use App\Repos\PointRedeem as PointRedeemRepo; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; use App\Services\Logic\Notice\PointGoodsDeliver as PointGoodsDeliverNotice; -use App\Validators\PointRedeem as PointRedeemValidator; +use App\Validators\PointGiftRedeem as PointGiftRedeemValidator; -class PointRedeem extends Service +class PointGiftRedeem extends Service { public function getRedeems() @@ -27,7 +27,7 @@ class PointRedeem extends Service $page = $pagerQuery->getPage(); $limit = $pagerQuery->getLimit(); - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); return $redeemRepo->paginate($params, $sort, $page, $limit); } @@ -45,7 +45,7 @@ class PointRedeem extends Service return $redeem; } - $redeem->status = PointRedeemModel::STATUS_FINISHED; + $redeem->status = PointGiftRedeemModel::STATUS_FINISHED; $redeem->update(); @@ -54,7 +54,7 @@ class PointRedeem extends Service return $redeem; } - protected function handleGoodsDeliverNotice(PointRedeemModel $redeem) + protected function handleGoodsDeliverNotice(PointGiftRedeemModel $redeem) { $notice = new PointGoodsDeliverNotice(); @@ -63,7 +63,7 @@ class PointRedeem extends Service protected function findOrFail($id) { - $validator = new PointRedeemValidator(); + $validator = new PointGiftRedeemValidator(); return $validator->checkRedeem($id); } diff --git a/app/Http/Admin/Views/course/list.volt b/app/Http/Admin/Views/course/list.volt index 6be67842..0b17998e 100644 --- a/app/Http/Admin/Views/course/list.volt +++ b/app/Http/Admin/Views/course/list.volt @@ -77,10 +77,10 @@ {% if item.teacher.id is defined %} 讲师：{{ item.teacher.name }} {% endif %} - 难度：{{ level_info(item.level) }} + 难度：{{ level_type(item.level) }}

- 类型：{{ model_info(item.model) }} + 类型：{{ model_type(item.model) }} 评分：{{ item.rating }} 创建：{{ date('Y-m-d',item.create_time) }}

diff --git a/app/Http/Admin/Views/im/group/add.volt b/app/Http/Admin/Views/im_group/add.volt similarity index 100% rename from app/Http/Admin/Views/im/group/add.volt rename to app/Http/Admin/Views/im_group/add.volt diff --git a/app/Http/Admin/Views/im/group/edit.volt b/app/Http/Admin/Views/im_group/edit.volt similarity index 100% rename from app/Http/Admin/Views/im/group/edit.volt rename to app/Http/Admin/Views/im_group/edit.volt diff --git a/app/Http/Admin/Views/im/group/list.volt b/app/Http/Admin/Views/im_group/list.volt similarity index 100% rename from app/Http/Admin/Views/im/group/list.volt rename to app/Http/Admin/Views/im_group/list.volt diff --git a/app/Http/Admin/Views/im/group/search.volt b/app/Http/Admin/Views/im_group/search.volt similarity index 100% rename from app/Http/Admin/Views/im/group/search.volt rename to app/Http/Admin/Views/im_group/search.volt diff --git a/app/Http/Admin/Views/im/group/users.volt b/app/Http/Admin/Views/im_group/users.volt similarity index 100% rename from app/Http/Admin/Views/im/group/users.volt rename to app/Http/Admin/Views/im_group/users.volt diff --git a/app/Http/Admin/Views/macros/course.volt b/app/Http/Admin/Views/macros/course.volt index 2f7de032..bb716a69 100644 --- a/app/Http/Admin/Views/macros/course.volt +++ b/app/Http/Admin/Views/macros/course.volt @@ -1,4 +1,4 @@ -{%- macro model_info(value) %} +{%- macro model_type(value) %} {% if value == 1 %} 点播 {% elseif value == 2 %} @@ -12,7 +12,7 @@ {% endif %} {%- endmacro %} -{%- macro level_info(value) %} +{%- macro level_type(value) %} {% if value == 1 %} 入门 {% elseif value == 2 %} diff --git a/app/Http/Admin/Views/macros/point_gift.volt b/app/Http/Admin/Views/macros/point_gift.volt new file mode 100644 index 00000000..3b9216ec --- /dev/null +++ b/app/Http/Admin/Views/macros/point_gift.volt @@ -0,0 +1,19 @@ +{%- macro gift_type_info(value) %} + {% if value == 1 %} + 课程 + {% elseif value == 2 %} + 商品 + {% elseif value == 3 %} + 现金 + {% endif %} +{%- endmacro %} + +{%- macro redeem_status_info(value) %} + {% if value == 1 %} + 处理中 + {% elseif value == 2 %} + 已完成 + {% elseif value == 3 %} + 已失败 + {% endif %} +{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Admin/Views/macros/point.volt b/app/Http/Admin/Views/macros/point_history.volt similarity index 72% rename from app/Http/Admin/Views/macros/point.volt rename to app/Http/Admin/Views/macros/point_history.volt index 85bcbc60..0fab2e19 100644 --- a/app/Http/Admin/Views/macros/point.volt +++ b/app/Http/Admin/Views/macros/point_history.volt @@ -1,23 +1,3 @@ -{%- macro redeem_status_info(value) %} - {% if value == 1 %} - 处理中 - {% elseif value == 2 %} - 已完成 - {% elseif value == 3 %} - 已失败 - {% endif %} -{%- endmacro %} - -{%- macro gift_type_info(value) %} - {% if value == 1 %} - 课程 - {% elseif value == 2 %} - 商品 - {% elseif value == 3 %} - 现金 - {% endif %} -{%- endmacro %} - {%- macro event_point_info(value) %} {% if value > 0 %} +{{ value }} @@ -51,9 +31,9 @@ {% if history.event_type == 1 %}

{{ event_info.order.subject }}

{% elseif history.event_type == 2 %} -

{{ event_info.point_redeem.gift_name }}

+

{{ event_info.point_gift_redeem.gift_name }}

{% elseif history.event_type == 3 %} - {{ event_info.point_redeem.gift_name }} + {{ event_info.point_gift_redeem.gift_name }} {% elseif history.event_type == 4 %} N/A {% elseif history.event_type == 5 %} diff --git a/app/Http/Admin/Views/point/gift/add.volt b/app/Http/Admin/Views/point_gift/add.volt similarity index 100% rename from app/Http/Admin/Views/point/gift/add.volt rename to app/Http/Admin/Views/point_gift/add.volt diff --git a/app/Http/Admin/Views/point/gift/edit.volt b/app/Http/Admin/Views/point_gift/edit.volt similarity index 85% rename from app/Http/Admin/Views/point/gift/edit.volt rename to app/Http/Admin/Views/point_gift/edit.volt index 8808fb96..8c1d654f 100644 --- a/app/Http/Admin/Views/point/gift/edit.volt +++ b/app/Http/Admin/Views/point_gift/edit.volt @@ -5,9 +5,9 @@ {% set update_url = url({'for':'admin.point_gift.update','id':gift.id}) %} {% if gift.type == 1 %} - {{ partial('point/gift/edit_course') }} + {{ partial('point_gift/edit_course') }} {% elseif gift.type == 2 %} - {{ partial('point/gift/edit_goods') }} + {{ partial('point_gift/edit_goods') }} {% endif %} {% endblock %} diff --git a/app/Http/Admin/Views/point/gift/edit_course.volt b/app/Http/Admin/Views/point_gift/edit_course.volt similarity index 100% rename from app/Http/Admin/Views/point/gift/edit_course.volt rename to app/Http/Admin/Views/point_gift/edit_course.volt diff --git a/app/Http/Admin/Views/point/gift/edit_goods.volt b/app/Http/Admin/Views/point_gift/edit_goods.volt similarity index 100% rename from app/Http/Admin/Views/point/gift/edit_goods.volt rename to app/Http/Admin/Views/point_gift/edit_goods.volt diff --git a/app/Http/Admin/Views/point/gift/list.volt b/app/Http/Admin/Views/point_gift/list.volt similarity index 90% rename from app/Http/Admin/Views/point/gift/list.volt rename to app/Http/Admin/Views/point_gift/list.volt index 6498db51..c8224b80 100644 --- a/app/Http/Admin/Views/point/gift/list.volt +++ b/app/Http/Admin/Views/point_gift/list.volt @@ -2,8 +2,9 @@ {% block content %} - {{ partial('macros/point') }} + {{ partial('macros/point_gift') }} + {% set redeem_url = url({'for':'admin.point_gift_redeem.list'}) %} {% set add_url = url({'for':'admin.point_gift.add'}) %} {% set search_url = url({'for':'admin.point_gift.search'}) %} @@ -14,6 +15,9 @@
+ + 兑换记录 + 添加礼品 @@ -50,7 +54,7 @@ {% for item in pager.items %} - {% set redeem_url = url({'for':'admin.point_redeem.list'},{'gift_id':item.id}) %} + {% set redeem_url = url({'for':'admin.point_gift_redeem.list'},{'gift_id':item.id}) %} {% set gift_url = url({'for':'home.point_gift.show','id':item.id}) %} {% set edit_url = url({'for':'admin.point_gift.edit','id':item.id}) %} {% set update_url = url({'for':'admin.point_gift.update','id':item.id}) %} diff --git a/app/Http/Admin/Views/point/gift/search.volt b/app/Http/Admin/Views/point_gift/search.volt similarity index 100% rename from app/Http/Admin/Views/point/gift/search.volt rename to app/Http/Admin/Views/point_gift/search.volt diff --git a/app/Http/Admin/Views/point/redeem/list.volt b/app/Http/Admin/Views/point_gift_redeem/list.volt similarity index 90% rename from app/Http/Admin/Views/point/redeem/list.volt rename to app/Http/Admin/Views/point_gift_redeem/list.volt index d4fa7e67..7d622590 100644 --- a/app/Http/Admin/Views/point/redeem/list.volt +++ b/app/Http/Admin/Views/point_gift_redeem/list.volt @@ -2,9 +2,9 @@ {% block content %} - {{ partial('macros/point') }} + {{ partial('macros/point_gift') }} - {% set search_url = url({'for':'admin.point_redeem.search'}) %} + {% set search_url = url({'for':'admin.point_gift_redeem.search'}) %}
@@ -40,8 +40,8 @@ {% for item in pager.items %} - {% set user_filter_url = url({'for':'admin.point_redeem.list'},{'user_id':item.user_id}) %} - {% set deliver_url = url({'for':'admin.point_redeem.deliver','id':item.id}) %} + {% set user_filter_url = url({'for':'admin.point_gift_redeem.list'},{'user_id':item.user_id}) %} + {% set deliver_url = url({'for':'admin.point_gift_redeem.deliver','id':item.id}) %} {% set gift_url = url({'for':'home.point_gift.show','id':item.gift_id}) %} diff --git a/app/Http/Admin/Views/point/redeem/search.volt b/app/Http/Admin/Views/point_gift_redeem/search.volt similarity index 97% rename from app/Http/Admin/Views/point/redeem/search.volt rename to app/Http/Admin/Views/point_gift_redeem/search.volt index 49a91340..4fcf093b 100644 --- a/app/Http/Admin/Views/point/redeem/search.volt +++ b/app/Http/Admin/Views/point_gift_redeem/search.volt @@ -2,7 +2,7 @@ {% block content %} -
+
搜索兑换
diff --git a/app/Http/Admin/Views/point/history/list.volt b/app/Http/Admin/Views/point_history/list.volt similarity index 100% rename from app/Http/Admin/Views/point/history/list.volt rename to app/Http/Admin/Views/point_history/list.volt diff --git a/app/Http/Admin/Views/point/history/search.volt b/app/Http/Admin/Views/point_history/search.volt similarity index 100% rename from app/Http/Admin/Views/point/history/search.volt rename to app/Http/Admin/Views/point_history/search.volt diff --git a/app/Http/Home/Controllers/PointGiftController.php b/app/Http/Home/Controllers/PointGiftController.php index f6c50caa..a53489fa 100644 --- a/app/Http/Home/Controllers/PointGiftController.php +++ b/app/Http/Home/Controllers/PointGiftController.php @@ -9,8 +9,8 @@ namespace App\Http\Home\Controllers; use App\Services\Logic\Point\GiftInfo as GiftInfoService; use App\Services\Logic\Point\GiftList as GiftListService; +use App\Services\Logic\Point\GiftRedeem as GiftRedeemService; use App\Services\Logic\Point\HotGiftList as HotGiftListService; -use App\Services\Logic\Point\PointRedeem as GiftRedeemService; use App\Services\Logic\User\Console\BalanceInfo as BalanceInfoService; use Phalcon\Mvc\Dispatcher; use Phalcon\Mvc\View; @@ -39,8 +39,6 @@ class PointGiftController extends Controller public function listAction() { $this->seo->prependTitle('积分兑换'); - - $this->view->pick('point/gift/list'); } /** @@ -55,7 +53,6 @@ class PointGiftController extends Controller $pager->target = 'gift-list'; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); - $this->view->pick('point/gift/pager'); $this->view->setVar('pager', $pager); } @@ -81,20 +78,19 @@ class PointGiftController extends Controller $this->seo->prependTitle(['积分兑换', $gift['name']]); - $this->view->pick('point/gift/show'); $this->view->setVar('gift', $gift); $this->view->setVar('hot_gifts', $hotGifts); $this->view->setVar('user_balance', $userBalance); } /** - * @Post("/redeem", name="home.point_gift.redeem") + * @Post("/{id:[0-9]+}/redeem", name="home.point_gift.redeem") */ - public function redeemAction() + public function redeemAction($id) { $service = new GiftRedeemService(); - $service->handle(); + $service->handle($id); return $this->jsonSuccess(['msg' => '兑换成功']); } diff --git a/app/Http/Home/Controllers/PointRedeemController.php b/app/Http/Home/Controllers/PointRedeemController.php deleted file mode 100644 index 580daf0f..00000000 --- a/app/Http/Home/Controllers/PointRedeemController.php +++ /dev/null @@ -1,30 +0,0 @@ -handle(); - - return $this->jsonSuccess(['msg' => '兑换请求提交成功']); - } - -} diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php index 5c0d3f00..e12da62c 100644 --- a/app/Http/Home/Controllers/UserConsoleController.php +++ b/app/Http/Home/Controllers/UserConsoleController.php @@ -26,8 +26,8 @@ use App\Services\Logic\User\Console\NotificationRead as NotificationReadService; use App\Services\Logic\User\Console\NotifyStats as NotifyStatsService; use App\Services\Logic\User\Console\Online as OnlineService; use App\Services\Logic\User\Console\OrderList as OrderListService; +use App\Services\Logic\User\Console\PointGiftRedeemList as PointGiftRedeemListService; use App\Services\Logic\User\Console\PointHistory as PointHistoryService; -use App\Services\Logic\User\Console\PointRedeemList as PointRedeemListService; use App\Services\Logic\User\Console\ProfileInfo as ProfileInfoService; use App\Services\Logic\User\Console\ProfileUpdate as ProfileUpdateService; use App\Services\Logic\User\Console\QuestionList as QuestionListService; @@ -266,15 +266,15 @@ class UserConsoleController extends Controller } /** - * @Get("/point/redeems", name="home.uc.point_redeems") + * @Get("/point/gift/redeems", name="home.uc.point_gift_redeems") */ - public function pointRedeemsAction() + public function pointGiftRedeemsAction() { - $service = new PointRedeemListService(); + $service = new PointGiftRedeemListService(); $pager = $service->handle(); - $this->view->pick('user/console/point_redeems'); + $this->view->pick('user/console/point_gift_redeems'); $this->view->setVar('pager', $pager); } diff --git a/app/Http/Home/Views/course/show_meta.volt b/app/Http/Home/Views/course/show_meta.volt index f8362a04..6241931c 100644 --- a/app/Http/Home/Views/course/show_meta.volt +++ b/app/Http/Home/Views/course/show_meta.volt @@ -85,7 +85,7 @@ {%- macro meta_stats_info(course) %}

难度级别 - {{ level_info(course.level) }} + {{ level_type(course.level) }} 学习人次 {{ course.user_count }} 综合评分 @@ -95,6 +95,7 @@

+ {{ model_type(course.model) }} {{ course.title }}
diff --git a/app/Http/Home/Views/macros/course.volt b/app/Http/Home/Views/macros/course.volt index 7b0f0998..0c270095 100644 --- a/app/Http/Home/Views/macros/course.volt +++ b/app/Http/Home/Views/macros/course.volt @@ -1,4 +1,4 @@ -{%- macro model_info(value) %} +{%- macro model_type(value) %} {% if value == 1 %} 点播 {% elseif value == 2 %} @@ -10,7 +10,7 @@ {% endif %} {%- endmacro %} -{%- macro level_info(value) %} +{%- macro level_type(value) %} {% if value == 1 %} 入门 {% elseif value == 2 %} @@ -32,7 +32,7 @@ {%- macro course_card(course) %} {% set course_url = url({'for':'home.course.show','id':course.id}) %}
- {{ model_info(course.model) }} + {{ model_type(course.model) }}
{{ course.title }} @@ -50,16 +50,16 @@ {% else %} 会员免费 {% endif %} - {{ level_info(course.level) }} + {{ level_type(course.level) }} {{ course.user_count }}人购买 {% elseif course.market_price > 0 %} {{ '￥%0.2f'|format(course.market_price) }} - {{ level_info(course.level) }} + {{ level_type(course.level) }} {{ course.lesson_count }}节课 {{ course.user_count }}人购买 {% else %} 免费 - {{ level_info(course.level) }} + {{ level_type(course.level) }} {{ course.lesson_count }}节课 {{ course.user_count }}人报名 {% endif %} @@ -81,11 +81,11 @@
{% if course.market_price > 0 %} {{ '￥%0.2f'|format(course.market_price) }} - {{ level_info(course.level) }} + {{ level_type(course.level) }} {{ course.user_count }}人购买 {% else %} 免费 - {{ level_info(course.level) }} + {{ level_type(course.level) }} {{ course.user_count }}人报名 {% endif %}
@@ -97,7 +97,7 @@ {% set course_title = item.course.title %} {% set course_url = url({'for':'home.course.show','id':item.course.id}) %}
- {{ model_info(item.course.model) }} + {{ model_type(item.course.model) }}
{{ course_title }} diff --git a/app/Http/Home/Views/macros/point_gift.volt b/app/Http/Home/Views/macros/point_gift.volt new file mode 100644 index 00000000..3b9216ec --- /dev/null +++ b/app/Http/Home/Views/macros/point_gift.volt @@ -0,0 +1,19 @@ +{%- macro gift_type_info(value) %} + {% if value == 1 %} + 课程 + {% elseif value == 2 %} + 商品 + {% elseif value == 3 %} + 现金 + {% endif %} +{%- endmacro %} + +{%- macro redeem_status_info(value) %} + {% if value == 1 %} + 处理中 + {% elseif value == 2 %} + 已完成 + {% elseif value == 3 %} + 已失败 + {% endif %} +{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/macros/point.volt b/app/Http/Home/Views/macros/point_history.volt similarity index 83% rename from app/Http/Home/Views/macros/point.volt rename to app/Http/Home/Views/macros/point_history.volt index efa3d1ac..b1447b66 100644 --- a/app/Http/Home/Views/macros/point.volt +++ b/app/Http/Home/Views/macros/point_history.volt @@ -1,23 +1,3 @@ -{%- macro redeem_status_info(value) %} - {% if value == 1 %} - 处理中 - {% elseif value == 2 %} - 已完成 - {% elseif value == 3 %} - 已失败 - {% endif %} -{%- endmacro %} - -{%- macro gift_type_info(value) %} - {% if value == 1 %} - 课程 - {% elseif value == 2 %} - 商品 - {% elseif value == 3 %} - 现金 - {% endif %} -{%- endmacro %} - {%- macro event_point_info(value) %} {% if value > 0 %} +{{ value }} @@ -64,11 +44,11 @@ {% if type == 1 %}

{{ info.order.subject }}

{% elseif type == 2 %} - {% set gift_url = url({'for':'home.point_gift.show','id':info.point_redeem.gift_id}) %} -

{{ info.point_redeem.gift_name }}

+ {% set gift_url = url({'for':'home.point_gift.show','id':info.point_gift_redeem.gift_id}) %} +

{{ info.point_gift_redeem.gift_name }}

{% elseif type == 3 %} - {% set gift_url = url({'for':'home.point_gift.show','id':info.point_redeem.gift_id}) %} -

{{ info.point_redeem.gift_name }}

+ {% set gift_url = url({'for':'home.point_gift.show','id':info.point_gift_redeem.gift_id}) %} +

{{ info.point_gift_redeem.gift_name }}

{% elseif type == 4 %} N/A {% elseif type == 5 %} diff --git a/app/Http/Home/Views/order/confirm.volt b/app/Http/Home/Views/order/confirm.volt index 9f05c065..1c54f59d 100644 --- a/app/Http/Home/Views/order/confirm.volt +++ b/app/Http/Home/Views/order/confirm.volt @@ -60,7 +60,7 @@

难度 - {{ level_info(course.level) }} + {{ level_type(course.level) }} 课时 {{ course.lesson_count }} 学员 diff --git a/app/Http/Home/Views/point/gift/list.volt b/app/Http/Home/Views/point_gift/list.volt similarity index 100% rename from app/Http/Home/Views/point/gift/list.volt rename to app/Http/Home/Views/point_gift/list.volt diff --git a/app/Http/Home/Views/point/gift/pager.volt b/app/Http/Home/Views/point_gift/pager.volt similarity index 96% rename from app/Http/Home/Views/point/gift/pager.volt rename to app/Http/Home/Views/point_gift/pager.volt index 0a4ae098..77ced7f3 100644 --- a/app/Http/Home/Views/point/gift/pager.volt +++ b/app/Http/Home/Views/point_gift/pager.volt @@ -1,4 +1,4 @@ -{{ partial('macros/point') }} +{{ partial('macros/point_gift') }} {% if pager.total_pages > 0 %}

diff --git a/app/Http/Home/Views/point/gift/show.volt b/app/Http/Home/Views/point_gift/show.volt similarity index 85% rename from app/Http/Home/Views/point/gift/show.volt rename to app/Http/Home/Views/point_gift/show.volt index fe28fb7f..cf0c7af2 100644 --- a/app/Http/Home/Views/point/gift/show.volt +++ b/app/Http/Home/Views/point_gift/show.volt @@ -2,9 +2,9 @@ {% block content %} - {{ partial('macros/point') }} + {{ partial('macros/point_gift') }} - {% set redeem_create_url = url({'for':'home.point_redeem.create'}) %} + {% set gift_redeem_url = url({'for':'home.point_gift.redeem','id':gift.id}) %} {% set gift_list_url = url({'for':'home.point_gift.list'}) %}
@@ -22,6 +22,7 @@
+ {{ gift_type_info(gift.type) }} {{ gift.name }}
@@ -29,27 +30,23 @@ {% set course_url = url({'for':'home.course.show','id':gift.attrs.id}) %}

{{ gift.name }} - {{ gift_type_info(gift.type) }}

{% else %} -

{{ gift.name }} {{ gift_type_info(gift.type) }}

+

{{ gift.name }} }}

{% endif %}

- 兑换库存 - {{ gift.stock }} - 兑换价格 - {{ gift.point }} 积分 - 兑换限额 - {{ gift.redeem_limit }} 兑换人次 {{ gift.redeem_count }} + 兑换限额 + {{ gift.redeem_limit }}

-

- {% if gift.stock > 0 and user_balance.point > gift.point %} - - {% else %} - - {% endif %} +

+ 兑换价格 + {{ gift.point }} 积分 +

+

+ 库存数量 + {{ gift.stock }}

@@ -79,6 +76,13 @@
+
+ {% if gift.me.allow_redeem == 1 %} + + {% else %} + + {% endif %} +
热门兑换
diff --git a/app/Http/Home/Views/search/course.volt b/app/Http/Home/Views/search/course.volt index 17f87c80..73fe058d 100644 --- a/app/Http/Home/Views/search/course.volt +++ b/app/Http/Home/Views/search/course.volt @@ -16,7 +16,7 @@
{{ item.summary }}
讲师：{{ item.teacher.name }} - 难度：{{ level_info(item.level) }} + 难度：{{ level_type(item.level) }} 课时：{{ item.lesson_count }} 学员：{{ item.user_count }}
diff --git a/app/Http/Home/Views/teacher/console/courses.volt b/app/Http/Home/Views/teacher/console/courses.volt index 21d10441..4f621c89 100644 --- a/app/Http/Home/Views/teacher/console/courses.volt +++ b/app/Http/Home/Views/teacher/console/courses.volt @@ -33,7 +33,7 @@ {% for item in pager.items %} {% set course_url = url({'for':'home.course.show','id':item.id}) %} - {{ item.title }} {{ model_info(item.model) }} + {{ item.title }} {{ model_type(item.model) }} {{ item.lesson_count }} {{ item.user_count }} {{ item.favorite_count }} diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt index 04a2bbfb..5374dfc2 100644 --- a/app/Http/Home/Views/user/console/courses.volt +++ b/app/Http/Home/Views/user/console/courses.volt @@ -35,7 +35,7 @@

标题：{{ item.course.title }}

- 类型：{{ model_info(item.course.model) }} + 类型：{{ model_type(item.course.model) }} 来源：{{ source_type_info(item.source_type) }} {% if item.expiry_time > 0 %} 期限：{{ date('Y-m-d',item.expiry_time) }} diff --git a/app/Http/Home/Views/user/console/menu.volt b/app/Http/Home/Views/user/console/menu.volt index 93068c2a..2133cf54 100644 --- a/app/Http/Home/Views/user/console/menu.volt +++ b/app/Http/Home/Views/user/console/menu.volt @@ -56,7 +56,7 @@

diff --git a/app/Http/Home/Views/user/console/point_redeems.volt b/app/Http/Home/Views/user/console/point_gift_redeems.volt similarity index 97% rename from app/Http/Home/Views/user/console/point_redeems.volt rename to app/Http/Home/Views/user/console/point_gift_redeems.volt index 07f1d5ed..5594d13c 100644 --- a/app/Http/Home/Views/user/console/point_redeems.volt +++ b/app/Http/Home/Views/user/console/point_gift_redeems.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('macros/point') }} + {{ partial('macros/point_gift') }}
{{ partial('user/console/menu') }}
diff --git a/app/Http/Home/Views/user/console/point_history.volt b/app/Http/Home/Views/user/console/point_history.volt index bbff9658..aa366671 100644 --- a/app/Http/Home/Views/user/console/point_history.volt +++ b/app/Http/Home/Views/user/console/point_history.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('macros/point') }} + {{ partial('macros/point_history') }}
{{ partial('user/console/menu') }}
diff --git a/app/Models/PointRedeem.php b/app/Models/PointGiftRedeem.php similarity index 96% rename from app/Models/PointRedeem.php rename to app/Models/PointGiftRedeem.php index b473c9e3..ca40d45b 100644 --- a/app/Models/PointRedeem.php +++ b/app/Models/PointGiftRedeem.php @@ -7,7 +7,7 @@ namespace App\Models; -class PointRedeem extends Model +class PointGiftRedeem extends Model { /** @@ -117,7 +117,7 @@ class PointRedeem extends Model public function getSource(): string { - return 'kg_point_redeem'; + return 'kg_point_gift_redeem'; } public function beforeCreate() diff --git a/app/Models/Task.php b/app/Models/Task.php index f3d5f3de..70ba6e03 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -36,8 +36,8 @@ class Task extends Model const TYPE_STAFF_NOTICE_TEACHER_LIVE = 32; // 直播讲师通知 const TYPE_STAFF_NOTICE_SERVER_MONITOR = 33; // 服务监控通知 const TYPE_STAFF_NOTICE_CUSTOM_SERVICE = 34; // 客服消息通知 - const TYPE_STAFF_NOTICE_POINT_REDEEM = 35; // 积分兑换通知 - const TYPE_STAFF_NOTICE_LUCKY_REDEEM = 36; // 抽奖兑换通知 + const TYPE_STAFF_NOTICE_POINT_GIFT_REDEEM = 35; // 积分兑换通知 + const TYPE_STAFF_NOTICE_LUCKY_GIFT_REDEEM = 36; // 抽奖兑换通知 /** * 优先级 diff --git a/app/Repos/PointRedeem.php b/app/Repos/PointGiftRedeem.php similarity index 85% rename from app/Repos/PointRedeem.php rename to app/Repos/PointGiftRedeem.php index f46563d7..c73d5cb7 100644 --- a/app/Repos/PointRedeem.php +++ b/app/Repos/PointGiftRedeem.php @@ -8,17 +8,17 @@ namespace App\Repos; use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use Phalcon\Mvc\Model; -class PointRedeem extends Repository +class PointGiftRedeem extends Repository { public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15) { $builder = $this->modelsManager->createBuilder(); - $builder->from(PointRedeemModel::class); + $builder->from(PointGiftRedeemModel::class); $builder->where('1 = 1'); @@ -57,11 +57,11 @@ class PointRedeem extends Repository /** * @param int $id - * @return PointRedeemModel|Model|bool + * @return PointGiftRedeemModel|Model|bool */ public function findById($id) { - return PointRedeemModel::findFirst([ + return PointGiftRedeemModel::findFirst([ 'conditions' => 'id = :id:', 'bind' => ['id' => $id], ]); @@ -69,7 +69,7 @@ class PointRedeem extends Repository public function countUserGiftRedeems($userId, $giftId) { - return (int)PointRedeemModel::count([ + return (int)PointGiftRedeemModel::count([ 'conditions' => 'user_id = :user_id: AND gift_id = :gift_id:', 'bind' => ['user_id' => $userId, 'gift_id' => $giftId], ]); diff --git a/app/Repos/Stat.php b/app/Repos/Stat.php index da00d14d..c8d073e8 100644 --- a/app/Repos/Stat.php +++ b/app/Repos/Stat.php @@ -14,7 +14,7 @@ use App\Models\Consult as ConsultModel; use App\Models\Online as OnlineModel; use App\Models\Order as OrderModel; use App\Models\OrderStatus as OrderStatusModel; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\Question as QuestionModel; use App\Models\Refund as RefundModel; use App\Models\Review as ReviewModel; @@ -162,16 +162,16 @@ class Stat extends Repository ]); } - public function countDailyPointRedeems($date) + public function countDailyPointGiftRedeems($date) { $startTime = strtotime($date); $endTime = $startTime + 86400; - return (int)PointRedeemModel::count([ + return (int)PointGiftRedeemModel::count([ 'conditions' => 'status = ?1 AND create_time BETWEEN ?2 AND ?3', 'bind' => [ - 1 => PointRedeemModel::STATUS_PENDING, + 1 => PointGiftRedeemModel::STATUS_PENDING, 2 => $startTime, 3 => $endTime, ], diff --git a/app/Services/Logic/Notice/DingTalk/PointRedeem.php b/app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php similarity index 74% rename from app/Services/Logic/Notice/DingTalk/PointRedeem.php rename to app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php index 99c02c2f..8da60655 100644 --- a/app/Services/Logic/Notice/DingTalk/PointRedeem.php +++ b/app/Services/Logic/Notice/DingTalk/PointGiftRedeem.php @@ -8,19 +8,19 @@ namespace App\Services\Logic\Notice\DingTalk; use App\Models\PointGift as PointGiftModel; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\Task as TaskModel; -use App\Repos\PointRedeem as PointRedeemRepo; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; use App\Services\DingTalkNotice; -class PointRedeem extends DingTalkNotice +class PointGiftRedeem extends DingTalkNotice { public function handleTask(TaskModel $task) { if (!$this->enabled) return; - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); $redeem = $redeemRepo->findById($task->item_id); @@ -32,7 +32,7 @@ class PointRedeem extends DingTalkNotice $this->atCustomService($content); } - public function createTask(PointRedeemModel $redeem) + public function createTask(PointGiftRedeemModel $redeem) { if (!$this->enabled) return; @@ -41,12 +41,12 @@ class PointRedeem extends DingTalkNotice $task = new TaskModel(); $itemInfo = [ - 'point_redeem' => ['id' => $redeem->id], + 'point_gift_redeem' => ['id' => $redeem->id], ]; $task->item_id = $redeem->id; $task->item_info = $itemInfo; - $task->item_type = TaskModel::TYPE_STAFF_NOTICE_POINT_REDEEM; + $task->item_type = TaskModel::TYPE_STAFF_NOTICE_POINT_GIFT_REDEEM; $task->priority = TaskModel::PRIORITY_MIDDLE; $task->status = TaskModel::STATUS_PENDING; diff --git a/app/Services/Logic/Notice/PointGoodsDeliver.php b/app/Services/Logic/Notice/PointGoodsDeliver.php index f16fa2e1..b5946db7 100644 --- a/app/Services/Logic/Notice/PointGoodsDeliver.php +++ b/app/Services/Logic/Notice/PointGoodsDeliver.php @@ -7,9 +7,9 @@ namespace App\Services\Logic\Notice; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\Task as TaskModel; -use App\Repos\PointRedeem as PointRedeemRepo; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; use App\Repos\User as UserRepo; use App\Repos\WeChatSubscribe as WeChatSubscribeRepo; use App\Services\Logic\Notice\Sms\GoodsDeliver as SmsGoodsDeliverNotice; @@ -28,7 +28,7 @@ class PointGoodsDeliver extends LogicService $redeemId = $task->item_info['point_redeem']['id']; - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); $redeem = $redeemRepo->findById($redeemId); @@ -61,7 +61,7 @@ class PointGoodsDeliver extends LogicService } } - public function createTask(PointRedeemModel $redeem) + public function createTask(PointGiftRedeemModel $redeem) { $wechatNoticeEnabled = $this->wechatNoticeEnabled(); $smsNoticeEnabled = $this->smsNoticeEnabled(); @@ -71,7 +71,7 @@ class PointGoodsDeliver extends LogicService $task = new TaskModel(); $itemInfo = [ - 'point_redeem' => ['id' => $redeem->id], + 'point_gift_redeem' => ['id' => $redeem->id], ]; $task->item_id = $redeem->id; diff --git a/app/Services/Logic/Point/GiftInfo.php b/app/Services/Logic/Point/GiftInfo.php index 3611ecf6..e973bbfe 100644 --- a/app/Services/Logic/Point/GiftInfo.php +++ b/app/Services/Logic/Point/GiftInfo.php @@ -8,6 +8,7 @@ namespace App\Services\Logic\Point; use App\Models\PointGift; +use App\Repos\User as UserRepo; use App\Services\Logic\CourseTrait; use App\Services\Logic\PointGiftTrait; use App\Services\Logic\Service as LogicService; @@ -28,6 +29,8 @@ class GiftInfo extends LogicService $gift->details = kg_parse_markdown($gift->details); + $meInfo = $this->handleMeInfo($gift); + return [ 'id' => $gift->id, 'name' => $gift->name, @@ -43,6 +46,7 @@ class GiftInfo extends LogicService 'redeem_count' => $gift->redeem_count, 'create_time' => $gift->create_time, 'update_time' => $gift->update_time, + 'me' => $meInfo, ]; } @@ -64,4 +68,21 @@ class GiftInfo extends LogicService return $gift; } + protected function handleMeInfo(PointGift $gift) + { + $me = ['allow_redeem' => 0]; + + $user = $this->getLoginUser(true); + + $userRepo = new UserRepo(); + + $balance = $userRepo->findUserBalance($user->id); + + if ($gift->stock > 0 && $balance->point > $gift->point) { + $me['allow_redeem'] = 1; + } + + return $me; + } + } diff --git a/app/Services/Logic/Point/PointRedeem.php b/app/Services/Logic/Point/GiftRedeem.php similarity index 74% rename from app/Services/Logic/Point/PointRedeem.php rename to app/Services/Logic/Point/GiftRedeem.php index 7d55de08..ff3e257c 100644 --- a/app/Services/Logic/Point/PointRedeem.php +++ b/app/Services/Logic/Point/GiftRedeem.php @@ -9,40 +9,36 @@ namespace App\Services\Logic\Point; use App\Library\Utils\Lock as LockUtil; use App\Models\PointGift as PointGiftModel; -use App\Models\PointRedeem as PointRedeemModel; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\Task as TaskModel; use App\Models\User as UserModel; use App\Repos\User as UserRepo; -use App\Services\Logic\Point\History\PointRedeem as PointRedeemPointHistory; +use App\Services\Logic\Point\History\PointGiftRedeem as PointGiftRedeemPointHistory; use App\Services\Logic\PointGiftTrait; use App\Services\Logic\Service as LogicService; -use App\Validators\PointRedeem as PointRedeemValidator; +use App\Validators\PointGiftRedeem as PointGiftRedeemValidator; -class PointRedeem extends LogicService +class GiftRedeem extends LogicService { use PointGiftTrait; - public function handle() + public function handle($id) { - $giftId = $this->request->getPost('gift_id', ['trim', 'int']); - - $gift = $this->checkPointGift($giftId); + $gift = $this->checkPointGift($id); $user = $this->getLoginUser(); - $validator = new PointRedeemValidator(); + $validator = new PointGiftRedeemValidator(); $validator->checkIfAllowRedeem($gift, $user); - $this->createPointRedeem($gift, $user); + $this->createGiftRedeem($gift, $user); } - protected function createPointRedeem(PointGiftModel $gift, UserModel $user) + protected function createGiftRedeem(PointGiftModel $gift, UserModel $user) { - $logger = $this->getLogger('point'); - - $itemId = "point_redeem:{$gift->id}"; + $itemId = "point_gift_redeem:{$gift->id}"; $lockId = LockUtil::addLock($itemId); @@ -54,7 +50,7 @@ class PointRedeem extends LogicService $this->db->begin(); - $redeem = new PointRedeemModel(); + $redeem = new PointGiftRedeemModel(); $redeem->user_id = $user->id; $redeem->user_name = $user->name; @@ -71,7 +67,7 @@ class PointRedeem extends LogicService $redeem->contact_address = $contact->fullAddress(); } - $redeem->status = PointRedeemModel::STATUS_PENDING; + $redeem->status = PointGiftRedeemModel::STATUS_PENDING; $result = $redeem->create(); @@ -89,7 +85,7 @@ class PointRedeem extends LogicService $task = new TaskModel(); $itemInfo = [ - 'point_redeem' => [ + 'point_gift_redeem' => [ 'id' => $redeem->id, 'user_id' => $redeem->user_id, 'gift_id' => $redeem->gift_id, @@ -114,7 +110,9 @@ class PointRedeem extends LogicService $this->db->rollback(); - $logger->error('Point Redeem Exception ' . kg_json_encode([ + $logger = $this->getLogger('point'); + + $logger->error('Gift Redeem Exception ' . kg_json_encode([ 'file' => $e->getFile(), 'line' => $e->getLine(), 'message' => $e->getMessage(), @@ -126,9 +124,9 @@ class PointRedeem extends LogicService LockUtil::releaseLock($itemId, $lockId); } - protected function handleRedeemPoint(PointRedeemModel $redeem) + protected function handleRedeemPoint(PointGiftRedeemModel $redeem) { - $service = new PointRedeemPointHistory(); + $service = new PointGiftRedeemPointHistory(); $service->handle($redeem); } diff --git a/app/Services/Logic/Point/History/PointRedeem.php b/app/Services/Logic/Point/History/PointRedeem.php index 92cfd1fd..0e4ccca9 100644 --- a/app/Services/Logic/Point/History/PointRedeem.php +++ b/app/Services/Logic/Point/History/PointRedeem.php @@ -7,16 +7,16 @@ namespace App\Services\Logic\Point\History; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\PointHistory as PointHistoryModel; -use App\Models\PointRedeem as PointRedeemModel; use App\Repos\PointHistory as PointHistoryRepo; use App\Repos\User as UserRepo; use App\Services\Logic\Point\PointHistory; -class PointRedeem extends PointHistory +class PointGiftRedeem extends PointHistory { - public function handle(PointRedeemModel $redeem) + public function handle(PointGiftRedeemModel $redeem) { $setting = $this->getSettings('point'); @@ -39,7 +39,7 @@ class PointRedeem extends PointHistory $user = $userRepo->findById($redeem->user_id); $eventInfo = [ - 'point_redeem' => [ + 'point_gift_redeem' => [ 'id' => $redeem->id, 'gift_id' => $redeem->gift_id, 'gift_name' => $redeem->gift_name, diff --git a/app/Services/Logic/Point/History/PointRefund.php b/app/Services/Logic/Point/History/PointRefund.php index 62afb4f9..e5db10e9 100644 --- a/app/Services/Logic/Point/History/PointRefund.php +++ b/app/Services/Logic/Point/History/PointRefund.php @@ -7,8 +7,8 @@ namespace App\Services\Logic\Point\History; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; use App\Models\PointHistory as PointHistoryModel; -use App\Models\PointRedeem as PointRedeemModel; use App\Repos\PointHistory as PointHistoryRepo; use App\Repos\User as UserRepo; use App\Services\Logic\Point\PointHistory; @@ -16,7 +16,7 @@ use App\Services\Logic\Point\PointHistory; class PointRefund extends PointHistory { - public function handle(PointRedeemModel $redeem) + public function handle(PointGiftRedeemModel $redeem) { $eventId = $redeem->id; $eventType = PointHistoryModel::EVENT_POINT_REFUND; @@ -33,7 +33,7 @@ class PointRefund extends PointHistory $user = $userRepo->findById($redeem->user_id); $eventInfo = [ - 'point_redeem' => [ + 'point_gift_redeem' => [ 'id' => $redeem->id, 'gift_id' => $redeem->gift_id, 'gift_name' => $redeem->gift_name, diff --git a/app/Services/Logic/User/Console/PointRedeemList.php b/app/Services/Logic/User/Console/PointGiftRedeemList.php similarity index 88% rename from app/Services/Logic/User/Console/PointRedeemList.php rename to app/Services/Logic/User/Console/PointGiftRedeemList.php index bd5c334d..eecc7a81 100644 --- a/app/Services/Logic/User/Console/PointRedeemList.php +++ b/app/Services/Logic/User/Console/PointGiftRedeemList.php @@ -8,12 +8,12 @@ namespace App\Services\Logic\User\Console; use App\Library\Paginator\Query as PagerQuery; -use App\Models\PointRedeem as PointRedeemModel; -use App\Repos\PointRedeem as PointRedeemRepo; +use App\Models\PointGiftRedeem as PointGiftRedeemModel; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; use App\Services\Logic\Service as LogicService; use App\Services\Logic\UserTrait; -class PointRedeemList extends LogicService +class PointGiftRedeemList extends LogicService { use UserTrait; @@ -33,7 +33,7 @@ class PointRedeemList extends LogicService $page = $pagerQuery->getPage(); $limit = $pagerQuery->getLimit(); - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); $pager = $redeemRepo->paginate($params, $sort, $page, $limit); @@ -49,7 +49,7 @@ class PointRedeemList extends LogicService $items = []; /** - * @var PointRedeemModel[] $redeems + * @var PointGiftRedeemModel[] $redeems */ $redeems = $pager->items; diff --git a/app/Validators/PointRedeem.php b/app/Validators/PointGiftRedeem.php similarity index 75% rename from app/Validators/PointRedeem.php rename to app/Validators/PointGiftRedeem.php index e4e11eb0..66413912 100644 --- a/app/Validators/PointRedeem.php +++ b/app/Validators/PointGiftRedeem.php @@ -12,21 +12,21 @@ use App\Models\Course as CourseModel; use App\Models\PointGift as PointGiftModel; use App\Models\User as UserModel; use App\Repos\CourseUser as CourseUserRepo; -use App\Repos\PointRedeem as PointRedeemRepo; +use App\Repos\PointGiftRedeem as PointGiftRedeemRepo; use App\Repos\User as UserRepo; -class PointRedeem extends Validator +class PointGiftRedeem extends Validator { public function checkRedeem($id) { - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); $redeem = $redeemRepo->findById($id); if (!$redeem) { - throw new BadRequestException('point_redeem.not_found'); + throw new BadRequestException('point_gift_redeem.not_found'); } return $redeem; @@ -64,11 +64,11 @@ class PointRedeem extends Validator protected function checkIfAllowRedeemCourse(CourseModel $course, UserModel $user) { if ($course->published == 0) { - throw new BadRequestException('point_redeem.course_not_published'); + throw new BadRequestException('point_gift_redeem.course_not_published'); } if ($course->market_price == 0) { - throw new BadRequestException('point_redeem.course_free'); + throw new BadRequestException('point_gift_redeem.course_free'); } $courseUserRepo = new CourseUserRepo(); @@ -76,7 +76,7 @@ class PointRedeem extends Validator $courseUser = $courseUserRepo->findCourseUser($course->id, $user->id); if ($courseUser && $courseUser->expiry_time > time()) { - throw new BadRequestException('point_redeem.course_owned'); + throw new BadRequestException('point_gift_redeem.course_owned'); } } @@ -87,25 +87,25 @@ class PointRedeem extends Validator $contact = $userRepo->findUserContact($user->id); if (!$contact) { - throw new BadRequestException('point_redeem.no_user_contact'); + throw new BadRequestException('point_gift_redeem.no_user_contact'); } } protected function checkStock(PointGiftModel $gift) { if ($gift->stock < 1) { - throw new BadRequestException('point_redeem.no_enough_stock'); + throw new BadRequestException('point_gift_redeem.no_enough_stock'); } } protected function checkRedeemLimit(PointGiftModel $gift, UserModel $user) { - $redeemRepo = new PointRedeemRepo(); + $redeemRepo = new PointGiftRedeemRepo(); $count = $redeemRepo->countUserGiftRedeems($user->id, $gift->id); if ($count >= $gift->redeem_limit) { - throw new BadRequestException('point_redeem.reach_redeem_limit'); + throw new BadRequestException('point_gift_redeem.reach_redeem_limit'); } } @@ -116,7 +116,7 @@ class PointRedeem extends Validator $balance = $userRepo->findUserBalance($user->id); if (!$balance || $balance->point < $gift->point) { - throw new BadRequestException('point_redeem.no_enough_point'); + throw new BadRequestException('point_gift_redeem.no_enough_point'); } } diff --git a/config/errors.php b/config/errors.php index 717a66ca..b0249c45 100644 --- a/config/errors.php +++ b/config/errors.php @@ -505,14 +505,14 @@ $error['point_gift.invalid_stock'] = '无效的库存值（范围：1-999999）' $error['point_gift.invalid_redeem_limit'] = '无效的兑换限额（范围：1-10）'; $error['point_gift.invalid_publish_status'] = '无效的发布状态'; -$error['point_redeem.not_found'] = '兑换不存在'; -$error['point_redeem.course_not_published'] = '课程尚未发布'; -$error['point_redeem.course_free'] = '课程当前免费，无需积分兑换'; -$error['point_redeem.course_owned'] = '您已经拥有课程，无需积分兑换'; -$error['point_redeem.no_user_contact'] = '您尚未设置收货地址，请前往用户中心设置'; -$error['point_redeem.reach_redeem_limit'] = '超出物品兑换限额'; -$error['point_redeem.no_enough_point'] = '您的积分余额不足以抵扣此次兑换'; -$error['point_redeem.no_enough_stock'] = '兑换物品库存不足'; +$error['point_gift_redeem.not_found'] = '兑换不存在'; +$error['point_gift_redeem.course_not_published'] = '课程尚未发布'; +$error['point_gift_redeem.course_free'] = '课程当前免费，无需积分兑换'; +$error['point_gift_redeem.course_owned'] = '您已经拥有课程，无需积分兑换'; +$error['point_gift_redeem.no_user_contact'] = '您尚未设置收货地址，请前往用户中心设置'; +$error['point_gift_redeem.reach_redeem_limit'] = '超出物品兑换限额'; +$error['point_gift_redeem.no_enough_point'] = '您的积分余额不足以抵扣此次兑换'; +$error['point_gift_redeem.no_enough_stock'] = '兑换物品库存不足'; /** * 限时秒杀相关 diff --git a/db/migrations/20220117122902.php b/db/migrations/20220117122902.php new file mode 100644 index 00000000..cf777591 --- /dev/null +++ b/db/migrations/20220117122902.php @@ -0,0 +1,46 @@ +renameGiftRedeemTable(); + $this->handlePointHistory(); + } + + protected function renameGiftRedeemTable() + { + if ($this->table('kg_point_redeem')->exists()) { + $this->table('kg_point_redeem') + ->rename('kg_point_gift_redeem') + ->save(); + } + } + + protected function handlePointHistory() + { + $rows = $this->getQueryBuilder() + ->select('*') + ->from('kg_point_history') + ->whereInList('event_type', [2, 3]) + ->execute()->fetchAll(PDO::FETCH_ASSOC); + + if (empty($rows)) return; + + foreach ($rows as $row) { + $eventInfo = json_decode($row['event_info'], true); + $newEventInfo = json_encode([ + 'point_gift_redeem' => $eventInfo['point_redeem'] + ]); + $this->getQueryBuilder() + ->update('kg_point_history') + ->set('event_info', $newEventInfo) + ->where(['id' => $row['id']]) + ->execute(); + } + } + +} diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index 38800013..90493a22 100644 --- a/public/static/home/css/common.css +++ b/public/static/home/css/common.css @@ -926,12 +926,14 @@ .course-meta .cover { float: left; + position: relative; margin-right: 10px; } .course-meta .info { float: left; width: 560px; + padding-top: 5px; } .course-meta .rating { @@ -940,12 +942,18 @@ } .course-meta p { - line-height: 30px; + line-height: 35px; } .course-meta .cover img { - width: 210px; - height: 118px; + width: 270px; + height: 150px; +} + +.course-meta .cover .model { + position: absolute; + top: 15px; + right: 15px; } .course-meta .info .key { @@ -2287,26 +2295,30 @@ .gift-meta .cover { float: left; + position: relative; margin-right: 10px; } +.gift-meta .cover .type { + position: absolute; + top: 15px; + right: 15px; +} + .gift-meta .cover img { - width: 210px; - height: 118px; + width: 270px; + height: 150px; } .gift-meta .info { float: left; + padding-top: 5px; } .gift-meta .info p { line-height: 35px; } -.gift-meta .info .stats { - margin-bottom: 10px; -} - .gift-meta .info span { margin-right: 5px; } diff --git a/public/static/home/js/point.gift.show.js b/public/static/home/js/point.gift.show.js index a8df29bc..0c173852 100644 --- a/public/static/home/js/point.gift.show.js +++ b/public/static/home/js/point.gift.show.js @@ -5,16 +5,14 @@ layui.use(['jquery', 'layer'], function () { $('.btn-redeem').on('click', function () { var url = $(this).data('url'); - var data = {gift_id: $(this).data('id')}; layer.confirm('兑换不支持退换，确定要兑换该物品吗？', function () { $.ajax({ type: 'POST', url: url, - data: data, success: function (res) { layer.msg(res.msg, {icon: 1}); setTimeout(function () { - window.location.href = '/uc/point/redeems'; + window.location.href = '/uc/point/gift/redeems'; }, 3000); } });