feat(fsgx): 完成全部24项开发任务 Phase1-7
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
This commit is contained in:
apple
194
pro_v3.5.1_副本/app/dao/activity/holiday/HolidayGiftDao.php
Normal file
194
pro_v3.5.1_副本/app/dao/activity/holiday/HolidayGiftDao.php
Normal file
@@ -0,0 +1,194 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\dao\activity\holiday;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\activity\holiday\HolidayGift;
|
||||
|
||||
/**
|
||||
* 节日有礼数据层
|
||||
* Class HolidayGiftDao
|
||||
* @package app\dao\activity
|
||||
*/
|
||||
class HolidayGiftDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return HolidayGift::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取节日有礼列表
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getHolidayGiftList(array $where, string $field = '*', int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)->field($field)
|
||||
->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})
|
||||
->order('id desc')
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取正在进行中的节日有礼活动
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getActiveHolidayGift(array $where = [], string $field = '*')
|
||||
{
|
||||
$time = time();
|
||||
return $this->getModel()->where($where)
|
||||
->where('status', 1)
|
||||
->where('is_del', 0)
|
||||
->where(function ($query) use ($time) {
|
||||
$query->whereOr([
|
||||
['is_permanent', '=', 1], // 永久活动
|
||||
[['start_time', '<=', $time], ['end_time', '>=', $time]] // 时间范围内的活动
|
||||
]);
|
||||
})
|
||||
->field($field)
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户生日相关的节日有礼活动
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getBirthdayHolidayGift(array $where = [], string $field = '*')
|
||||
{
|
||||
$time = time();
|
||||
return $this->getModel()->where($where)
|
||||
->where('status', 1)
|
||||
->where('is_del', 0)
|
||||
->where('task_type', 1) // 用户生日类型
|
||||
->where(function ($query) use ($time) {
|
||||
$query->whereOr([
|
||||
['is_permanent', '=', 1], // 永久活动
|
||||
[['start_time', '<=', $time], ['end_time', '>=', $time]] // 时间范围内的活动
|
||||
]);
|
||||
})
|
||||
->field($field)
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取活动日期相关的节日有礼活动
|
||||
* @param string $date 日期，格式：MM-DD
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getCustomDateHolidayGift(string $date, array $where = [], string $field = '*')
|
||||
{
|
||||
$time = time();
|
||||
return $this->getModel()->where($where)
|
||||
->where('status', 1)
|
||||
->where('is_del', 0)
|
||||
->where('task_type', 2) // 活动日期类型
|
||||
->where('activity_date_type', 1) // 自定义日期
|
||||
->where(function ($query) use ($date) {
|
||||
$query->where('activity_start_date', '<=', $date)
|
||||
->where('activity_end_date', '>=', $date);
|
||||
})
|
||||
->where(function ($query) use ($time) {
|
||||
$query->whereOr([
|
||||
['is_permanent', '=', 1], // 永久活动
|
||||
[['start_time', '<=', $time], ['end_time', '>=', $time]] // 时间范围内的活动
|
||||
]);
|
||||
})
|
||||
->field($field)
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取每月活动日期相关的节日有礼活动
|
||||
* @param int $day 日期，1-31
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getMonthlyHolidayGift(int $day, array $where = [], string $field = '*')
|
||||
{
|
||||
$time = time();
|
||||
return $this->getModel()->where($where)
|
||||
->where('status', 1)
|
||||
->where('is_del', 0)
|
||||
->where('task_type', 2) // 活动日期类型
|
||||
->where('activity_date_type', 2) // 每月
|
||||
->whereRaw("FIND_IN_SET(?, activity_month_days)", [$day])
|
||||
->where(function ($query) use ($time) {
|
||||
$query->whereOr([
|
||||
['is_permanent', '=', 1], // 永久活动
|
||||
[['start_time', '<=', $time], ['end_time', '>=', $time]] // 时间范围内的活动
|
||||
]);
|
||||
})
|
||||
->field($field)
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取每周活动日期相关的节日有礼活动
|
||||
* @param int $weekDay 周几，1-7表示周一到周日
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getWeeklyHolidayGift(int $weekDay, array $where = [], string $field = '*')
|
||||
{
|
||||
$time = time();
|
||||
return $this->getModel()->where($where)
|
||||
->where('status', 1)
|
||||
->where('is_del', 0)
|
||||
->where('task_type', 2) // 活动日期类型
|
||||
->where('activity_date_type', 3) // 每周
|
||||
->whereRaw("FIND_IN_SET(?, activity_week_days)", [$weekDay])
|
||||
->where(function ($query) use ($time) {
|
||||
$query->whereOr([
|
||||
['is_permanent', '=', 1], // 永久活动
|
||||
[['start_time', '<=', $time], ['end_time', '>=', $time]] // 时间范围内的活动
|
||||
]);
|
||||
})
|
||||
->field($field)
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user