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:
119
pro_v3.5.1_副本/app/model/user/member/MemberCard.php
Normal file
119
pro_v3.5.1_副本/app/model/user/member/MemberCard.php
Normal file
@@ -0,0 +1,119 @@
|
||||
<?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\model\user\member;
|
||||
|
||||
|
||||
use crmeb\basic\BaseModel;
|
||||
use crmeb\traits\ModelTrait;
|
||||
use think\Model;
|
||||
|
||||
/**
|
||||
* Class MemberCard
|
||||
* @package app\model\user\member
|
||||
*/
|
||||
class MemberCard extends BaseModel
|
||||
{
|
||||
use ModelTrait;
|
||||
|
||||
/**
|
||||
* 数据表主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 模型名称
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'member_card';
|
||||
|
||||
protected $insert = ['add_time', 'update_time'];
|
||||
|
||||
protected $hidden = ['update_time'];
|
||||
|
||||
protected $updateTime = false;
|
||||
|
||||
/**
|
||||
* 卡号搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchCardNumberAttr($query, $value)
|
||||
{
|
||||
if ($value) {
|
||||
$query->whereLike('card_number', '%' . $value . '%');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户uid搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchUseUidAttr($query, $value)
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$query->whereIn('use_uid', $value);
|
||||
} else {
|
||||
$query->where('use_uid', $value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 手机号搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchPhoneAttr($query, $value)
|
||||
{
|
||||
if ($value) {
|
||||
$query->whereIn('use_uid', function ($query) use ($value) {
|
||||
$query->name('user')->whereLike('phone', $value . '%')->field('uid')->select();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批次id搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchBatchCardIdAttr($query, $value)
|
||||
{
|
||||
$query->where('card_batch_id', $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户use_time搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchUseTimeAttr($query, $value)
|
||||
{
|
||||
if ($value > 0) {
|
||||
$query->where('use_time', '>', 0);
|
||||
}
|
||||
if ($value == 0) {
|
||||
$query->where('use_time', 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function searchIsStatusAttr($query, $value)
|
||||
{
|
||||
if ($value) {
|
||||
$query->where('status', $value);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
66
pro_v3.5.1_副本/app/model/user/member/MemberCardBatch.php
Normal file
66
pro_v3.5.1_副本/app/model/user/member/MemberCardBatch.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\model\user\member;
|
||||
|
||||
|
||||
use crmeb\basic\BaseModel;
|
||||
use crmeb\traits\ModelTrait;
|
||||
|
||||
/**
|
||||
* Class MemberCardBatch
|
||||
* @package app\model\user\member
|
||||
*/
|
||||
class MemberCardBatch extends BaseModel
|
||||
{
|
||||
use ModelTrait;
|
||||
|
||||
/**
|
||||
* 数据表主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 模型名称
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'member_card_batch';
|
||||
|
||||
protected $insert = ['add_time'];
|
||||
|
||||
protected $hidden = ['update_time'];
|
||||
|
||||
protected $updateTime = false;
|
||||
|
||||
/**
|
||||
* 卡批次名称搜索器
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchTitleAttr($query, $value)
|
||||
{
|
||||
if ($value !== '') {
|
||||
$query->where('title', $value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化数据
|
||||
* @param $value
|
||||
* @return array|mixed
|
||||
*/
|
||||
public function getQrcodeAttr($value)
|
||||
{
|
||||
$value = $value ? json_decode($value, true) : [];
|
||||
return is_array($value) ? $value : [];
|
||||
}
|
||||
}
|
||||
61
pro_v3.5.1_副本/app/model/user/member/MemberRight.php
Normal file
61
pro_v3.5.1_副本/app/model/user/member/MemberRight.php
Normal file
@@ -0,0 +1,61 @@
|
||||
<?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\model\user\member;
|
||||
|
||||
|
||||
use crmeb\basic\BaseModel;
|
||||
use crmeb\traits\ModelTrait;
|
||||
|
||||
/**
|
||||
* Class MemberRight
|
||||
* @package app\model\user\member
|
||||
*/
|
||||
class MemberRight extends BaseModel
|
||||
{
|
||||
use ModelTrait;
|
||||
|
||||
/**
|
||||
* 数据表主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 模型名称
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'member_right';
|
||||
|
||||
/**
|
||||
* 状态搜索器
|
||||
* @param $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchStatusAttr($query, $value)
|
||||
{
|
||||
if ($value) {
|
||||
$query->where('status', $value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态搜索器
|
||||
* @param $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchRightTypeAttr($query, $value)
|
||||
{
|
||||
if ($value) {
|
||||
$query->where('right_type', $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
47
pro_v3.5.1_副本/app/model/user/member/MemberShip.php
Normal file
47
pro_v3.5.1_副本/app/model/user/member/MemberShip.php
Normal file
@@ -0,0 +1,47 @@
|
||||
<?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\model\user\member;
|
||||
|
||||
|
||||
use crmeb\basic\BaseModel;
|
||||
use crmeb\traits\ModelTrait;
|
||||
use think\Model;
|
||||
|
||||
/**
|
||||
* Class MemberShip
|
||||
* @package app\model\user\member
|
||||
*/
|
||||
class MemberShip extends BaseModel
|
||||
{
|
||||
use ModelTrait;
|
||||
|
||||
/**
|
||||
* 数据表主键
|
||||
* @var string
|
||||
*/
|
||||
protected $pk = 'id';
|
||||
|
||||
/**
|
||||
* 模型名称
|
||||
* @var string
|
||||
*/
|
||||
protected $name = 'member_ship';
|
||||
|
||||
/**
|
||||
* @param Model $query
|
||||
* @param $value
|
||||
*/
|
||||
public function searchIsDelAttr($query, $value)
|
||||
{
|
||||
if ($value !== '') $query->where('is_del', $value);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user