434aa8c69d
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
114 lines
3.8 KiB
PHP
114 lines
3.8 KiB
PHP
<?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\user;
|
||
|
||
use app\dao\BaseDao;
|
||
use app\model\user\User;use app\model\user\UserAddress;
|
||
|
||
/**
|
||
* 用户收获地址
|
||
* Class UserAddressDao
|
||
* @package app\dao\user
|
||
*/
|
||
class UserAddressDao extends BaseDao
|
||
{
|
||
|
||
/**
|
||
* 设置模型
|
||
* @return string
|
||
*/
|
||
protected function setModel(): string
|
||
{
|
||
return UserAddress::class;
|
||
}
|
||
|
||
/**
|
||
* 设置关联模型
|
||
* @return string
|
||
*/
|
||
protected function JoinModel() : string
|
||
{
|
||
return User::class;
|
||
}
|
||
|
||
/**
|
||
* 获取关联模型查询
|
||
* @param string $alias 主表别名
|
||
* @param string $join_alias 关联表别名
|
||
* @param string $join 关联类型
|
||
* @return \crmeb\basic\BaseModel
|
||
*/
|
||
public function getJoinModel(string $alias = 'a', string $join_alias = 'u', $join = 'left')
|
||
{
|
||
$this->alias = $alias;
|
||
$this->joinAlis = $join_alias;
|
||
/** @var User $user */
|
||
$user = app()->make($this->joinModel());
|
||
$table = $user->getName();
|
||
return parent::getModel()->alias($alias)->join($table . ' ' . $join_alias, $alias . '.uid = ' . $join_alias . '.uid', $join);
|
||
}
|
||
|
||
/**
|
||
* 获取列表
|
||
* @param array $where
|
||
* @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 getList(array $where, string $field = '*', int $page = 0, int $limit = 0): array
|
||
{
|
||
return $this->search($where)->field($field)->page($page, $limit)->order('is_default DESC')->select()->toArray();
|
||
}
|
||
|
||
/**
|
||
* 地域全部用户
|
||
* @param $time
|
||
* @param $userType
|
||
* @return mixed
|
||
*/
|
||
public function getRegionAll($time, $userType)
|
||
{
|
||
return $this->getJoinModel()->when($userType != '', function ($query) use ($userType) {
|
||
$query->where($this->joinAlis . '.user_type', $userType);
|
||
})->where(function ($query) use ($time) {
|
||
$query->whereTime($this->joinAlis . '.add_time', '<', strtotime($time[1]) + 86400)->whereOr($this->joinAlis . '.add_time', NULL);
|
||
})->field('count(distinct(' . $this->alias . '.uid)) as allNum,' . $this->alias . '.province')
|
||
->group($this->alias . '.province')->select()->toArray();
|
||
}
|
||
|
||
/**
|
||
* 地域新增用户
|
||
* @param $time
|
||
* @param $userType
|
||
* @return mixed
|
||
*/
|
||
public function getRegionNew($time, $userType)
|
||
{
|
||
return $this->getJoinModel()->when($userType != '', function ($query) use ($userType) {
|
||
$query->where($this->joinAlis . '.user_type', $userType);
|
||
})->where(function ($query) use ($time) {
|
||
if ($time[0] == $time[1]) {
|
||
$query->whereDay($this->joinAlis . '.add_time', $time[0]);
|
||
} else {
|
||
$time[1] = date('Y-m-d', strtotime($time[1]) + 86400);
|
||
$query->whereTime($this->joinAlis . '.add_time', 'between', $time);
|
||
}
|
||
})->field('count(distinct(' . $this->alias . '.uid)) as newNum,' . $this->alias . '.province')
|
||
->group($this->alias . '.province')->select()->toArray();
|
||
}
|
||
|
||
}
|