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
120 lines
4.1 KiB
PHP
120 lines
4.1 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\other;
|
||
|
||
|
||
use app\dao\BaseDao;
|
||
use app\model\other\CityArea;
|
||
|
||
/**
|
||
* Class CityAreaDao
|
||
* @package app\dao\other
|
||
*/
|
||
class CityAreaDao extends BaseDao
|
||
{
|
||
|
||
/**
|
||
* @return string
|
||
*/
|
||
protected function setModel(): string
|
||
{
|
||
return CityArea::class;
|
||
}
|
||
|
||
/**
|
||
* @param array $where
|
||
* @param bool $search
|
||
* @return \crmeb\basic\BaseModel
|
||
* @throws \ReflectionException
|
||
* @author 等风来
|
||
* @email 136327134@qq.com
|
||
* @date 2023/10/7
|
||
*/
|
||
public function search(array $where = [], bool $search = false)
|
||
{
|
||
return parent::search($where, $search)->when(isset($where['pid']) && $where['pid'] !== '', function ($query) use ($where) {
|
||
$query->where('parent_id', $where['pid']);
|
||
})->when(isset($where['address']) && $where['address'] !== '', function ($query) use ($where) {
|
||
$address = explode('/', trim($where['address'], '/'));
|
||
if (isset($address[0]) && isset($address[1]) && $address[0] == $address[1]) {//直辖市：北京市北京市朝阳区
|
||
array_shift($address);
|
||
}
|
||
$p = array_shift($address);
|
||
// if (mb_strlen($p) - 1 === mb_strpos($p, '市')) {
|
||
// $p = mb_substr($p, 0, -1);
|
||
// } elseif (mb_strlen($p) - 1 === mb_strpos($p, '省')) {
|
||
// $p = mb_substr($p, 0, -1);
|
||
// } elseif (mb_strlen($p) - 3 === mb_strpos($p, '自治区')) {
|
||
// $p = mb_substr($p, 0, -3);
|
||
// $p = str_replace(['壮族', '回族', '维吾尔'], '', $p);
|
||
// }
|
||
$pcity = $this->getModel()->where('name', $p)->value('id');
|
||
$path = ['', $pcity];
|
||
$street = $p;
|
||
$i = 0;
|
||
foreach ($address as $item) {
|
||
//县级市，只有三级地址；市和县相同
|
||
if ($item == ($address[$i - 1] ?? '')) continue;
|
||
$pcity = $this->getModel()->whereLike('path', implode('/', $path) . '/%')->where('name', $item)->value('id');
|
||
if (!$pcity) {
|
||
break;
|
||
}
|
||
$path[] = $pcity;
|
||
$street = $item;
|
||
$i++;
|
||
}
|
||
array_pop($path);
|
||
$query->whereLike('path', implode('/', $path) . '/%')->where('name', $street);
|
||
});
|
||
|
||
}
|
||
|
||
/**
|
||
* 搜索某个地址
|
||
* @param array $where
|
||
* @return array|\think\Model|null
|
||
* @throws \think\db\exception\DataNotFoundException
|
||
* @throws \think\db\exception\DbException
|
||
* @throws \think\db\exception\ModelNotFoundException
|
||
*/
|
||
public function searchCity(array $where)
|
||
{
|
||
return $this->search($where)->order('id DESC')->find();
|
||
}
|
||
|
||
/**
|
||
* 获取地址
|
||
* @param array $where
|
||
* @param string $field
|
||
* @param array $with
|
||
* @return array
|
||
* @throws \think\db\exception\DataNotFoundException
|
||
* @throws \think\db\exception\DbException
|
||
* @throws \think\db\exception\ModelNotFoundException
|
||
*/
|
||
public function getCityList(array $where, string $field = '*', array $with = [])
|
||
{
|
||
return $this->getModel()->where($where)->field($field)->with($with)->order('id asc')->select()->toArray();
|
||
}
|
||
|
||
/**
|
||
* 删除上级城市和当前城市id
|
||
* @param int $cityId
|
||
* @return bool
|
||
* @throws \Exception
|
||
*/
|
||
public function deleteCity(int $cityId)
|
||
{
|
||
return $this->getModel()->where('id', $cityId)->whereOr('parent_id', $cityId)->delete();
|
||
}
|
||
}
|