From b1731f7a8d41fde3a74f742037af249eb05244e6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Jul 2026 17:46:51 +0800 Subject: [PATCH] feat(assets): forum free-task depth, withdraw notices, share poster MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Route forum essence/adopt/hot/score rewards through free-points day cap, notify users on withdraw complete/reject, surface 海报分享 on single share grid, and extend admin free-task keys for the remaining matrix. --- .../src/schema/sections/users/credits.js | 8 ++++ .../frontend/single-post/author-actions.css | 2 + .../schema/class-aksrt-admin-schema-users.php | 4 ++ inc/classes/class-aksrt-credits-earn.php | 26 ++++------- inc/classes/class-aksrt-points-free.php | 34 +++++++++++++++ inc/classes/class-aksrt-withdrawal.php | 26 ++++++++++- .../class-aksrt-forum-comment-service.php | 43 +++++++++++++------ .../forum/class-aksrt-forum-score-service.php | 38 ++++++++++------ ...trait-aksrt-forum-topic-service-part-1.php | 34 +++++++++------ inc/helpers/aksrt-credits.php | 4 ++ inc/helpers/aksrt-single-render.php | 1 + 11 files changed, 165 insertions(+), 55 deletions(-) diff --git a/assets/admin/src/schema/sections/users/credits.js b/assets/admin/src/schema/sections/users/credits.js index 0199f2ca..09ff0727 100644 --- a/assets/admin/src/schema/sections/users/credits.js +++ b/assets/admin/src/schema/sections/users/credits.js @@ -22,6 +22,10 @@ export const creditsSchema = { points_free_bbs_posts_new: 5, points_free_bbs_reply: 2, points_free_bbs_essence: 10, + points_free_bbs_adopt: 20, + points_free_bbs_posts_hot: 5, + points_free_bbs_comment_hot: 5, + points_free_bbs_score_extra: 3, points_earn_invite: 10, points_spend_comment: 0, points_spend_download: 0, @@ -73,6 +77,10 @@ export const creditsSchema = { { key: 'points_free_bbs_posts_new', label: '论坛发帖', type: 'number', default: 5, min: 0, max: 1000 }, { key: 'points_free_bbs_reply', label: '论坛回复', type: 'number', default: 2, min: 0, max: 1000 }, { key: 'points_free_bbs_essence', label: '帖子加精', type: 'number', default: 10, min: 0, max: 1000 }, + { key: 'points_free_bbs_adopt', label: '回复被采纳', type: 'number', default: 20, min: 0, max: 1000 }, + { key: 'points_free_bbs_posts_hot', label: '热帖奖励', type: 'number', default: 5, min: 0, max: 1000 }, + { key: 'points_free_bbs_comment_hot', label: '神评奖励', type: 'number', default: 5, min: 0, max: 1000 }, + { key: 'points_free_bbs_score_extra', label: '帖子加分', type: 'number', default: 3, min: 0, max: 1000 }, { key: 'points_earn_invite', label: '邀请注册奖励', type: 'number', default: 10, min: 0, max: 1000, help: '邀请不计入免费日上限' }, ], }, diff --git a/assets/css/frontend/single-post/author-actions.css b/assets/css/frontend/single-post/author-actions.css index b9674b1a..50f919fc 100644 --- a/assets/css/frontend/single-post/author-actions.css +++ b/assets/css/frontend/single-post/author-actions.css @@ -278,6 +278,7 @@ .share-item[data-platform="twitter"]:hover { background: #f0f0f0; color: #000; } .share-item[data-platform="wechat"]:hover { background: #e6f7ec; color: #07c160; } .share-item[data-platform="copy"]:hover { background: #f0f2f5; color: #555; } +.share-item[data-platform="poster"]:hover { background: #fff4e8; color: #f59e0b; } /* 微信二维码浮层 */ #share-qrcode-box { @@ -332,6 +333,7 @@ html.dark .share-item { .theme-dark .share-item[data-platform="twitter"]:hover { background: rgba(255,255,255,0.08); color: #fff; } .theme-dark .share-item[data-platform="wechat"]:hover { background: rgba(7,193,96,0.12); color: #07c160; } .theme-dark .share-item[data-platform="copy"]:hover { background: rgba(255,255,255,0.06); color: #ccc; } +.theme-dark .share-item[data-platform="poster"]:hover { background: rgba(245,158,11,0.12); color: #f59e0b; } .theme-dark .post-drop-meta__menu, html.dark .post-drop-meta__menu { diff --git a/inc/classes/admin/schema/class-aksrt-admin-schema-users.php b/inc/classes/admin/schema/class-aksrt-admin-schema-users.php index 86055c6a..6edd2ed8 100644 --- a/inc/classes/admin/schema/class-aksrt-admin-schema-users.php +++ b/inc/classes/admin/schema/class-aksrt-admin-schema-users.php @@ -428,6 +428,10 @@ class AKSRT_Admin_Schema_Users { ['key' => 'points_free_bbs_posts_new', 'label' => '论坛发帖', 'type' => 'number', 'default' => 5, 'min' => 0, 'max' => 1000], ['key' => 'points_free_bbs_reply', 'label' => '论坛回复', 'type' => 'number', 'default' => 2, 'min' => 0, 'max' => 1000], ['key' => 'points_free_bbs_essence', 'label' => '帖子加精', 'type' => 'number', 'default' => 10, 'min' => 0, 'max' => 1000], + ['key' => 'points_free_bbs_adopt', 'label' => '回复被采纳', 'type' => 'number', 'default' => 20, 'min' => 0, 'max' => 1000], + ['key' => 'points_free_bbs_posts_hot', 'label' => '热帖奖励', 'type' => 'number', 'default' => 5, 'min' => 0, 'max' => 1000], + ['key' => 'points_free_bbs_comment_hot', 'label' => '神评奖励', 'type' => 'number', 'default' => 5, 'min' => 0, 'max' => 1000], + ['key' => 'points_free_bbs_score_extra', 'label' => '帖子加分', 'type' => 'number', 'default' => 3, 'min' => 0, 'max' => 1000], ['key' => 'points_earn_invite', 'label' => '邀请注册奖励', 'type' => 'number', 'default' => 10, 'min' => 0, 'max' => 1000, 'help' => '邀请奖励不走免费日上限'], ]], ['key' => 'spend', 'title' => '积分消费', 'fields' => [ diff --git a/inc/classes/class-aksrt-credits-earn.php b/inc/classes/class-aksrt-credits-earn.php index 877bafe9..b872857f 100644 --- a/inc/classes/class-aksrt-credits-earn.php +++ b/inc/classes/class-aksrt-credits-earn.php @@ -234,22 +234,14 @@ class AKSRT_Credits_Earn { } } - public function on_forum_topic_featured(int $topic_id, int $operator_id): void { - unset($operator_id); - $post = get_post($topic_id); - if (!$post || $post->post_type !== 'aksrt_forum_topic') { - return; - } - $user_id = (int) $post->post_author; - if ($user_id <= 0 || !class_exists('AKSRT_Points_Free')) { - return; - } - if (get_post_meta($topic_id, 'aksrt_credit_essence_rewarded', true)) { - return; - } - $granted = AKSRT_Points_Free::grant($user_id, 'bbs_essence', 0, ['type' => 'post', 'id' => $topic_id]); - if (!is_wp_error($granted) && $granted > 0) { - update_post_meta($topic_id, 'aksrt_credit_essence_rewarded', 1); - } + /** + * Essence reward is owned by AKSRT_Forum::reward_essence() (free-day-cap). + * Keep hook for external integrations only — do not double-grant. + * + * @param int $topic_id + * @param int $author_or_operator Author id from forum (2nd arg) or operator. + */ + public function on_forum_topic_featured(int $topic_id, int $author_or_operator = 0): void { + unset($topic_id, $author_or_operator); } } diff --git a/inc/classes/class-aksrt-points-free.php b/inc/classes/class-aksrt-points-free.php index b4d1bae7..6bdf767b 100644 --- a/inc/classes/class-aksrt-points-free.php +++ b/inc/classes/class-aksrt-points-free.php @@ -33,6 +33,10 @@ class AKSRT_Points_Free { 'bbs_posts_new' => [__('论坛发帖', 'aksrt'), __('发布论坛主题', 'aksrt'), 5], 'bbs_reply' => [__('论坛回复', 'aksrt'), __('回复论坛主题', 'aksrt'), 2], 'bbs_essence' => [__('帖子加精', 'aksrt'), __('主题被设为精华', 'aksrt'), 10], + 'bbs_adopt' => [__('回复被采纳', 'aksrt'), __('问答帖回复被采纳', 'aksrt'), 20], + 'bbs_posts_hot' => [__('热帖奖励', 'aksrt'), __('主题成为热帖', 'aksrt'), 5], + 'bbs_comment_hot'=> [__('神评奖励', 'aksrt'), __('回复成为神评', 'aksrt'), 5], + 'bbs_score_extra'=> [__('帖子加分', 'aksrt'), __('主题被加分时奖励', 'aksrt'), 3], ]; } @@ -276,6 +280,36 @@ class AKSRT_Points_Free { return max(0, (int) ($f['credits']['comment_new'] ?? $default)); } return $default; + case 'bbs_essence': + if (class_exists('AKSRT_Settings') && method_exists('AKSRT_Settings', 'get_forum_settings')) { + $f = AKSRT_Settings::get_forum_settings(); + return max(0, (int) ($f['credits']['essence'] ?? $default)); + } + return $default; + case 'bbs_adopt': + if (class_exists('AKSRT_Settings') && method_exists('AKSRT_Settings', 'get_forum_settings')) { + $f = AKSRT_Settings::get_forum_settings(); + return max(0, (int) ($f['credits']['adopted'] ?? $default)); + } + return $default; + case 'bbs_posts_hot': + if (class_exists('AKSRT_Settings') && method_exists('AKSRT_Settings', 'get_forum_settings')) { + $f = AKSRT_Settings::get_forum_settings(); + return max(0, (int) ($f['credits']['posts_hot'] ?? $default)); + } + return $default; + case 'bbs_comment_hot': + if (class_exists('AKSRT_Settings') && method_exists('AKSRT_Settings', 'get_forum_settings')) { + $f = AKSRT_Settings::get_forum_settings(); + return max(0, (int) ($f['credits']['comment_hot'] ?? $f['credits']['comment_like'] ?? $default)); + } + return $default; + case 'bbs_score_extra': + if (class_exists('AKSRT_Settings') && method_exists('AKSRT_Settings', 'get_forum_settings')) { + $f = AKSRT_Settings::get_forum_settings(); + return max(0, (int) ($f['credits']['score_extra'] ?? $default)); + } + return $default; default: return $default; } diff --git a/inc/classes/class-aksrt-withdrawal.php b/inc/classes/class-aksrt-withdrawal.php index 8c8a363c..ac5b8c87 100644 --- a/inc/classes/class-aksrt-withdrawal.php +++ b/inc/classes/class-aksrt-withdrawal.php @@ -167,7 +167,31 @@ class AKSRT_Withdrawal { } $ok = $wpdb->update($this->table(), $update, ['id' => $withdrawal_id], $format, ['%d']) !== false; - return $ok ? true : new WP_Error('aksrt_withdraw_update', __('提现状态更新失败', 'aksrt')); + if (!$ok) { + return new WP_Error('aksrt_withdraw_update', __('提现状态更新失败', 'aksrt')); + } + + // Notify user on terminal status (Zibll withdraw_reply parity). + if (class_exists('AKSRT_Message') && $user_id > 0 && in_array($new_status, [self::STATUS_COMPLETED, self::STATUS_REJECTED], true)) { + $gross = $this->resolve_gross_amount($row, $meta); + $amount_txt = class_exists('AKSRT_Balance') ? AKSRT_Balance::format($gross) : number_format($gross, 2); + if ($new_status === self::STATUS_REJECTED) { + $title = __('提现已拒绝', 'aksrt'); + $body = sprintf(__('您申请提现 %s 元已被拒绝，冻结金额已退回钱包。', 'aksrt'), $amount_txt); + if ($note !== '') { + $body .= ' ' . sprintf(__('备注：%s', 'aksrt'), $note); + } + } else { + $title = __('提现已完成', 'aksrt'); + $body = sprintf(__('您申请提现 %s 元已处理完成。', 'aksrt'), $amount_txt); + } + AKSRT_Message::get_instance()->send($user_id, 'withdraw', $body, [ + 'title' => $title, + 'target_url' => function_exists('aksrt_get_user_center_url') ? aksrt_get_user_center_url('credits') : '', + ]); + } + + return true; } /** diff --git a/inc/classes/forum/class-aksrt-forum-comment-service.php b/inc/classes/forum/class-aksrt-forum-comment-service.php index 5a76d038..a934762e 100644 --- a/inc/classes/forum/class-aksrt-forum-comment-service.php +++ b/inc/classes/forum/class-aksrt-forum-comment-service.php @@ -312,17 +312,27 @@ class AKSRT_Forum_Comment_Service { update_post_meta($topic_id, '_aksrt_question_status', 1); // QUESTION_SOLVED $adoptee_id = (int) $comment->user_id; - if ($adoptee_id > 0 && class_exists('AKSRT_Credits')) { + if ($adoptee_id > 0) { $config = $this->forum->get_config(); $amount = (int) ($config['credits']['adopted'] ?? 20); if ($amount > 0) { $already = get_comment_meta($comment_id, '_aksrt_adopt_credited', true); if (!$already) { - \AKSRT_Credits::add($adoptee_id, $amount, 'forum_adopted', [ - 'type' => 'comment', - 'id' => $comment_id, - ]); - update_comment_meta($comment_id, '_aksrt_adopt_credited', '1'); + if (class_exists('AKSRT_Points_Free')) { + $granted = \AKSRT_Points_Free::grant($adoptee_id, 'bbs_adopt', $amount, [ + 'type' => 'comment', + 'id' => $comment_id, + ]); + if (!is_wp_error($granted) && (int) $granted > 0) { + update_comment_meta($comment_id, '_aksrt_adopt_credited', '1'); + } + } elseif (class_exists('AKSRT_Credits')) { + \AKSRT_Credits::add($adoptee_id, $amount, 'forum_adopted', [ + 'type' => 'comment', + 'id' => $comment_id, + ]); + update_comment_meta($comment_id, '_aksrt_adopt_credited', '1'); + } } } @@ -498,15 +508,22 @@ class AKSRT_Forum_Comment_Service { update_comment_meta($comment_id, '_aksrt_is_hot', '1'); - // Credit the comment author + // Credit the comment author (free-task day cap). $author_id = (int) $comment->user_id; - if ($author_id > 0 && class_exists('AKSRT_Credits')) { - $amount = (int) ($config['credits']['comment_like'] ?? 1); + if ($author_id > 0) { + $amount = (int) ($config['credits']['comment_hot'] ?? $config['credits']['comment_like'] ?? 5); if ($amount > 0) { - \AKSRT_Credits::add($author_id, $amount, 'forum_hot_comment', [ - 'type' => 'comment', - 'id' => $comment_id, - ]); + if (class_exists('AKSRT_Points_Free')) { + \AKSRT_Points_Free::grant($author_id, 'bbs_comment_hot', $amount, [ + 'type' => 'comment', + 'id' => $comment_id, + ]); + } elseif (class_exists('AKSRT_Credits')) { + \AKSRT_Credits::add($author_id, $amount, 'forum_hot_comment', [ + 'type' => 'comment', + 'id' => $comment_id, + ]); + } } } diff --git a/inc/classes/forum/class-aksrt-forum-score-service.php b/inc/classes/forum/class-aksrt-forum-score-service.php index 5cd648e0..46a6dddf 100644 --- a/inc/classes/forum/class-aksrt-forum-score-service.php +++ b/inc/classes/forum/class-aksrt-forum-score-service.php @@ -126,16 +126,23 @@ class AKSRT_Forum_Score_Service { $reputation += $amount; update_user_meta($author_id, 'aksrt_reputation', $reputation); - if ($amount > 0 && class_exists('AKSRT_Credits')) { + if ($amount > 0) { $credits_amount = (int) ($config['credits']['score_extra'] ?? 3); if ($credits_amount > 0) { - $daily = $this->today_credits_count($author_id, 'forum_score_extra'); - $daily_max = (int) ($config['credits']['daily_max'] ?? 50); - if ($daily < $daily_max) { - AKSRT_Credits::add($author_id, $credits_amount, 'forum_score_extra', sprintf( - __('帖子「%s」被加分', 'aksrt'), - get_the_title($topic_id) - )); + if (class_exists('AKSRT_Points_Free')) { + AKSRT_Points_Free::grant($author_id, 'bbs_score_extra', $credits_amount, [ + 'type' => 'post', + 'id' => $topic_id, + ]); + } elseif (class_exists('AKSRT_Credits')) { + $daily = $this->today_credits_count($author_id, 'forum_score_extra'); + $daily_max = (int) ($config['credits']['daily_max'] ?? 50); + if ($daily < $daily_max) { + AKSRT_Credits::add($author_id, $credits_amount, 'forum_score_extra', sprintf( + __('帖子「%s」被加分', 'aksrt'), + get_the_title($topic_id) + )); + } } } } @@ -232,10 +239,17 @@ class AKSRT_Forum_Score_Service { update_post_meta($topic_id, '_aksrt_hot_rewarded', '1'); $config = $this->forum->get_config(); $amount = (int) ($config['credits']['posts_hot'] ?? 5); - if ($amount > 0 && class_exists('AKSRT_Credits')) { - AKSRT_Credits::add($author_id, $amount, 'forum_hot_topic', [ - 'type' => 'post', 'id' => $topic_id, - ]); + if ($amount > 0) { + if (class_exists('AKSRT_Points_Free')) { + AKSRT_Points_Free::grant($author_id, 'bbs_posts_hot', $amount, [ + 'type' => 'post', + 'id' => $topic_id, + ]); + } elseif (class_exists('AKSRT_Credits')) { + AKSRT_Credits::add($author_id, $amount, 'forum_hot_topic', [ + 'type' => 'post', 'id' => $topic_id, + ]); + } } $this->notify($author_id, 'hot', sprintf( __('你的帖子「%s」成为热帖！', 'aksrt'), get_the_title($topic_id) diff --git a/inc/classes/forum/topic-service-traits/trait-aksrt-forum-topic-service-part-1.php b/inc/classes/forum/topic-service-traits/trait-aksrt-forum-topic-service-part-1.php index 96c92fe2..29c4715b 100644 --- a/inc/classes/forum/topic-service-traits/trait-aksrt-forum-topic-service-part-1.php +++ b/inc/classes/forum/topic-service-traits/trait-aksrt-forum-topic-service-part-1.php @@ -245,22 +245,32 @@ trait AKSRT_Forum_Topic_Service_Part_1 { return; } - // 积分奖励（§7.7）：读 `credits.essence`，带每日上限。 - if (class_exists('AKSRT_Credits') && class_exists('AKSRT_Settings')) { + // 积分奖励（§7.7）：统一走免费积分日上限。 + if (class_exists('AKSRT_Settings')) { $cfg = AKSRT_Settings::get_forum_settings(); $amount = (int) ($cfg['credits']['essence'] ?? 0); if ($amount > 0) { - $daily_max = (int) ($cfg['credits']['daily_max'] ?? 50); - if ($daily_max > 0 && $this->today_credits_count($author_id, 'forum_essence') >= $daily_max) { - $amount = 0; - } - - if ($amount > 0) { - AKSRT_Credits::add($author_id, $amount, 'forum_essence', [ + $granted = 0; + if (class_exists('AKSRT_Points_Free')) { + $result = AKSRT_Points_Free::grant($author_id, 'bbs_essence', $amount, [ 'type' => 'post', - 'id' => $topic_id, - ], __('主题被设为精华', 'aksrt')); - + 'id' => $topic_id, + ]); + $granted = is_wp_error($result) ? 0 : (int) $result; + } elseif (class_exists('AKSRT_Credits')) { + $daily_max = (int) ($cfg['credits']['daily_max'] ?? 50); + if ($daily_max > 0 && $this->today_credits_count($author_id, 'forum_essence') >= $daily_max) { + $amount = 0; + } + if ($amount > 0) { + AKSRT_Credits::add($author_id, $amount, 'forum_essence', [ + 'type' => 'post', + 'id' => $topic_id, + ], __('主题被设为精华', 'aksrt')); + $granted = $amount; + } + } + if ($granted > 0) { update_post_meta($topic_id, '_aksrt_essence_rewarded', '1'); update_post_meta($topic_id, '_aksrt_essence_rewarded_at', current_time('mysql')); } diff --git a/inc/helpers/aksrt-credits.php b/inc/helpers/aksrt-credits.php index f5919a1f..afd0d287 100644 --- a/inc/helpers/aksrt-credits.php +++ b/inc/helpers/aksrt-credits.php @@ -61,6 +61,10 @@ if (!function_exists('aksrt_credits_label')) { 'free_bbs_posts_new'=> __('论坛发帖', 'aksrt'), 'free_bbs_reply'=> __('论坛回复', 'aksrt'), 'free_bbs_essence'=> __('帖子加精', 'aksrt'), + 'free_bbs_adopt'=> __('回复被采纳', 'aksrt'), + 'free_bbs_posts_hot'=> __('热帖奖励', 'aksrt'), + 'free_bbs_comment_hot'=> __('神评奖励', 'aksrt'), + 'free_bbs_score_extra'=> __('帖子加分', 'aksrt'), ]; if (isset($map[$reason])) { return $map[$reason]; diff --git a/inc/helpers/aksrt-single-render.php b/inc/helpers/aksrt-single-render.php index 3de983cf..2b5b04b7 100644 --- a/inc/helpers/aksrt-single-render.php +++ b/inc/helpers/aksrt-single-render.php @@ -236,6 +236,7 @@ if (!function_exists('aksrt_single_render_actions')) : +