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
89 lines
3.5 KiB
PHP
89 lines
3.5 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>
|
||
// +----------------------------------------------------------------------
|
||
declare (strict_types=1);
|
||
|
||
namespace app\services\pay;
|
||
|
||
|
||
use app\services\user\UserRechargeServices;
|
||
use app\services\wechat\WechatUserServices;
|
||
use think\annotation\Inject;
|
||
use think\exception\ValidateException;
|
||
|
||
/**
|
||
*
|
||
* Class RechargeServices
|
||
* @package app\services\pay
|
||
*/
|
||
class RechargeServices
|
||
{
|
||
/**
|
||
* @var PayServices
|
||
*/
|
||
#[Inject]
|
||
protected PayServices $pay;
|
||
|
||
/**
|
||
* 充值订单支付
|
||
* @param string $order_id
|
||
* @param string $payType
|
||
* @return \Alipay\EasySDK\Payment\Wap\Models\AlipayTradeWapPayResponse|array|string
|
||
* @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException
|
||
* @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException
|
||
* @throws \Psr\SimpleCache\InvalidArgumentException
|
||
* @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
|
||
*/
|
||
public function recharge(string $order_id, string $payType = 'weixin',string $from = 'weixin')
|
||
{
|
||
/** @var UserRechargeServices $rechargeServices */
|
||
$rechargeServices = app()->make(UserRechargeServices::class);
|
||
$recharge = $rechargeServices->getOne(['order_id' => $order_id]);
|
||
if (!$recharge) {
|
||
throw new ValidateException('订单失效或者不存在');
|
||
}
|
||
if ($recharge['paid'] == 1) {
|
||
throw new ValidateException('订单已支付');
|
||
}
|
||
$payType = $from == 'routine' ? 'routine' : $payType;
|
||
if ($payType != $recharge['recharge_type']) {
|
||
$res = $rechargeServices->update(['order_id' => $order_id], ['recharge_type' => $payType]);
|
||
if (!$res) {
|
||
throw new ValidateException('订单支付方式修改失败');
|
||
}
|
||
}
|
||
$openid = '';
|
||
//没有付款码，不是微信H5支付，门店支付，PC支付，不再APP端，需要判断用户openid
|
||
if (!in_array($recharge['recharge_type'], ['weixinh5', 'store', 'pc']) && !request()->isApp()) {
|
||
$userType = '';
|
||
switch ($recharge['recharge_type']) {
|
||
case 'weixin':
|
||
case 'weixinh5':
|
||
$userType = 'wechat';
|
||
break;
|
||
case 'routine':
|
||
$userType = 'routine';
|
||
break;
|
||
}
|
||
if (!$userType) {
|
||
throw new ValidateException('不支持该类型方式');
|
||
}
|
||
/** @var WechatUserServices $wechatUser */
|
||
$wechatUser = app()->make(WechatUserServices::class);
|
||
$openid = $wechatUser->uidToOpenid((int)$recharge['uid'], $userType);
|
||
if (!$openid) {
|
||
throw new ValidateException('获取用户openid失败,无法支付');
|
||
}
|
||
}
|
||
return $this->pay->pay($recharge['recharge_type'], $openid, $recharge['order_id'], $recharge['price'], 'user_recharge', '用户充值');
|
||
}
|
||
|
||
}
|