434aa8c69d
Phase1 后端核心：
- 新增 fsgx_v1.sql 迁移脚本（is_queue_goods/frozen_points/available_points/no_assess）
- SystemConfigServices 返佣设置扩展（周期人数/分档比例/范围/时机）
- StoreOrderCreateServices 周期循环佣金计算
- StoreOrderTakeServices 佣金发放后同步冻结积分
- StoreProductServices/StoreProduct 保存 is_queue_goods
Phase2 后端接口：
- GET /api/hjf/brokerage/progress 佣金周期进度
- GET /api/hjf/assets/overview 资产总览
- HjfPointsServices 每日 frozen_points 0.4‰ 释放定时任务
- PUT /adminapi/hjf/member/{uid}/no_assess 不考核接口
- GET /adminapi/hjf/points/release_log 积分日志接口
Phase3 前端清理：
- hjfCustom.js 路由精简（仅保留 points/log）
- hjfQueue.js/hjfMember.js API 清理/重定向至 CRMEB 原生接口
- pages.json 公排→推荐佣金/佣金记录/佣金规则
Phase4-5 前端改造：
- queue/status.vue 推荐佣金进度页整体重写
- 商品详情/订单确认/支付结果页文案与逻辑改造
- 个人中心/资产页/引导页/规则页文案改造
- HjfQueueProgress/HjfRefundNotice/HjfAssetCard 组件改造
- 推广中心嵌入佣金进度摘要
- hjfMockData.js 全量更新（公排字段→佣金字段）
Phase6 Admin 增强：
- 用户列表新增 frozen_points/available_points 列及不考核操作按钮
- hjfPoints.js USE_MOCK=false 对接真实积分日志接口
Phase7 配置文档：
- docs/fsgx-phase7-config-checklist.md 后台配置与全链路验收清单
Made-with: Cursor
117 lines
3.4 KiB
PHP
117 lines
3.4 KiB
PHP
<?php
|
|
|
|
declare (strict_types=1);
|
|
|
|
namespace app\controller\api\v1\activity;
|
|
|
|
use app\services\activity\bargain\StoreBargainServices;
|
|
use app\services\activity\holiday\HolidayGiftServices;
|
|
use app\services\activity\holiday\HolidayGiftRecordServices;
|
|
use app\services\activity\holiday\HolidayGiftPushServices;
|
|
use app\Request;
|
|
use app\services\user\UserServices;
|
|
use think\annotation\Inject;
|
|
use think\facade\App;
|
|
|
|
/**
|
|
* 节日有礼控制器
|
|
* Class HolidayGiftController
|
|
* @package app\api\controller\v1\activity
|
|
*/
|
|
class HolidayGift
|
|
{
|
|
/**
|
|
* @var HolidayGiftServices
|
|
*/
|
|
#[Inject]
|
|
protected HolidayGiftServices $services;
|
|
|
|
|
|
/**
|
|
* 获取用户可领取的节日有礼列表
|
|
* @param Request $request
|
|
* @return mixed
|
|
* @throws \think\db\exception\DataNotFoundException
|
|
* @throws \think\db\exception\DbException
|
|
* @throws \think\db\exception\ModelNotFoundException
|
|
*/
|
|
public function getList(Request $request)
|
|
{
|
|
$uid = (int)$request->uid();
|
|
if (!$uid) {
|
|
return app('json')->success([]);
|
|
}
|
|
|
|
// 获取活动中的节日有礼
|
|
$where = [
|
|
'status' => 1,
|
|
'is_del' => 0,
|
|
];
|
|
$list = $this->services->getActiveHolidayGift($where);
|
|
if (!$list) {
|
|
return app('json')->success([]);
|
|
}
|
|
$holidayGiftPushServices = app()->make(HolidayGiftPushServices::class);
|
|
// 过滤不符合条件的活动
|
|
$result = [];
|
|
foreach ($list as $item) {
|
|
//检查提前推送是否在日期内
|
|
if (!$holidayGiftPushServices->checkAdvancePush($item, false, $uid)) {
|
|
continue;
|
|
}
|
|
|
|
// 检查用户是否符合条件
|
|
if (!$this->services->checkUserCondition($uid, $item)) {
|
|
continue;
|
|
}
|
|
|
|
// 检查是否在推送时段内
|
|
if (!$this->services->checkPushTimeRange($item)) {
|
|
continue;
|
|
}
|
|
//检查推送频次是否推送过
|
|
if (!$this->services->checkPopupAdCondition($uid, $item)) {
|
|
continue;
|
|
}
|
|
|
|
// 添加到结果中
|
|
$result[] = [
|
|
'id' => $item['id'],
|
|
'name' => $item['name'],
|
|
'gift_type' => $item['gift_type'],
|
|
'push_channel' => $item['push_channel'],
|
|
'show_page' => $item['show_page'],
|
|
'push_frequency' => $item['push_frequency'],
|
|
'wechat_image' => $item['wechat_image'],
|
|
'end_time' => $item['end_time'],
|
|
'end_time_format' => date('Y-m-d H:i:s', $item['end_time'])
|
|
];
|
|
}
|
|
|
|
return app('json')->success(['list' => $result]);
|
|
}
|
|
|
|
|
|
/**
|
|
* 推送记录
|
|
* @return void
|
|
* User: liusl
|
|
* DateTime: 2025/7/21 15:27
|
|
*/
|
|
public function record(Request $request, HolidayGiftPushServices $services)
|
|
{
|
|
$uid = (int)$request->uid();
|
|
[$ids] = $request->postMore([['ids', '']], true);
|
|
if (!$ids || !$uid) {
|
|
return app('json')->fail('参数错误');
|
|
}
|
|
$ids = explode(',', $ids);
|
|
$data = [
|
|
'push_type' => 3,
|
|
'status' => 1
|
|
];
|
|
$result = $services->saveGiftPush($ids, $uid, $data);
|
|
return app('json')->success($result ? '推送成功' : '推送失败');
|
|
}
|
|
}
|