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:
193
pro_v3.5.1_副本/app/dao/user/channel/ChannelMerchantDao.php
Normal file
193
pro_v3.5.1_副本/app/dao/user/channel/ChannelMerchantDao.php
Normal file
@@ -0,0 +1,193 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\dao\user\channel;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\user\channel\ChannelMerchant;
|
||||
|
||||
/**
|
||||
* 采购商DAO
|
||||
* Class ChannelMerchantDao
|
||||
* @package app\dao\user\channel
|
||||
*/
|
||||
class ChannelMerchantDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return ChannelMerchant::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取采购商列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getChannelList(array $where, int $page, int $limit)
|
||||
{
|
||||
$where['is_del'] = 0;
|
||||
return $this->search($where)
|
||||
->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
|
||||
if (isset($where['field_key']) && $where['keyword'] !== '') {
|
||||
$query->where($where['field_key'], 'like', '%' . $where['keyword'] . '%');
|
||||
} else {
|
||||
$query->where('channel_name|real_name|phone|uid', 'like', '%' . $where['keyword'] . '%');
|
||||
}
|
||||
})->when(isset($where['verify_status']) && $where['verify_status'] !== '', function ($query) use ($where) {
|
||||
$query->where('verify_status', $where['verify_status']);
|
||||
})->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
|
||||
getModelTime($query, $where['date'], 'add_time');
|
||||
})->when(isset($where['count']) && $where['count'] !== '', function ($query) use ($where) {
|
||||
$counts = explode('-', $where['count']);
|
||||
if(count($counts) == 1){
|
||||
$query->where('order_count', '>=', $counts[0]);
|
||||
}
|
||||
if (count($counts) == 2 && ($counts[0] !== '' || $counts[1] !== '')) {
|
||||
if ($counts[0] === '') {
|
||||
$query->where('order_count', '<=', $counts[1]);
|
||||
} elseif ($counts[1] === '') {
|
||||
$query->where('order_count', '>=', $counts[0]);
|
||||
} else {
|
||||
$query->whereBetween('order_count', $counts);
|
||||
}
|
||||
}
|
||||
})->when(isset($where['money']) && $where['money'] !== '', function ($query) use ($where) {
|
||||
$moneys = explode('-', $where['money']);
|
||||
if(count($moneys) == 1){
|
||||
$query->where('order_price', '>=', $moneys[0]);
|
||||
}
|
||||
if (count($moneys) == 2 && ($moneys[0] !== '' || $moneys[1] !== '')) {
|
||||
if ($moneys[0] === '') {
|
||||
$query->where('order_price', '<=', $moneys[1]);
|
||||
} elseif ($moneys[1] === '') {
|
||||
$query->where('order_price', '>=', $moneys[0]);
|
||||
} else {
|
||||
$query->whereBetween('order_price', $moneys);
|
||||
}
|
||||
}
|
||||
})->page($page, $limit)->order('id DESC')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取采购商数量
|
||||
* @param array $where
|
||||
* @return int
|
||||
*/
|
||||
public function count(array $where = []): int
|
||||
{
|
||||
$where['is_del'] = 0;
|
||||
return $this->search($where)->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
|
||||
$query->where('channel_name|real_name|phone|uid', 'like', '%' . $where['keyword'] . '%');
|
||||
})->when(isset($where['verify_status']) && $where['verify_status'] !== '', function ($query) use ($where) {
|
||||
$query->where('verify_status', $where['verify_status']);
|
||||
})->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
|
||||
getModelTime($query, $where['date'], 'add_time');
|
||||
})->count();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单个采购商信息
|
||||
* @param int $id
|
||||
* @param string $field
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getInfo(int $id, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->where('id', $id)->where('is_del', 0)->field($field)->find($id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据条件获取采购商信息
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param array $with
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getChannelInfo(array $where, string $field = '*', array $with = [])
|
||||
{
|
||||
return $this->search($where, false)->field($field)->when(!empty($with), function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->find();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据用户ID获取采购商信息
|
||||
* @param int $uid
|
||||
* @param string $field
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getChannelByUid(int $uid, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->where('uid', $uid)->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有采购商
|
||||
* @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 getAllChannel(array $where, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->where($where)->where('verify_status', 1)->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查采购商是否存在
|
||||
* @param int $uid
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*/
|
||||
public function isChannelExist(int $uid, int $id = 0)
|
||||
{
|
||||
return $this->getModel()->where('uid', $uid)->when($id > 0, function ($query) use ($id) {
|
||||
$query->where('id', '<>', $id);
|
||||
})->count() > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查手机号是否已被使用
|
||||
* @param string $phone
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*/
|
||||
public function isPhoneExist(string $phone, int $id = 0)
|
||||
{
|
||||
return $this->getModel()->where('phone', $phone)->when($id > 0, function ($query) use ($id) {
|
||||
$query->where('id', '<>', $id);
|
||||
})->count() > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定地区的采购商
|
||||
* @param string $province
|
||||
* @param string $field
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getChannelByProvince(string $province, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->whereFindInSet('province', $province)->where('verify_status', 1)->select()->toArray();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\dao\user\channel;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\user\channel\ChannelMerchantIdentity;
|
||||
|
||||
/**
|
||||
* 采购商身份DAO
|
||||
* Class ChannelMerchantIdentityDao
|
||||
* @package app\dao\user\channel
|
||||
*/
|
||||
class ChannelMerchantIdentityDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return ChannelMerchantIdentity::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取采购商身份列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
public function getList(array $where, int $page, int $limit)
|
||||
{
|
||||
return $this->search($where,false)
|
||||
->page($page, $limit)
|
||||
->order('id DESC')
|
||||
->select()
|
||||
->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单个采购商身份信息
|
||||
* @param int $id
|
||||
* @param string $field
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getInfo(int $id, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->find($id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据等级获取采购商身份
|
||||
* @param int $level
|
||||
* @param string $field
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getIdentityByLevel(int $level, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->where('level', $level)->where('is_show', 1)->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查等级是否已存在
|
||||
* @param int $level
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*/
|
||||
public function isLevelExist(int $level, int $id = 0)
|
||||
{
|
||||
return $this->getModel()->where('level', $level)
|
||||
->when($id > 0, function ($query) use ($id) {
|
||||
$query->where('id', '<>', $id);
|
||||
})
|
||||
->count() > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查名称是否已存在
|
||||
* @param string $name
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*/
|
||||
public function isNameExist(string $name, int $id = 0)
|
||||
{
|
||||
return $this->getModel()->where('name', $name)
|
||||
->when($id > 0, function ($query) use ($id) {
|
||||
$query->where('id', '<>', $id);
|
||||
})
|
||||
->count() > 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user