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:
68
pro_v3.5.1_副本/crmeb/services/template/storage/Baidu.php
Normal file
68
pro_v3.5.1_副本/crmeb/services/template/storage/Baidu.php
Normal file
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace crmeb\services\template\storage;
|
||||
|
||||
|
||||
use crmeb\basic\BaseMessage;
|
||||
|
||||
class Baidu extends BaseMessage
|
||||
{
|
||||
/**
|
||||
* 初始化
|
||||
* @param array $config
|
||||
* @return mixed|void
|
||||
*/
|
||||
protected function initialize(array $config)
|
||||
{
|
||||
parent::initialize($config); //
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送模板消息
|
||||
* @param string $templateId
|
||||
* @param array $data
|
||||
* @return mixed|void
|
||||
*/
|
||||
public function send(string $templateId, array $data = [])
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加模板消息
|
||||
* @param string $shortId
|
||||
* @return mixed|void
|
||||
*/
|
||||
public function add(string $shortId)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除模板消息
|
||||
* @param string $templateId
|
||||
* @return mixed|void
|
||||
*/
|
||||
public function delete(string $templateId)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板消息列表
|
||||
* @return mixed|void
|
||||
*/
|
||||
public function list()
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
88
pro_v3.5.1_副本/crmeb/services/template/storage/Subscribe.php
Normal file
88
pro_v3.5.1_副本/crmeb/services/template/storage/Subscribe.php
Normal file
@@ -0,0 +1,88 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
namespace crmeb\services\template\storage;
|
||||
|
||||
use app\services\message\TemplateMessageServices;
|
||||
use crmeb\basic\BaseMessage;
|
||||
use crmeb\services\CacheService;
|
||||
use crmeb\services\wechat\MiniProgram;
|
||||
use think\facade\Log;
|
||||
|
||||
/**
|
||||
* 订阅消息
|
||||
* Class Subscribe
|
||||
* @package crmeb\services\template\storage
|
||||
*/
|
||||
class Subscribe extends BaseMessage
|
||||
{
|
||||
|
||||
protected function initialize(array $config)
|
||||
{
|
||||
parent::initialize($config); //
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $templateId
|
||||
* @return mixed
|
||||
*/
|
||||
public function getTempId(string $templateId)
|
||||
{
|
||||
/** @var TemplateMessageServices $services */
|
||||
$services = app()->make(TemplateMessageServices::class);
|
||||
return CacheService::handler('TEMPLATE')->remember('subscribe_' . $templateId, function () use ($services, $templateId) {
|
||||
return $services->getTempId($templateId);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送订阅消息
|
||||
* @param string $templateId
|
||||
* @param array $data
|
||||
* @return bool|\EasyWeChat\Support\Collection|mixed|null
|
||||
*/
|
||||
public function send(string $templateId, array $data = [])
|
||||
{
|
||||
$templateId = $this->getTemplateCode($templateId);
|
||||
if (!$templateId) {
|
||||
return $this->setError('Template number does not exist');
|
||||
}
|
||||
$tempid = $this->getTempId($templateId);
|
||||
if (!$tempid) {
|
||||
return $this->setError('Template ID does not exist');
|
||||
}
|
||||
if (!$this->openId) {
|
||||
return $this->setError('Openid does not exist');
|
||||
}
|
||||
try {
|
||||
$res = MiniProgram::sendSubscribeTemlate($this->openId, $tempid, $data, $this->toUrl);
|
||||
$this->clear();
|
||||
return $res;
|
||||
} catch (\Throwable $e) {
|
||||
$this->isLog() && Log::error('发送给openid为:' . $this->openId . '小程序订阅消息失败,模板id为:' . $tempid . ';错误原因为:' . $e->getMessage());
|
||||
return $this->setError($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public function delete(string $templateId)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public function add(string $shortId)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public function list()
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
123
pro_v3.5.1_副本/crmeb/services/template/storage/Wechat.php
Normal file
123
pro_v3.5.1_副本/crmeb/services/template/storage/Wechat.php
Normal file
@@ -0,0 +1,123 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
namespace crmeb\services\template\storage;
|
||||
|
||||
use app\services\message\TemplateMessageServices;
|
||||
use crmeb\basic\BaseMessage;
|
||||
use crmeb\services\CacheService;
|
||||
use crmeb\services\wechat\OfficialAccount;
|
||||
use EasyWeChat\Kernel\Support\Collection;
|
||||
use GuzzleHttp\Exception\GuzzleException;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use think\facade\Log;
|
||||
|
||||
/**
|
||||
* 公众号模板消息
|
||||
* Class Wechat
|
||||
* @package crmeb\services\template\storage
|
||||
*/
|
||||
class Wechat extends BaseMessage
|
||||
{
|
||||
/**
|
||||
* 初始化
|
||||
* @param array $config
|
||||
* @return mixed|void
|
||||
*/
|
||||
protected function initialize(array $config)
|
||||
{
|
||||
parent::initialize($config);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $templateId
|
||||
* @return mixed
|
||||
* @throws \throwable
|
||||
*/
|
||||
public function getTempId(string $templateId)
|
||||
{
|
||||
/** @var TemplateMessageServices $services */
|
||||
$services = app()->make(TemplateMessageServices::class);
|
||||
return CacheService::handler('TEMPLATE')->remember('wechat_' . $templateId, function () use ($services, $templateId) {
|
||||
return $services->getTempId($templateId, 1);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送消息
|
||||
* @param string $templateId
|
||||
* @param array $data
|
||||
* @return bool|mixed
|
||||
* @throws GuzzleException
|
||||
*/
|
||||
public function send(string $templateId, array $data = [])
|
||||
{
|
||||
$templateId = $this->getTemplateCode($templateId);
|
||||
if (!$templateId) {
|
||||
return $this->setError('Template number does not exist');
|
||||
}
|
||||
$tempid = $this->getTempId($templateId);
|
||||
if (!$tempid) {
|
||||
return $this->setError('Template ID does not exist');
|
||||
}
|
||||
if (!$this->openId) {
|
||||
return $this->setError('Openid does not exist');
|
||||
}
|
||||
try {
|
||||
$res = OfficialAccount::sendTemplate($this->openId, $tempid, $data, $this->toUrl, $this->color);
|
||||
$this->clear();
|
||||
return $res;
|
||||
} catch (\Exception $e) {
|
||||
$this->isLog() && Log::error('发送给openid为:' . $this->openId . '微信模板消息失败,模板id为:' . $tempid . ';错误原因为:' . $e->getMessage());
|
||||
return $this->setError($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有模板
|
||||
* @return array|Collection|mixed|object|ResponseInterface|string
|
||||
* @throws GuzzleException
|
||||
*/
|
||||
public function list()
|
||||
{
|
||||
return OfficialAccount::getPrivateTemplates();
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加模板消息
|
||||
* @param string $shortId
|
||||
* @return array|Collection|mixed|object|ResponseInterface|string
|
||||
* @throws GuzzleException
|
||||
*/
|
||||
public function add(string $shortId)
|
||||
{
|
||||
return OfficialAccount::addTemplateId($shortId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除模板消息
|
||||
* @param string $templateId
|
||||
* @return array|Collection|mixed|object|ResponseInterface|string
|
||||
* @throws GuzzleException
|
||||
*/
|
||||
public function delete(string $templateId)
|
||||
{
|
||||
return OfficialAccount::deleleTemplate($templateId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回所有支持的行业列表
|
||||
* @return array|Collection|object|ResponseInterface|string
|
||||
*/
|
||||
public function getIndustry()
|
||||
{
|
||||
return OfficialAccount::getIndustry();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user