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:
144
pro_v3.5.1_副本/app/dao/system/config/SystemConfigDao.php
Normal file
144
pro_v3.5.1_副本/app/dao/system/config/SystemConfigDao.php
Normal file
@@ -0,0 +1,144 @@
|
||||
<?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\system\config;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\system\config\SystemConfig;
|
||||
|
||||
/**
|
||||
* 系统配置
|
||||
* Class SystemConfigDao
|
||||
* @package app\dao\system\config
|
||||
*/
|
||||
class SystemConfigDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemConfig::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个系统配置
|
||||
* @param string $configNmae
|
||||
* @param int $storeId
|
||||
* @return mixed
|
||||
*/
|
||||
public function getConfigValue(string $configNmae, int $storeId = 0)
|
||||
{
|
||||
return $this->search(['menu_name' => $configNmae, 'store_id' => $storeId])->value('value');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有配置
|
||||
* @param array $configName
|
||||
* @param int $storeId
|
||||
* @return array
|
||||
*/
|
||||
public function getConfigAll(array $configName = [], int $storeId = 0)
|
||||
{
|
||||
if ($configName) {
|
||||
return $this->search(['menu_name' => $configName, 'store_id' => $storeId])->column('value', 'menu_name');
|
||||
} else {
|
||||
return $this->getModel()->column('value', 'menu_name');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @param array $configName
|
||||
* @param int $storeId
|
||||
* @param array $field
|
||||
* @return array
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function getConfigAllField(array $configName = [], int $storeId = 0, array $field = [])
|
||||
{
|
||||
return $this->search(['menu_name' => $configName, 'store_id' => $storeId])->column(implode(',', $field), 'menu_name');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配置列表分页
|
||||
* @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 getConfigList(array $where, int $page, int $limit)
|
||||
{
|
||||
return $this->search($where)->page($page, $limit)->order('sort desc,id desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某些分类配置下的配置列表
|
||||
* @param int $tabId
|
||||
* @param int $status
|
||||
* @param int $store_id
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getConfigTabAllList(int $tabId, int $status = 1, int $type = 1, int $relation_id = 0)
|
||||
{
|
||||
$where['tab_id'] = $tabId;
|
||||
if ($status == 1) $where['status'] = $status;
|
||||
if ($relation_id != 0) $where['is_store'] = 1;
|
||||
return $this->search($where)
|
||||
->when(isset($relation_id) && $relation_id != 0, function ($query) use ($type, $relation_id) {
|
||||
$query->with(['storeConfig' => function ($querys) use ($type, $relation_id) {
|
||||
$querys->where('type', $type)->where('relation_id', $relation_id);
|
||||
}]);
|
||||
})
|
||||
->order('sort desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据条件获取配置
|
||||
* @param array $where
|
||||
* @param int $type
|
||||
* @param int $relation_id
|
||||
* @param array $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getConfigAllListByWhere(array $where, int $type = 1, int $relation_id = 0, array $field = ['*'])
|
||||
{
|
||||
if ($relation_id != 0) $where['is_store'] = 1;
|
||||
return $this->search($where)->field($field)
|
||||
->when(isset($relation_id) && $relation_id != 0, function ($query) use ($type, $relation_id) {
|
||||
$query->with(['storeConfig' => function ($querys) use ($type, $relation_id) {
|
||||
$querys->where('type', $type)->where('relation_id', $relation_id);
|
||||
}]);
|
||||
})
|
||||
->order('sort desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取上传配置中的上传类型
|
||||
* @param string $configName
|
||||
* @return array
|
||||
*/
|
||||
public function getUploadTypeList(string $configName)
|
||||
{
|
||||
return $this->search(['menu_name' => $configName])->column('upload_type', 'type');
|
||||
}
|
||||
}
|
||||
66
pro_v3.5.1_副本/app/dao/system/config/SystemConfigTabDao.php
Normal file
66
pro_v3.5.1_副本/app/dao/system/config/SystemConfigTabDao.php
Normal file
@@ -0,0 +1,66 @@
|
||||
<?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\system\config;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\system\config\SystemConfigTab;
|
||||
|
||||
/**
|
||||
* 配置分类
|
||||
* Class SystemConfigTabDao
|
||||
* @package app\dao\system\config
|
||||
*/
|
||||
class SystemConfigTabDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemConfigTab::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配置分类
|
||||
* @param array $searchWhere
|
||||
* @param array $field
|
||||
* @param array $where
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getConfigTabAll(array $searchWhere, array $field = ['*'], array $where = [])
|
||||
{
|
||||
return $this->search($searchWhere)->when(count($where), function ($query) use ($where) {
|
||||
$query->where($where);
|
||||
})->field($field)->order('sort desc,id asc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置分类列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return \think\Collection
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getConfgTabList(array $where, int $page, int $limit)
|
||||
{
|
||||
return $this->search($where)->order('sort desc,id asc')->page($page, $limit)->select();
|
||||
}
|
||||
|
||||
}
|
||||
58
pro_v3.5.1_副本/app/dao/system/config/SystemGroupDao.php
Normal file
58
pro_v3.5.1_副本/app/dao/system/config/SystemGroupDao.php
Normal file
@@ -0,0 +1,58 @@
|
||||
<?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\system\config;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\system\config\SystemGroup;
|
||||
|
||||
/**
|
||||
* Class SystemGroupDao
|
||||
* @package app\dao\system\config
|
||||
*/
|
||||
class SystemGroupDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemGroup::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组合数据分页列表
|
||||
* @param array $where
|
||||
* @param array $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 getGroupList(array $where, array $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);
|
||||
})->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据配置名称获取配置id
|
||||
* @param string $configName
|
||||
* @return mixed
|
||||
*/
|
||||
public function getConfigNameId(string $configName)
|
||||
{
|
||||
return $this->value(['config_name' => $configName]);
|
||||
}
|
||||
}
|
||||
99
pro_v3.5.1_副本/app/dao/system/config/SystemGroupDataDao.php
Normal file
99
pro_v3.5.1_副本/app/dao/system/config/SystemGroupDataDao.php
Normal file
@@ -0,0 +1,99 @@
|
||||
<?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\system\config;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\system\config\SystemGroupData;
|
||||
|
||||
/**
|
||||
* 组合数据
|
||||
* Class SystemGroupDataDao
|
||||
* @package app\dao\system\config
|
||||
*/
|
||||
class SystemGroupDataDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemGroupData::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组合数据列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getGroupDataList(array $where, int $page, int $limit)
|
||||
{
|
||||
return $this->search($where)->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->order('sort desc,id DESC')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个gid下的组合数据
|
||||
* @param int $gid
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getGroupDate(int $gid, int $limit = 0)
|
||||
{
|
||||
return $this->search(['gid' => $gid, 'status' => 1])->when($limit, function ($query) use ($limit) {
|
||||
$query->limit($limit);
|
||||
})->field('value,id')->order('sort DESC,id DESC')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据gid删除组合数据
|
||||
* @param int $gid
|
||||
* @return bool
|
||||
*/
|
||||
public function delGroupDate(int $gid)
|
||||
{
|
||||
return $this->getModel()->where('gid', $gid)->delete();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量保存
|
||||
* @param array $data
|
||||
* @return mixed|\think\Collection
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function saveAll(array $data)
|
||||
{
|
||||
return $this->getModel()->saveAll($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据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 idByGroupList(array $ids, string $field)
|
||||
{
|
||||
return $this->getModel()->whereIn('id', $ids)->field($field)->select()->toArray();
|
||||
}
|
||||
}
|
||||
78
pro_v3.5.1_副本/app/dao/system/config/SystemStorageDao.php
Normal file
78
pro_v3.5.1_副本/app/dao/system/config/SystemStorageDao.php
Normal 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>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\system\config;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\system\config\SystemStorage;
|
||||
use crmeb\basic\BaseModel;
|
||||
use crmeb\traits\SearchDaoTrait;
|
||||
|
||||
/**
|
||||
* Class SystemStorageDao
|
||||
* @package app\dao\system\config
|
||||
*/
|
||||
class SystemStorageDao extends BaseDao
|
||||
{
|
||||
|
||||
use SearchDaoTrait;
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemStorage::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取分页列表
|
||||
* @param array $where
|
||||
* @param array $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 getStorageList(array $where, array $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('add_time desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $where
|
||||
* @return int
|
||||
*/
|
||||
public function getCount(array $where): int
|
||||
{
|
||||
return $this->search($where)->count();
|
||||
}
|
||||
|
||||
/**
|
||||
* @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['type']), function ($query) use ($where) {
|
||||
$query->where('type', $where['type']);
|
||||
})->where('is_delete', 0)->when(isset($where['access_key']), function ($query) use ($where) {
|
||||
$query->where('access_key', $where['access_key']);
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user