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
2026-03-23 22:32:19 +08:00
parent 788ee0c0c0
commit 434aa8c69d
13098 changed files with 2008990 additions and 961 deletions

View File

@@ -0,0 +1,48 @@
<?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\wechat;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatCard;
/**
* 微信卡券
* Class WechatCardDao
* @package app\dao\wechat
*/
class WechatCardDao extends BaseDao
{
protected function setModel(): string
{
return WechatCard::class;
}
/**
* 获取卡券列表
* @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($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->select()->toArray();
}
}

View File

@@ -0,0 +1,46 @@
<?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\wechat;
use crmeb\basic\BaseModel;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatKey;
/**
*
* Class UserWechatUserDao
* @package app\dao\user
*/
class WechatKeyDao extends BaseDao
{
protected function setModel(): string
{
return WechatKey::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['id']), function ($query) use ($where) {
$query->where('id', $where['id']);
});
}
}

View File

@@ -0,0 +1,33 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\dao\wechat;
use app\dao\BaseDao;
use app\model\wechat\WechatMedia;
/**
* 微信媒体
* Class WechatMediaDao
* @package app\dao\wechat
*/
class WechatMediaDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return WechatMedia::class;
}
}

View File

@@ -0,0 +1,31 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\dao\wechat;
use app\dao\BaseDao;
use app\model\other\Cache;
/**
* Class WechatMenuDao
* @package app\dao\wechat
*/
class WechatMenuDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
public function setModel(): string
{
return Cache::class;
}
}

View File

@@ -0,0 +1,31 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\dao\wechat;
use app\dao\BaseDao;
use app\model\wechat\WechatMessage;
/**
* Class WechatMessageDao
* @package app\dao\wechat
*/
class WechatMessageDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatMessage::class;
}
}

View File

@@ -0,0 +1,45 @@
<?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\wechat;
use app\dao\BaseDao;
use app\model\wechat\WechatNewsCategory;
/**
*
* Class UserWechatUserDao
* @package app\dao\user
*/
class WechatNewsCategoryDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatNewsCategory::class;
}
/**新闻分类 $model
* @param array $where
* @return \crmeb\basic\BaseModel
*/
public function getNewCtae(array $where)
{
return parent::getModel()->when(isset($where['cate_name']), function ($query) use ($where) {
$query->where('cate_name', 'LIKE', "%$where[cate_name]%");
})->where('status', 1)->order('add_time desc');
}
}

View File

@@ -0,0 +1,45 @@
<?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\wechat;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatQrcodeCate;
/**
*
* Class WechatQrcodeCateDao
* @package app\dao\wechat
*/
class WechatQrcodeCateDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatQrcodeCate::class;
}
/**
* 渠道码分类列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getCateList($where)
{
return $this->search($where)->select()->toArray();
}
}

View File

@@ -0,0 +1,65 @@
<?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\wechat;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatQrcode;
/**
*
* Class WechatQrcodeDao
* @package app\dao\wechat
*/
class WechatQrcodeDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatQrcode::class;
}
/**
* 获取列表
* @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(['user', 'record' => function ($query) {
$query->where('is_follow', 1)->whereDay('add_time', 'yesterday')->field('qid,count(distinct uid) as number');
}])->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->order('id desc')->select()->toArray();
}
/**
* 更新次数
* @param $id
* @param $isFollow
*/
public function upFollowAndScan($id, $isFollow)
{
$this->getModel()->where('id', $id)->inc('scan')->when($isFollow, function ($query) {
$query->inc('follow');
})->update();
}
}

View File

@@ -0,0 +1,78 @@
<?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\wechat;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatQrcodeRecord;
/**
*
* Class WechatQrcodeRecordDao
* @package app\dao\wechat
*/
class WechatQrcodeRecordDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatQrcodeRecord::class;
}
/**
* 获取列表
* @param $where
* @param int $page
* @param int $limit
* @param int $is_distinct
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getList($where, $page = 0, $limit = 0, $is_distinct = 0)
{
return $this->search($where)->with(['user'])->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->when($is_distinct, function ($query) {
$query->distinct(true)->field('uid');
})->order('id desc')->select()->toArray();
}
/**
* 扫码趋势
* @param $qid
* @param $time
* @param $timeType
* @param $field
* @param $str
* @return mixed
*/
public function getRecordTrend($qid, $time, $timeType, $field, $str, $orderStatus = '')
{
return $this->getModel()->where(function ($query) use ($field, $orderStatus) {
if ($orderStatus == 'yes') {
$query->where('is_follow', 1);
}
})->where(function ($query) use ($time, $field) {
if ($time[0] == $time[1]) {
$query->whereDay($field, $time[0]);
} else {
$query->whereTime($field, 'between', $time);
}
})->where('qid', $qid)->field("FROM_UNIXTIME($field,'$timeType') as days,$str as num")->group('days')->select()->toArray();
}
}

