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
102 lines
3.2 KiB
PHP
102 lines
3.2 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\controller\api\pc;
|
||
|
||
use app\Request;
|
||
use app\services\order\StoreOrderRefundServices;
|
||
use app\services\order\StoreOrderServices;
|
||
use app\services\pc\OrderServices;
|
||
use think\annotation\Inject;
|
||
|
||
class Order
|
||
{
|
||
|
||
/**
|
||
* @var OrderServices
|
||
*/
|
||
#[Inject]
|
||
protected OrderServices $services;
|
||
|
||
/**
|
||
* 轮询订单状态
|
||
* @param Request $request
|
||
* @return mixed
|
||
*/
|
||
public function checkOrderStatus(Request $request)
|
||
{
|
||
[$order_id, $end_time] = $request->getMore([
|
||
['order_id', ''],
|
||
['end_time', ''],
|
||
], true);
|
||
$data['status'] = $this->services->checkOrderStatus((string)$order_id);
|
||
$time = $end_time - time();
|
||
$data['time'] = $time > 0 ? $time : 0;
|
||
return app('json')->successful($data);
|
||
}
|
||
|
||
/**
|
||
* 获取订单列表
|
||
* @param Request $request
|
||
* @return mixed
|
||
* @throws \think\db\exception\DataNotFoundException
|
||
* @throws \think\db\exception\DbException
|
||
* @throws \think\db\exception\ModelNotFoundException
|
||
*/
|
||
public function getOrderList(Request $request)
|
||
{
|
||
$where = $request->getMore([
|
||
['type', '', '', 'status'],
|
||
['search', '', '', 'real_name'],
|
||
]);
|
||
$where['uid'] = $request->uid();
|
||
$where['is_del'] = 0;
|
||
$where['is_system_del'] = 0;
|
||
if (!in_array($where['status'], [-1, -2, -3])) $where['pid'] = 0;
|
||
return app('json')->successful($this->services->getOrderList($where));
|
||
}
|
||
|
||
/**
|
||
* 获取退货商品列表
|
||
* @param StoreOrderCartInfoServices $services
|
||
* @param $id
|
||
* @return mixed
|
||
*/
|
||
public function refundCartInfoList(Request $request, StoreOrderServices $services)
|
||
{
|
||
[$cart_ids, $id] = $request->postMore([
|
||
['cart_ids', ''],
|
||
['id', 0],
|
||
], true);
|
||
if (!$id) {
|
||
return app('json')->fail('缺少发货ID');
|
||
}
|
||
$cart_id = [];
|
||
if ($cart_ids) $cart_id[] = ['cart_id' => $cart_ids];
|
||
return app('json')->success($services->refundCartInfoList((array)$cart_id, (int)$id));
|
||
}
|
||
|
||
/**
|
||
* 订单列表
|
||
* @param Request $request
|
||
* @return mixed
|
||
*/
|
||
public function refundList(Request $request, StoreOrderRefundServices $services)
|
||
{
|
||
$where = $request->getMore([
|
||
['refund_type', '', '', 'refundTypes']
|
||
]);
|
||
$where['uid'] = $request->uid();
|
||
$data['list'] = $services->getRefundOrderList($where);
|
||
$data['count'] = $services->count($where);
|
||
return app('json')->successful($data);
|
||
}
|
||
}
|