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:
178
pro_v3.5.1_副本/app/dao/user/UserBrokerageDao.php
Normal file
178
pro_v3.5.1_副本/app/dao/user/UserBrokerageDao.php
Normal file
@@ -0,0 +1,178 @@
|
||||
<?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\user;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\user\UserBrokerage;
|
||||
use think\db\exception\DbException;
|
||||
|
||||
/**
|
||||
* 用户佣金
|
||||
* Class UserBrokerageDao
|
||||
* @package app\dao\user
|
||||
*/
|
||||
class UserBrokerageDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return UserBrokerage::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取列表
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @param array $typeWhere
|
||||
* @param array $with
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getList(array $where, string $field = '*', int $page = 0, int $limit = 0, array $typeWhere = [], array $with = [])
|
||||
{
|
||||
return $this->search($where)->when(count($typeWhere) > 0, function ($query) use ($typeWhere) {
|
||||
$query->where($typeWhere);
|
||||
})->field($field)->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->when(!empty($with), function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->order('id desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取佣金排行
|
||||
* @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 brokerageRankList(array $where, int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)
|
||||
->field("
|
||||
uid,
|
||||
SUM(
|
||||
CASE
|
||||
WHEN type NOT IN ('refund', 'extract_fail') AND pm = 1 THEN number
|
||||
WHEN type = 'refund' THEN -number
|
||||
END
|
||||
) AS brokerage_price
|
||||
")
|
||||
->with(['user' => function ($query) {
|
||||
$query->field('uid, avatar, nickname');
|
||||
}])
|
||||
->order('brokerage_price DESC')
|
||||
->group('uid')
|
||||
->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $where
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getUserBrokerageList(array $where)
|
||||
{
|
||||
return $this->search($where)->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取佣金记录类型
|
||||
* @param array $where
|
||||
* @param string $filed
|
||||
* @return mixed
|
||||
*/
|
||||
public function getType(array $where, string $filed = 'title,type')
|
||||
{
|
||||
return $this->search($where)->distinct(true)->field($filed)->group('type')->select();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改收货状态
|
||||
* @param int $uid
|
||||
* @param int $id
|
||||
* @return \crmeb\basic\BaseModel
|
||||
*/
|
||||
public function takeUpdate(int $uid, int $id)
|
||||
{
|
||||
return $this->getModel()->where('uid', $uid)->where('link_id', $id)->where('type', 'IN', ['one_brokerage', 'two_brokerage'])->update(['take' => 1]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个账户下的冻结佣金
|
||||
* @param int $uid
|
||||
* @return float
|
||||
* @throws \ReflectionException
|
||||
*/
|
||||
public function getUserFrozenPrice(int $uid)
|
||||
{
|
||||
return $this->search(['uid' => $uid, 'status' => 1, 'pm' => 1])->where('frozen_time', '>', time())->sum('number');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个条件总数
|
||||
* @param array $where
|
||||
*/
|
||||
public function getBrokerageSum(array $where)
|
||||
{
|
||||
return $this->search($where)->sum('number');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取列表
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getBrokerageList(array $where, string $field = '*', int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)->field($field)->with([
|
||||
'user' => function ($query) {
|
||||
$query->field('uid,nickname');
|
||||
}])->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->order('id desc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某些条件的bill总数
|
||||
* @param array $where
|
||||
* @return mixed
|
||||
*/
|
||||
public function getBrokerageSumColumn(array $where)
|
||||
{
|
||||
if (isset($where['uid']) && is_array($where['uid'])) {
|
||||
return $this->search($where)->group('uid')->column('sum(number) as num', 'uid');
|
||||
} else
|
||||
return $this->search($where)->sum('number');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user