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
112 lines
4.3 KiB
PHP
112 lines
4.3 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\jobs\user;
|
||
|
||
|
||
use app\services\order\StoreCartServices;
|
||
use app\services\order\StoreOrderCreateServices;
|
||
use app\services\order\StoreOrderSuccessServices;
|
||
use app\services\pay\PayServices;
|
||
use app\services\user\UserRechargeServices;
|
||
use crmeb\basic\BaseJobs;
|
||
use crmeb\services\wechat\Payment;
|
||
use crmeb\traits\QueueTrait;
|
||
use think\facade\Log;
|
||
use app\webscoket\SocketPush;
|
||
|
||
/**
|
||
* 付款码支付
|
||
* Class MicroPayOrderJob
|
||
* @package app\jobs\user
|
||
*/
|
||
class MicroPayOrderJob extends BaseJobs
|
||
{
|
||
|
||
use QueueTrait;
|
||
|
||
|
||
public function doJob(string $outTradeNo, int $type = 1, int $num = 1)
|
||
{
|
||
if ($type) {
|
||
/** @var UserRechargeServices $make */
|
||
$make = app()->make(UserRechargeServices::class);
|
||
} else {
|
||
/** @var StoreOrderSuccessServices $make */
|
||
$make = app()->make(StoreOrderSuccessServices::class);
|
||
}
|
||
$orderInfo = $make->get(['order_id' => $outTradeNo]);
|
||
if (!$orderInfo) {
|
||
return true;
|
||
}
|
||
if ($orderInfo->paid) {
|
||
return true;
|
||
}
|
||
if (!$type && $orderInfo->is_del) {
|
||
return true;
|
||
}
|
||
try {
|
||
//查询订单支付状态
|
||
$respones = Payment::queryOrder($outTradeNo);
|
||
if ($respones['paid'] && ($respones['payInfo']['trade_state'] ?? '') == 'SUCCESS') {
|
||
if ($type) {
|
||
$make->rechargeSuccess($outTradeNo);
|
||
} else {
|
||
//删除购物车
|
||
/** @var StoreCartServices $cartServices */
|
||
$cartServices = app()->make(StoreCartServices::class);
|
||
$cartServices->deleteCartStatus($orderInfo['cart_id'] ?? []);
|
||
//修改支付状态
|
||
$make->paySuccess($orderInfo->toArray(), PayServices::WEIXIN_PAY, [
|
||
'trade_no' => $respones['payInfo']['transaction_id'] ?? ''
|
||
]);
|
||
}
|
||
} else {
|
||
//15秒后还是状态异常直接取消订单
|
||
if ($num >= 3) {
|
||
try {
|
||
$respones = Payment::reverseOrder($outTradeNo);
|
||
if ($type) {
|
||
/** @var StoreOrderCreateServices $service */
|
||
$service = app()->make(StoreOrderCreateServices::class);
|
||
$make->update(
|
||
[
|
||
'order_id' => $outTradeNo
|
||
],
|
||
[
|
||
$type ? 'remarks' : 'remark' => '支付状态异常自动撤销订单，并从新生成订单号',
|
||
'order_id' => $type ? $make->getOrderId() : $service->getNewOrderId(),
|
||
]
|
||
);
|
||
}
|
||
|
||
} catch (\Throwable $e) {
|
||
Log::error(json_encode([
|
||
'message' => '撤销订单失败，订单号:' . $outTradeNo . ';错误原因：' . $e->getMessage(),
|
||
'file' => $e->getFile(),
|
||
'line' => $e->getLine()
|
||
]));
|
||
}
|
||
return true;
|
||
}
|
||
$secs = 5;
|
||
if (isset($respones['payInfo']['err_code']) && $respones['payInfo']['err_code'] === 'USERPAYING') {
|
||
$secs = 10;
|
||
}
|
||
self::dispatchSece($secs, [$outTradeNo, $type, $num + 1]);
|
||
}
|
||
} catch (\Throwable $e) {
|
||
|
||
}
|
||
return true;
|
||
}
|
||
}
|