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:
62
pro_v3.5.1_副本/app/controller/erp/Auth.php
Normal file
62
pro_v3.5.1_副本/app/controller/erp/Auth.php
Normal file
@@ -0,0 +1,62 @@
|
||||
<?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\controller\erp;
|
||||
|
||||
use crmeb\services\erp\Erp;
|
||||
use think\annotation\Inject;
|
||||
use think\Response;
|
||||
|
||||
/**
|
||||
* Class Auth
|
||||
* @package app\controller\erp
|
||||
*/
|
||||
class Auth
|
||||
{
|
||||
|
||||
/*** @var Erp */
|
||||
#[Inject]
|
||||
protected Erp $services;
|
||||
|
||||
/**
|
||||
* 获取auth测试
|
||||
* @return mixed
|
||||
*/
|
||||
public function auth()
|
||||
{
|
||||
$params = $this->services->getAuthParams();
|
||||
|
||||
$url = $params["url"] . "?";
|
||||
unset($params["url"]);
|
||||
$url .= http_build_query($params);
|
||||
|
||||
return app('json')->success([$params, 'jump_url' => $url]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 授权回调测试
|
||||
* @return mixed
|
||||
*/
|
||||
public function authCallBack()
|
||||
{
|
||||
$rep = $this->services->authCallback();
|
||||
return Response::create($rep->getData(), "json");
|
||||
}
|
||||
|
||||
/**
|
||||
* token测试
|
||||
* @return void
|
||||
*/
|
||||
public function accessToken()
|
||||
{
|
||||
$param = $this->services->getAccessToken();
|
||||
return app('json')->success($param);
|
||||
}
|
||||
}
|
||||
91
pro_v3.5.1_副本/app/controller/erp/Order.php
Normal file
91
pro_v3.5.1_副本/app/controller/erp/Order.php
Normal file
@@ -0,0 +1,91 @@
|
||||
<?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\controller\erp;
|
||||
|
||||
use app\Request;
|
||||
use app\services\erp\OrderServices;
|
||||
use think\annotation\Inject;
|
||||
use think\facade\Log;
|
||||
|
||||
class Order
|
||||
{
|
||||
/**
|
||||
* @var OrderServices
|
||||
*/
|
||||
#[Inject]
|
||||
protected OrderServices $services;
|
||||
|
||||
/**
|
||||
* 订单发货回调
|
||||
* @return mixed
|
||||
*/
|
||||
public function deliverCallback(Request $request)
|
||||
{
|
||||
$data = $request->postMore([
|
||||
['type', 1],
|
||||
['logistics_company', ''], //快递公司名称
|
||||
['l_id', ''], // 快递单号
|
||||
['lc_id', ''], // 快递公司编码
|
||||
['o_id', ''], // 内部订单号
|
||||
['so_id', ''], // 线上单号
|
||||
['send_date', ''], // 发货时间
|
||||
['items', []], // 商品列表
|
||||
]);
|
||||
|
||||
Log::info(json_encode(['data' => json_encode($data), 'type' => 'deliverCallback']));
|
||||
if (sys_config('erp_open')) {
|
||||
$this->services->deliverCallback($data);
|
||||
}
|
||||
return app('json')->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单取消回调
|
||||
* @return mixed
|
||||
*/
|
||||
public function cancelCallback(Request $request)
|
||||
{
|
||||
$data = $request->postMore([
|
||||
['so_id', 0],
|
||||
['remark', ''],
|
||||
]);
|
||||
|
||||
Log::info(json_encode(['data' => json_encode($data), 'type' => 'cancelCallback']));
|
||||
if (sys_config('erp_open')) {
|
||||
$this->services->cancelCallback($data);
|
||||
}
|
||||
return app('json')->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 售后收货回调
|
||||
* @return mixed
|
||||
*/
|
||||
public function receiveCallback(Request $request)
|
||||
{
|
||||
$data = $request->postMore([
|
||||
['so_id', 0],
|
||||
['shop_id', 0], // 店铺ID
|
||||
['action_name', ''], // 操作类型
|
||||
['as_id', 0], // 售后单号
|
||||
['o_id', 0], // 内部单号
|
||||
['outer_as_id', ''], // 外部售后单号
|
||||
['remark', ''],
|
||||
['items', []], // 商品列表
|
||||
]);
|
||||
|
||||
Log::info(json_encode(['data' => json_encode($data), 'type' => 'receiveCallback']));
|
||||
if (sys_config('erp_open')) {
|
||||
$this->services->receivedCallback($data, 1, true);
|
||||
}
|
||||
return app('json')->success();
|
||||
}
|
||||
}
|
||||
82
pro_v3.5.1_副本/app/controller/erp/Product.php
Normal file
82
pro_v3.5.1_副本/app/controller/erp/Product.php
Normal file
@@ -0,0 +1,82 @@
|
||||
<?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\controller\erp;
|
||||
|
||||
use app\jobs\product\ProductSyncErp;
|
||||
use app\Request;
|
||||
use crmeb\services\erp\Erp as ErpServices;
|
||||
use crmeb\services\erp\storage\jushuitan\Product as ProductService;
|
||||
use think\annotation\Inject;
|
||||
use think\Response;
|
||||
|
||||
/**
|
||||
* 商品类
|
||||
* Class Product
|
||||
* @package app\controller\erp
|
||||
*/
|
||||
class Product
|
||||
{
|
||||
|
||||
/**
|
||||
* @var ErpServices|\crmeb\services\erp\storage\jushuitan\Comment|\crmeb\services\erp\storage\jushuitan\Order|ProductService|\crmeb\services\erp\storage\jushuitan\Stock
|
||||
*/
|
||||
#[Inject]
|
||||
protected ErpServices $services;
|
||||
|
||||
|
||||
/**
|
||||
* 使用spu同步商品
|
||||
* @param Request $request
|
||||
* @return mixed
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function syncProduct(Request $request)
|
||||
{
|
||||
[$spuStr] = $request->getMore([
|
||||
['spu_str', ''],
|
||||
], true);
|
||||
|
||||
if (empty($spuStr)) {
|
||||
return app('json')->fail('请输入ERP商品SPU');
|
||||
}
|
||||
$spuArr = explode(',', $spuStr);
|
||||
foreach ($spuArr as $item) {
|
||||
// 获取商品
|
||||
// ProductSyncErp::dispatchDo('productFromErp', [$item]);
|
||||
}
|
||||
return app('json')->success('正在同步中,请稍后查看');
|
||||
}
|
||||
|
||||
/**
|
||||
* 使用sku同步库存
|
||||
* @param Request $request
|
||||
* @return mixed
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function syncStock(Request $request)
|
||||
{
|
||||
[$ids] = $request->getMore([
|
||||
['ids', ''],
|
||||
], true);
|
||||
|
||||
if (empty($ids)) {
|
||||
return app('json')->fail('请选择商品');
|
||||
}
|
||||
|
||||
$idArr = stringToIntArray($ids);
|
||||
$data = array_chunk($idArr, 1);
|
||||
foreach ($data as $item) {
|
||||
// 获取库存
|
||||
// ProductSyncErp::dispatchDo('stockFromErp', [$item]);
|
||||
}
|
||||
return app('json')->success('正在同步中,请稍后查看');
|
||||
}
|
||||
}
|
||||
38
pro_v3.5.1_副本/app/controller/erp/Stock.php
Normal file
38
pro_v3.5.1_副本/app/controller/erp/Stock.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?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\controller\erp;
|
||||
|
||||
use app\jobs\product\ProductSyncErp;
|
||||
use app\Request;
|
||||
use think\Response;
|
||||
use \think\facade\Log;
|
||||
|
||||
class Stock
|
||||
{
|
||||
/**
|
||||
* 库存回调
|
||||
* @param Request $request
|
||||
* @return void
|
||||
*/
|
||||
public function stockCallback(Request $request)
|
||||
{
|
||||
[$datas] = $request->postMore([
|
||||
['datas', []]
|
||||
], true);
|
||||
|
||||
Log::info(json_encode(['data' => json_encode($datas), 'type' => 'stockCallback']));
|
||||
// if (sys_config('erp_open')) {
|
||||
// ProductSyncErp::dispatchDo('updatePlatformStock', [$datas]);
|
||||
// }
|
||||
|
||||
return Response::create(['code' => "0", "msg" => "执行成功"], "json");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user