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:
54
pro_v3.5.1_副本/app/dao/agent/AgentLevelDao.php
Normal file
54
pro_v3.5.1_副本/app/dao/agent/AgentLevelDao.php
Normal file
@@ -0,0 +1,54 @@
|
||||
<?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\agent;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\agent\AgentLevel;
|
||||
|
||||
/**
|
||||
* Class AgentLevelDao
|
||||
* @package app\dao\agent
|
||||
*/
|
||||
class AgentLevelDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return AgentLevel::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有的分销员等级
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param array $with
|
||||
* @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 = '*', array $with = [], int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)->field($field)->when($with, function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->order('grade asc,id desc')->select()->toArray();
|
||||
}
|
||||
}
|
||||
68
pro_v3.5.1_副本/app/dao/agent/AgentLevelTaskDao.php
Normal file
68
pro_v3.5.1_副本/app/dao/agent/AgentLevelTaskDao.php
Normal file
@@ -0,0 +1,68 @@
|
||||
<?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\agent;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\agent\AgentLevelTask;
|
||||
|
||||
/**
|
||||
* Class AgentLevelTaskDao
|
||||
* @package app\dao\agent
|
||||
*/
|
||||
class AgentLevelTaskDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return AgentLevelTask::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取等级任务
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param array $with
|
||||
* @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 getTaskList(array $where, string $field = '*', array $with = [], int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)->when($with, function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->field($field)->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->order('sort desc,id desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获得所有同类型任务
|
||||
* @param int $type
|
||||
* @param int $grade
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getTypTaskList(int $type)
|
||||
{
|
||||
return $this->getModel()->with(['levelGrade'])->where('type', $type)->where('is_del', 0)->where('status', 1)->order('number desc')->select()->toArray();
|
||||
}
|
||||
}
|
||||
47
pro_v3.5.1_副本/app/dao/agent/AgentLevelTaskRecordDao.php
Normal file
47
pro_v3.5.1_副本/app/dao/agent/AgentLevelTaskRecordDao.php
Normal file
@@ -0,0 +1,47 @@
|
||||
<?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\agent;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\agent\AgentLevelTaskRecord;
|
||||
|
||||
/**
|
||||
* Class AgentLevelTaskRecordDao
|
||||
* @package app\dao\agent
|
||||
*/
|
||||
class AgentLevelTaskRecordDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return AgentLevelTaskRecord::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有的分销员等级
|
||||
* @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 getList(array $where = [], string $field = '*')
|
||||
{
|
||||
return $this->search($where + ['is_del' => 0, 'status' => 1])->field($field)->order('sort desc,id desc')->select()->toArray();
|
||||
}
|
||||
}
|
||||
72
pro_v3.5.1_副本/app/dao/agent/DivisionApplyDao.php
Normal file
72
pro_v3.5.1_副本/app/dao/agent/DivisionApplyDao.php
Normal file
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
|
||||
namespace app\dao\agent;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\agent\DivisionApply;
|
||||
|
||||
class DivisionApplyDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return DivisionApply::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 条件查询
|
||||
* @param $where
|
||||
* @return \crmeb\basic\BaseModel
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function getConditionModel($where)
|
||||
{
|
||||
return $this->getModel()->where('is_del', 0)
|
||||
->when($where['division_id'] != 0, function ($query) use ($where) {
|
||||
$query->where('division_id', $where['division_id']);
|
||||
})->when($where['status'] !== '' && $where['status'] !== 'all', function ($query) use ($where) {
|
||||
$query->where('status', $where['status']);
|
||||
})->when($where['keyword'] !== '', function ($query) use ($where) {
|
||||
$query->whereLike('uid|agent_name|name|phone', $where['keyword']);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取申请列表
|
||||
* @param $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function applyList($where, $page = 0, $limit = 0)
|
||||
{
|
||||
return $this->getConditionModel($where)->order('id desc')->when($page != 0, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取申请数量
|
||||
* @param $where
|
||||
* @return int
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function applyCount($where)
|
||||
{
|
||||
return $this->getConditionModel($where)->count();
|
||||
}
|
||||
}
|
||||
72
pro_v3.5.1_副本/app/dao/agent/PromoterApplyDao.php
Normal file
72
pro_v3.5.1_副本/app/dao/agent/PromoterApplyDao.php
Normal file
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
|
||||
namespace app\dao\agent;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\agent\PromoterApply;
|
||||
|
||||
class PromoterApplyDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* @return string
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/30
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return PromoterApply::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 条件查询
|
||||
* @param $where
|
||||
* @return \crmeb\basic\BaseModel
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function getConditionModel($where)
|
||||
{
|
||||
return $this->getModel()->where('is_del', 0)
|
||||
->when($where['status'] !== '' && $where['status'] !== 'all', function ($query) use ($where) {
|
||||
$query->where('status', $where['status']);
|
||||
})->when($where['keyword'] !== '', function ($query) use ($where) {
|
||||
$query->whereLike('uid|nickname|real_name|phone', $where['keyword']);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取申请列表
|
||||
* @param $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function applyList($where, $page = 0, $limit = 0)
|
||||
{
|
||||
return $this->getConditionModel($where)->order('id desc')->when($page != 0, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取申请数量
|
||||
* @param $where
|
||||
* @return int
|
||||
* @throws \think\db\exception\DbException
|
||||
* @author wuhaotian
|
||||
* @email 442384644@qq.com
|
||||
* @date 2024/8/21
|
||||
*/
|
||||
public function applyCount($where)
|
||||
{
|
||||
return $this->getConditionModel($where)->count();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user