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

pro_v3.5.1_副本/app/dao/activity/combination/StoreCombinationDao.php

@@ -0,0 +1,164 @@
+<?php
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+declare (strict_types=1);
+
+namespace app\dao\activity\combination;
+
+use app\dao\BaseDao;
+use app\model\activity\combination\StoreCombination;
+use crmeb\basic\BaseModel;
+
+/**
+ * 拼团商品
+ * Class StoreCombinationDao
+ * @package app\dao\activity\combination
+ */
+class StoreCombinationDao extends BaseDao
+{
+
+    /**
+     * 设置模型
+     * @return string
+     */
+    protected function setModel(): string
+    {
+        return StoreCombination::class;
+    }
+
+    /**
+     * 搜索
+     * @param array $where
+     * @param bool $search
+     * @return BaseModel
+     * @throws \ReflectionException
+     */
+    public function search(array $where = [], bool $search = false)
+    {
+        return parent::search($where, $search)->when(isset($where['pinkIngTime']), function ($query) use ($where) {
+            $time = time();
+            [$startTime, $stopTime] = is_array($where['pinkIngTime']) ? $where['pinkIngTime'] : [$time, $time];
+            $query->where('start_time', '<=', $startTime)->where('stop_time', '>=', $stopTime);
+        })->when(isset($where['storeProductId']), function ($query) {
+            $query->where('product_id', 'IN', function ($query) {
+                $query->name('store_product')->where('is_del', 0)->field('id');
+            });
+        })->when(isset($where['start_status']) && $where['start_status'] !== '', function ($query) use ($where) {
+            $time = time();
+            switch ($where['start_status']) {
+                case -1:
+                    $query->where(function ($query) use ($time) {
+                        $query->where('stop_time', '<', $time)->whereOr('is_show', 0);
+                    });
+                    break;
+                case 0:
+                    $query->where('start_time', '>', $time)->where('is_show', 1);
+                    break;
+                case 1:
+                    $query->where('start_time', '<=', $time)->where('stop_time', '>=', $time)->where('is_show', 1);
+                    break;
+            }
+        });
+    }
+
+
+    /**
+     * 拼团商品列表
+     * @param array $where
+     * @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 getList(array $where, int $page = 0, int $limit = 0)
+    {
+        return $this->search($where)->with('getPrice')
+            ->when($page != 0 && $limit != 0, function ($query) use ($page, $limit) {
+                $query->page($page, $limit);
+            })->order('sort desc,id desc')->select()->toArray();
+    }
+
+    /**
+     * 获取正在进行拼团的商品以数组形式返回
+     * @param array $ids
+     * @param array $field
+     * @return array
+     */
+    public function getPinkIdsArray(array $ids, array $field = [])
+    {
+        return $this->search(['is_del' => 0, 'is_show' => 1, 'pinkIngTime' => 1])->whereIn('product_id', $ids)->column(implode(',', $field), 'product_id');
+    }
+
+    /**
+ 	* 获取拼团列表
+	* @param array $where
+	* @param string $field
+	* @param int $page
+	* @param int $limit
+	* @return array
+	* @throws \ReflectionException
+	* @throws \think\db\exception\DataNotFoundException
+	* @throws \think\db\exception\DbException
+	* @throws \think\db\exception\ModelNotFoundException
+	*/
+    public function combinationList(array $where, string $field = '*', int $page = 0, int $limit = 0)
+    {
+        return $this->search($where)->field($field)->with('getPrice')
+			->when($page && $limit, function ($query) use ($page, $limit) {
+				$query->page($page, $limit);
+			})->when(!$page && $limit, function ($query) use ($limit) {
+                $query->limit($limit);
+            })->order('sort desc,id desc')->select()->toArray();
+    }
+
+    /**
+     * 根据id获取拼团数据
+     * @param array $ids
+     * @param string $field
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function idCombinationList(array $ids, string $field)
+    {
+        return $this->getModel()->whereIn('id', $ids)->field($field)->select()->toArray();
+    }
+
+    /**
+     * 获取一条拼团数据
+     * @param int $id
+     * @param string $field
+     * @return array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function validProduct(int $id, string $field)
+    {
+        $where = ['is_show' => 1, 'is_del' => 0, 'pinkIngTime' => true];
+        return $this->search($where)->where('id', $id)->with(['total'])->field($field)->order('add_time desc')->find();
+    }
+
+    /**
+     * 获取推荐拼团
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getCombinationHost()
+    {
+        $where = ['is_del' => 0, 'is_host' => 1, 'is_show' => 1, 'pinkIngTime' => true];
+        return $this->search($where)->with(['total'])->order('id desc')->select()->toArray();
+    }
+}

pro_v3.5.1_副本/app/dao/activity/combination/StorePinkDao.php

@@ -0,0 +1,203 @@
+<?php
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+declare (strict_types=1);
+
+namespace app\dao\activity\combination;
+
+use app\dao\BaseDao;
+use app\model\activity\combination\StorePink;
+
+/**
+ * 拼团
+ * Class StorePinkDao
+ * @package app\dao\activity\combination
+ */
+class StorePinkDao extends BaseDao
+{
+
+    /**
+     * 设置模型
+     * @return string
+     */
+    protected function setModel(): string
+    {
+        return StorePink::class;
+    }
+
+    /**
+     * 获取拼团数量集合
+     * @param array $where
+     * @return array
+     */
+    public function getPinkCount(array $where = [])
+    {
+        return $this->getModel()->where($where)->group('cid')->column('count(*)', 'cid');
+    }
+
+    /**
+     * 获取列表
+     * @param array $where
+     * @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 getList(array $where, int $page = 0, int $limit = 0)
+    {
+        return $this->search($where)->when($where['k_id'] != 0, function ($query) use ($where) {
+            $query->whereOr('id', $where['k_id']);
+        })->with(['getProduct', 'getUser'])->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->order('add_time desc')->select()->toArray();
+    }
+
+    /**
+     * 获取正在拼团中的人,取最早写入的一条
+     * @param array $where
+     * @return array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getPinking(array $where)
+    {
+        return $this->search($where)->order('add_time asc')->find();
+    }
+
+    /**
+     * 获取拼团列表
+     * @param array $where
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function pinkList(array $where)
+    {
+        return $this->search($where)
+            ->where('stop_time', '>', time())
+            ->order('add_time desc')
+            ->select()->toArray();
+    }
+
+    /**
+     * 获取正在拼团的人数
+     * @param int $kid
+     * @return int
+     */
+    public function getPinkPeople(int $kid)
+    {
+        return $this->count(['k_id' => $kid, 'is_refund' => 0]) + 1;
+    }
+
+    /**
+     * 获取正在拼团的人数
+     * @param array $kids
+     * @return int
+     */
+    public function getPinkPeopleCount(array $kids)
+    {
+        $count = $this->getModel()->whereIn('k_id', $kids)->where('is_refund', 0)->group('k_id')->column('COUNT(id) as count', 'k_id');
+        $counts = [];
+        foreach ($kids as &$item) {
+            if (isset($count[$item])) {
+                $counts[$item] = $count[$item] + 1;
+            } else {
+                $counts[$item] = 1;
+            }
+        }
+        return $counts;
+    }
+
+    /**
+     * 获取拼团成功的列表
+     * @param int $uid
+     * @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 successList(int $uid, string $field = '*', int $page = 0, int $limit = 0)
+    {
+        return $this->search(['status' => 2, 'is_refund' => 0])->field($field)
+            ->where('uid', '>', 0)
+            ->when($page && $limit, function ($query) use ($page, $limit) {
+                $query->page($page, $limit);
+            })->when(!$page && $limit, function ($query) use ($limit) {
+                $query->limit($limit);
+            })->order('id desc')->select()->toArray();
+    }
+
+
+    /**
+     * 获取拼团完成的个数
+     * @return float
+     */
+    public function getPinkOkSumTotalNum()
+    {
+        return $this->sum(['status' => 2, 'is_refund' => 0], 'total_num');
+    }
+
+    /**
+     * 是否能继续拼团
+     * @param int $id
+     * @param int $uid
+     * @return int
+     */
+    public function isPink(int $id, int $uid)
+    {
+        return $this->getModel()->where('k_id|id', $id)->where('uid', $uid)->where('is_refund', 0)->count();
+    }
+
+    /**
+     * 获取一条拼团信息
+     * @param int $id
+     * @return array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getPinkUserOne(int $id)
+    {
+        return $this->search()->with('getProduct')->find($id);
+    }
+
+    /**
+     * 获取拼团信息
+     * @param array $where
+     * @return array|\think\Model|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getPinkUserList(array $where)
+    {
+        return $this->getModel()->where($where)->with('getProduct')->select()->toArray();
+    }
+
+    /**
+     * 获取拼团结束的列表
+     * @return \crmeb\basic\BaseModel
+     */
+    public function pinkListEnd()
+    {
+        return $this->getModel()->where('stop_time', '<=', time())
+            ->where('status', 1)
+            ->where('k_id', 0)
+            ->where('is_refund', 0)
+            ->field('id,people,k_id,order_id_key,uid,stop_time');
+    }
+}