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:
@@ -0,0 +1,54 @@
|
||||
<?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\validate\supplier;
|
||||
|
||||
use think\Validate;
|
||||
|
||||
class SupplierTicketPrintValidate extends Validate
|
||||
{
|
||||
|
||||
/**
|
||||
* 定义验证规则
|
||||
* 格式:'字段名' => ['规则1','规则2'...]
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $rule = [
|
||||
'develop_id' => 'require|gt:0',
|
||||
'api_key' => 'require|max:100',
|
||||
'client_id' => 'require|max:100',
|
||||
'terminal_number' => 'require|max:100',
|
||||
'status' => 'require|number',
|
||||
];
|
||||
|
||||
/**
|
||||
* 定义错误信息
|
||||
* 格式:'字段名.规则名' => '错误信息'
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $message = [
|
||||
'develop_id.require' => '请填写用户ID',
|
||||
'develop_id.gt' => '用户ID参数错误',
|
||||
'api_key.require' => '请填写秘钥',
|
||||
'api_key.max' => '秘钥最多不能超过100个字符',
|
||||
'client_id.require' => '请填写应用ID',
|
||||
'client_id.max' => '应用ID最多不能超过100个字符',
|
||||
'terminal_number.require' => '请填写终端号',
|
||||
'terminal_number.max' => '终端号最多不能超过100个字符',
|
||||
'status.require' => '开关',
|
||||
'status.number' => '开关',
|
||||
];
|
||||
|
||||
protected $scene = [
|
||||
'update' => ['develop_id', 'api_key', 'client_id', 'terminal_number', 'status'],
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
<?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\validate\supplier;
|
||||
|
||||
use think\Validate;
|
||||
|
||||
class SystemSupplierValidate extends Validate
|
||||
{
|
||||
|
||||
/**
|
||||
* 定义验证规则
|
||||
* 格式:'字段名' => ['规则1','规则2'...]
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $rule = [
|
||||
'supplier_name' => 'require|max:25',
|
||||
'name' => 'max:25',
|
||||
'phone' => 'require|mobile',
|
||||
'email' => 'email|max:50',
|
||||
'address' => 'max:255',
|
||||
'province' => 'gt:0',
|
||||
'city' => 'gt:0',
|
||||
'area' => 'gt:0',
|
||||
'detailed_address' => 'max:255',
|
||||
'account' => 'require',
|
||||
'pwd' => ['require', 'length:4,64'],
|
||||
'mark' => 'max:255',
|
||||
];
|
||||
|
||||
/**
|
||||
* 定义错误信息
|
||||
* 格式:'字段名.规则名' => '错误信息'
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $message = [
|
||||
'supplier_name.require' => '请填写供应商名称',
|
||||
'supplier_name.max' => '供应商名称最多不能超过25个字符',
|
||||
'name.max' => '名称最多不能超过25个字符',
|
||||
'phone.require' => '请填写手机号',
|
||||
'phone.mobile' => '手机号格式不正确',
|
||||
'email.email' => '邮箱格式不正确',
|
||||
'email.max' => '邮箱最多不能超过100个字符',
|
||||
'address.max' => '供应商地址最多不能超过255个字符',
|
||||
'mark.max' => '备注最多不能超过255个字符',
|
||||
'province.gt' => '省份信息错误',
|
||||
'city.gt' => '城市信息错误',
|
||||
'area.gt' => '地区信息错误',
|
||||
'detailed_address.max' => '详细地址最多不能超过255个字符',
|
||||
'account.require' => '请填写供应商登录用户名',
|
||||
// 'account.length' => '供应商登录用户名4-64长度字符',
|
||||
'pwd.require' => '请输入密码',
|
||||
'pwd.length' => '密码长度4-64位字符',
|
||||
];
|
||||
|
||||
protected $scene = [
|
||||
'login' => ['account', 'pwd'],
|
||||
'update' => ['supplier_name', 'name', 'phone', 'email', 'address', 'detailed_address', 'province', 'city', 'area'],
|
||||
'save' => ['supplier_name', 'name', 'phone', 'email', 'address', 'detailed_address', 'province', 'city', 'area','account', 'pwd', 'mark'],
|
||||
'admin_update' => ['supplier_name', 'name', 'phone', 'email', 'address', 'detailed_address', 'province', 'city', 'area','account', 'mark'],
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user