feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
<?php
|
|
|
|
|
|
declare(strict_types=1);
|
|
|
|
|
|
|
|
|
|
|
|
namespace app\services\hjf;
|
|
|
|
|
|
|
|
|
|
|
|
use app\dao\user\UserDao;
|
|
|
|
|
|
use app\services\BaseServices;
|
2026-03-24 20:40:46 +08:00
|
|
|
|
use app\services\user\UserBillServices;
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
use crmeb\services\SystemConfigService;
|
|
|
|
|
|
use think\facade\Db;
|
|
|
|
|
|
use think\facade\Log;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* 积分每日释放服务
|
|
|
|
|
|
*
|
|
|
|
|
|
* 由定时任务(每天凌晨00:01)或 Command 触发。
|
|
|
|
|
|
* 计算公式:release_amount = FLOOR(frozen_points × rate / 1000)
|
|
|
|
|
|
* 其中 rate = hjf_release_rate(默认 4,即 4‰)
|
|
|
|
|
|
*
|
|
|
|
|
|
* Class PointsReleaseServices
|
|
|
|
|
|
* @package app\services\hjf
|
|
|
|
|
|
*/
|
|
|
|
|
|
class PointsReleaseServices extends BaseServices
|
|
|
|
|
|
{
|
2026-03-29 10:36:52 +08:00
|
|
|
|
public function __construct(UserDao $dao)
|
|
|
|
|
|
{
|
|
|
|
|
|
$this->dao = $dao;
|
|
|
|
|
|
}
|
2026-03-24 20:40:46 +08:00
|
|
|
|
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
/**
|
|
|
|
|
|
* 执行今日积分释放(批量)
|
|
|
|
|
|
*
|
|
|
|
|
|
* @return array 统计:['processed' => int, 'total_released' => int]
|
|
|
|
|
|
*/
|
|
|
|
|
|
public function executeRelease(): array
|
|
|
|
|
|
{
|
2026-03-29 10:36:52 +08:00
|
|
|
|
$rate = (int)SystemConfigService::get('hjf_release_rate', 4);
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
$releaseDate = date('Y-m-d');
|
|
|
|
|
|
$processed = 0;
|
|
|
|
|
|
$totalReleased = 0;
|
|
|
|
|
|
|
2026-03-29 10:36:52 +08:00
|
|
|
|
$page = 1;
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
$limit = 200;
|
|
|
|
|
|
|
|
|
|
|
|
do {
|
2026-03-29 10:36:52 +08:00
|
|
|
|
$users = Db::table('eb_user')
|
|
|
|
|
|
->where('frozen_points', '>', 0)
|
|
|
|
|
|
->field('uid, frozen_points, available_points')
|
|
|
|
|
|
->page($page, $limit)
|
|
|
|
|
|
->select()
|
|
|
|
|
|
->toArray();
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
|
|
|
|
|
|
if (empty($users)) {
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
foreach ($users as $user) {
|
|
|
|
|
|
$frozenBefore = (int)$user['frozen_points'];
|
|
|
|
|
|
$releaseAmount = (int)bcdiv(bcmul((string)$frozenBefore, (string)$rate), '1000');
|
|
|
|
|
|
|
|
|
|
|
|
if ($releaseAmount <= 0) {
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-03-29 10:36:52 +08:00
|
|
|
|
$frozenAfter = $frozenBefore - $releaseAmount;
|
|
|
|
|
|
$newAvailable = (int)$user['available_points'] + $releaseAmount;
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
|
2026-03-29 10:36:52 +08:00
|
|
|
|
// 主更新:只更新积分字段,失败则跳过本用户
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
try {
|
2026-03-29 10:36:52 +08:00
|
|
|
|
Db::table('eb_user')->where('uid', $user['uid'])->update([
|
|
|
|
|
|
'frozen_points' => max(0, $frozenAfter),
|
|
|
|
|
|
'available_points' => $newAvailable,
|
|
|
|
|
|
]);
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
|
|
|
|
|
|
$totalReleased += $releaseAmount;
|
|
|
|
|
|
$processed++;
|
|
|
|
|
|
} catch (\Throwable $e) {
|
2026-03-29 10:36:52 +08:00
|
|
|
|
Log::error("[PointsRelease] uid={$user['uid']} 积分更新失败: " . $e->getMessage());
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 日志写入独立处理,失败不影响已提交的积分更新
|
|
|
|
|
|
try {
|
|
|
|
|
|
Db::table('eb_points_release_log')->insert([
|
|
|
|
|
|
'uid' => $user['uid'],
|
|
|
|
|
|
'points' => $releaseAmount,
|
|
|
|
|
|
'pm' => 1,
|
|
|
|
|
|
'type' => 'release',
|
|
|
|
|
|
'title' => '每日释放',
|
|
|
|
|
|
'mark' => "积分每日自动解冻,释放日期 {$releaseDate}",
|
|
|
|
|
|
'status' => 'released',
|
|
|
|
|
|
'release_date' => $releaseDate,
|
|
|
|
|
|
'add_time' => time(),
|
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
|
|
/** @var UserBillServices $billServices */
|
|
|
|
|
|
$billServices = app()->make(UserBillServices::class);
|
|
|
|
|
|
$billServices->income(
|
|
|
|
|
|
'frozen_points_release',
|
|
|
|
|
|
(int)$user['uid'],
|
|
|
|
|
|
(int)$releaseAmount,
|
|
|
|
|
|
$newAvailable,
|
|
|
|
|
|
0,
|
|
|
|
|
|
0,
|
|
|
|
|
|
"积分每日自动解冻,释放日期 {$releaseDate}"
|
|
|
|
|
|
);
|
|
|
|
|
|
} catch (\Throwable $e) {
|
|
|
|
|
|
Log::warning("[PointsRelease] uid={$user['uid']} 日志写入失败(积分已释放): " . $e->getMessage());
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$page++;
|
|
|
|
|
|
} while (count($users) === $limit);
|
|
|
|
|
|
|
|
|
|
|
|
Log::info("[PointsRelease] 完成,processed={$processed} total_released={$totalReleased}");
|
|
|
|
|
|
|
|
|
|
|
|
return [
|
2026-03-29 10:36:52 +08:00
|
|
|
|
'processed' => $processed,
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
'total_released' => $totalReleased,
|
2026-03-29 10:36:52 +08:00
|
|
|
|
'release_date' => $releaseDate,
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
];
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|