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
95 lines
3.1 KiB
PHP
95 lines
3.1 KiB
PHP
<?php
|
||
// +----------------------------------------------------------------------
|
||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||
// +----------------------------------------------------------------------
|
||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||
// +----------------------------------------------------------------------
|
||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||
// +----------------------------------------------------------------------
|
||
// | Author: CRMEB Team <admin@crmeb.com>
|
||
// +----------------------------------------------------------------------
|
||
|
||
namespace crmeb\traits;
|
||
|
||
use app\dao\BaseDao;
|
||
use crmeb\basic\BaseAuth;
|
||
use crmeb\basic\BaseModel;
|
||
use think\db\exception\DataNotFoundException;
|
||
use think\db\exception\DbException;
|
||
use think\db\exception\ModelNotFoundException;
|
||
|
||
/**
|
||
* Trait SearchDaoTrait
|
||
* @package crmeb\traits
|
||
* @mixin BaseDao
|
||
*/
|
||
trait SearchDaoTrait
|
||
{
|
||
|
||
/**
|
||
* 搜索（没有进入搜索器的自动进入where条件）
|
||
* @param array $where
|
||
* @param bool $authWhere
|
||
* @return BaseModel
|
||
*/
|
||
public function searchWhere(array $where, bool $authWhere = true)
|
||
{
|
||
[$with, $whereKey] = app()->make(BaseAuth::class)->________(array_keys($where), $this->setModel());
|
||
$whereData = [];
|
||
foreach ($whereKey as $key) {
|
||
if (isset($where[$key]) && 'timeKey' !== $key) {
|
||
$whereData[$key] = $where[$key];
|
||
}
|
||
}
|
||
|
||
return $this->getModel()->withSearch($with, $where)->when($authWhere && $whereData, function ($query) use ($whereData) {
|
||
$query->where($whereData);
|
||
});
|
||
}
|
||
|
||
/**
|
||
* @param array $where
|
||
* @param bool $authWhere
|
||
* @return int
|
||
* @throws DbException
|
||
*/
|
||
public function count(array $where = [], bool $authWhere = true): int
|
||
{
|
||
return $this->searchWhere($where, $authWhere)->count();
|
||
}
|
||
|
||
/**
|
||
* 搜索
|
||
* @param array $where
|
||
* @param array|string[] $field
|
||
* @param int $page
|
||
* @param int $limit
|
||
* @param null $sort
|
||
* @param array $with
|
||
* @return array
|
||
* @throws DbException
|
||
* @throws DataNotFoundException
|
||
* @throws ModelNotFoundException
|
||
*/
|
||
public function getDataList(array $where, array $field = ['*'], int $page = 0, int $limit = 0, $sort = null, array $with = [])
|
||
{
|
||
return $this->searchWhere($where)->when($page && $limit, function ($query) use ($page, $limit) {
|
||
$query->page($page, $limit);
|
||
})->when(!$page && $limit, function ($query) use ($limit) {
|
||
$query->limit($limit);
|
||
})->when($sort, function ($query, $sort) {
|
||
if (is_array($sort)) {
|
||
foreach ($sort as $k => $v) {
|
||
if (is_numeric($k)) {
|
||
$query->order($v, 'desc');
|
||
} else {
|
||
$query->order($k, $v);
|
||
}
|
||
}
|
||
} else {
|
||
$query->order($sort, 'desc');
|
||
}
|
||
})->field($field)->with($with)->select()->toArray();
|
||
}
|
||
}
|