View File

@@ -0,0 +1,55 @@
<?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\wechat;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatReply;
/**
*
* Class UserWechatUserDao
* @package app\dao\user
*/
class WechatReplyDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatReply::class;
}
/**
* 获取关键字
* @param $key
* @return array|Model|null
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getKey($key)
{
$res = $this->getModel()->whereIn('id', function ($query) use ($key) {
$query->name('wechat_key')->where('keys', $key)->field(['reply_id'])->select();
})->where('status', '1')->find();
if (empty($res)) {
$res = $this->getModel()->whereIn('id', function ($query) use ($key) {
$query->name('wechat_key')->where('keys', 'default')->field(['reply_id'])->select();
})->where('status', '1')->find();
}
return $res;
}
}

View File

@@ -0,0 +1,114 @@
<?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\wechat;
use crmeb\basic\BaseModel;
use think\model;
use app\dao\BaseDao;
use app\model\wechat\WechatReply;
use app\model\wechat\WechatKey;
/**
*
* Class UserWechatUserDao
* @package app\dao\user
*/
class WechatReplyKeyDao extends BaseDao
{
/**
* 主表别名
* @var string
*/
protected string $alias = 'r';
/**
* 附表别名
* @var string
*/
protected string $joinAlis = 'k';
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return WechatReply::class;
}
/**
* 设置join连表模型
* @return string
*/
protected function setJoinModel(): string
{
return WechatKey::class;
}
/**
* 关联模型
* @param string $key
* @param string $join
* @return BaseModel
*/
protected function getModel(string $key = 'id', string $join = 'LEFT')
{
/** @var WechatKey $keys */
$keys = app()->make($this->setJoinModel());
$name = $keys->getName();
return parent::getModel()->join($name . ' ' . $this->joinAlis, $this->alias . '.' . $key . ' = ' . $this->joinAlis . '.reply_id', $join)->alias($this->alias);
}
/**
* 获取所有关键字
* @param array $where
* @param bool $search
* @return BaseModel
*/
public function search(array $where = [],bool $search = false)
{
return $this->getModel()->when(isset($where['key']) && $where['key'], function ($query) use ($where) {
$query->where($this->joinAlis . '.keys', 'LIKE', "%$where[key]%");
})->when(isset($where['type']) && $where['type'], function ($query) use ($where) {
$query->where($this->alias . '.type', $where['type']);
})->where($this->joinAlis . '.keys', '<>', 'subscribe')
->where($this->joinAlis . '.keys', '<>', 'default');
}
/**
* 获取关键字回复列表
* @param array $where
* @param bool $group
* @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 getReplyKeyList(array $where, int $page, int $limit)
{
return $this->search($where)->page($page, $limit)->group($this->alias . '.id')->field($this->alias . '.*,' . $this->joinAlis . '.keys')->select()->toArray();
}
/**
* 获取条件下的条数
* @param array $where
* @param string $field
* @return int
*/
public function count(array $where = [], string $field = '*'): int
{
return $this->search($where)->group($this->alias . '.id')->count($field);
}
}

View File

@@ -0,0 +1,85 @@
<?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\wechat;
use app\dao\BaseDao;
use app\model\wechat\WechatUser;
/**
*
* Class UserWechatUserDao
* @package app\dao\user
*/
class WechatUserDao extends BaseDao
{
/**
* @return string
*/
protected function setModel(): string
{
return WechatUser::class;
}
/**
* 获取wechat_user表数据
* @param array $where
* @param string $field
* @param string $order
* @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, string $field = '*', string $order = 'id desc', int $page = 0, int $limit = 0)
{
return $this->getModel()->where($where)->field($field)->order($order)->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->select()->toArray();
}
/**
* 获取微信用户统计数据
* @param $time
* @param $where
* @param $timeType
* @param $key
* @return mixed
*/
public function getWechatTrendData($time, $where, $timeType, $key)
{
return $this->getModel()->where('user_type', 'wechat')
->where($where)
->where(function ($query) use ($time) {
if ($time[0] == $time[1]) {
$query->whereDay('add_time', $time[0]);
} else {
$time[1] = date('Y-m-d', strtotime($time[1]) + 86400);
$query->whereTime('add_time', 'between', $time);
}
})->field("FROM_UNIXTIME(add_time,'$timeType') as days,count(uid) as $key")
->group('days')->select()->toArray();
}
/**
* 获取公众号或者小程序的openid
* @param int $uid
* @param string $userType
* @return mixed
*/
public function getWechatOpenid(int $uid, string $userType = 'wechat')
{
return $this->getModel()->where('uid', $uid)->where('user_type', $userType)->value('openid');
}
}