## 一、支付:改由已安装的 epay 插件承载(不再自研签名)
- 下单:\addons\epay\library\Service::submitOrder($amount 元, $orderNo, 'wechat', $body, $notifyUrl, null, 'miniapp', $openid)
- 验签:Service::checkNotify('wechat')(内部 $pay->verify());应答:$pay->success()(v2 = XML)
- 业务编排仍在 application/api/controller/Pay.php,不改插件源码:
POST /pay/prepay(取调起参数,下发前剔除 appId);POST /pay/notify(公开路由:插件验签 → 金额核对 → 幂等分派)
- 配置真源 = addons/epay/config.php(后台「插件管理 → 微信支付宝整合插件 → 配置」);
fc_config 的 wx.mchId / wx.apiKey / wx.payNotifyUrl 废弃;后台「系统设置」支付表单改只读并跳插件配置页
- 插件 API 保持 version=v2(PHP 7.4 可跑);certs/* 为 0 字节占位,不含任何真实密钥
- 修复 BUG-015:Pay::notify() 与基类站内信同名且签名不兼容导致 /pay/* 全 500,动作改名 notifyCallback()
## 二、插件纳入 Git 版本管理
- .gitignore 移除 /addons/* 与 /public/assets/addons/*(保留 .gitkeep 占位)
- 入库 addons/epay、addons/wechat、public/assets/addons/*、addons/.htaccess(deny from all)
- config.php 入库为空白模板;服务器请在填好密钥后执行
git update-index --skip-worktree addons/epay/config.php,避免真实密钥回传仓库
## 三、安全修复:余额充值资损(高危,已实测复现)
- 现象:POST /order/recharge {payType:'balance'} 只加余额不扣款(余额 134.50 → 1022.50),等于凭空增发余额,
可再去买会员 / 付费发布 / 解锁联系方式
- 修复:/order/recharge 仅接受 payType=wxpay,balance → 「余额充值仅支持微信支付」,其它 → 「支付方式不支持」;
订单恒为 status=pending、pay_type=wxpay、paytime=null;入账只发生在 /pay/notify 回调(Order::creditRecharge)
或后台「会员管理 → 余额充值」(fc/userext/recharge)
- 小程序充值页同步为「仅微信支付」+ 防重复提交 + onShow 刷新资产;mock / 用例 / 文档同步
## 四、其他 v1.1.0 能力
- 媒体上传:POST /post/upload(图片 ≤10MB / 视频 ≤50MB,真落盘),发布页 uni.uploadFile 真上传
- LBS:fc_post.lat/lng、首页 sort=nearby(距离升序、无坐标排最后)、卡片 distance、详情页地图
- 互动:举报 POST /report(原因字典)、收藏 / 关注(fc_favorite / fc_follow、/favorite/*、/follow/toggle)
- 交易:余额充值 POST /order/recharge、优惠券 /coupon/list|receive(fc_coupon / fc_user_coupon、我的资产券)
- 发布计费:会员发布折扣(discountRate/discountText)+ 免费发布条数(freeQuota*)
- 后台新增:数据总览 fc/dashboard、系统设置 fc/setting、优惠券管理 fc/coupon(含菜单与权限节点)
## 五、本批审核修复
- 详情页:游客不再请求登录态接口(避免 401 被清 token 踢去登录);微信付费查看改为支付后轮询解锁,
不再读取 wxpay 分支未返回的 contact;加防重复提交
- 发布页:freeLeftToday → freeQuotaLeft / freeQuotaCycle / freeUnlimited(对齐后端出参);
上传图预览拼后端域名(新增 format.js#assetUrl,后端返回相对路径)
- 收藏空态「去首页」:switchTab → reLaunch(项目用自绘 fc-tabbar,无 tabBar,switchTab 必然失败)
- 会员券 days=0 显示「永久有效」;manifest.json 补 requiredPrivateInfos(getLocation / chooseLocation)
- 后端:publishConfig 补 discountRate/discountText 与 memberPostDiscountText();优惠券总开关 coupon.enabled
真生效(关闭后 list/receive 拒绝);后台 fc/Coupon 的 add/edit 补 strip_tags 过滤(防存储型 XSS)、
补 searchFields='name',列表 name 列再做一次 HTML 转义
- FcInstall:补清理后台菜单缓存 __menu__(否则新菜单要等缓存过期才显示),并同步 README 说明
- 后台语言包 fc/setting.php 按「支付只读 + 跳插件配置」的新页面重写
- 文档同步:uniapp/docs/{01,03,04}、uniapp/README.md、docs/05-后端实现规范.md、后台 README 上线步骤
## 六、校验结果(全部通过)
- 后端端到端:tools/verify-api.mjs 226/226(含新增「拒绝余额充值(资损防护)」用例)
- 小程序:uniapp/tests/run.mjs 167/167;validate.mjs 0 错 0 警;check-scss 19/19
- 后台:check-admin-i18n 0 错 0 警;check-theme 0 错 0 警;9 个页面 HTTP 200 全中文
- php -l 改动/新增 PHP 文件 0 语法错误;探针复测:余额不再增长、epay 插件下单/验签链路通
235 行
7.5 KiB
PHP
235 行
7.5 KiB
PHP
<?php
|
|
|
|
namespace addons\epay\controller;
|
|
|
|
use addons\epay\library\Service;
|
|
use addons\epay\library\Wechat;
|
|
use addons\third\model\Third;
|
|
use app\common\library\Auth;
|
|
use Exception;
|
|
use think\addons\Controller;
|
|
use think\Response;
|
|
use think\Session;
|
|
use Yansongda\Pay\Exceptions\GatewayException;
|
|
use Yansongda\Pay\Pay;
|
|
|
|
/**
|
|
* API接口控制器
|
|
*
|
|
* @package addons\epay\controller
|
|
*/
|
|
class Api extends Controller
|
|
{
|
|
|
|
protected $layout = 'default';
|
|
protected $config = [];
|
|
|
|
/**
|
|
* 默认方法
|
|
*/
|
|
public function index()
|
|
{
|
|
return;
|
|
}
|
|
|
|
/**
|
|
* 外部提交
|
|
*/
|
|
public function submit()
|
|
{
|
|
$this->request->filter('trim');
|
|
$out_trade_no = $this->request->request("out_trade_no");
|
|
$title = $this->request->request("title");
|
|
$amount = $this->request->request('amount');
|
|
$type = $this->request->request('type', $this->request->request('paytype'));
|
|
$method = $this->request->request('method', 'web');
|
|
$openid = $this->request->request('openid', '');
|
|
$auth_code = $this->request->request('auth_code', '');
|
|
$notifyurl = $this->request->request('notifyurl', '');
|
|
$returnurl = $this->request->request('returnurl', '');
|
|
|
|
if (!$amount || $amount < 0) {
|
|
$this->error("支付金额必须大于0");
|
|
}
|
|
|
|
if (!$type || !in_array($type, ['alipay', 'wechat'])) {
|
|
$this->error("支付类型错误");
|
|
}
|
|
|
|
$params = [
|
|
'type' => $type,
|
|
'out_trade_no' => $out_trade_no,
|
|
'title' => $title,
|
|
'amount' => $amount,
|
|
'method' => $method,
|
|
'openid' => $openid,
|
|
'auth_code' => $auth_code,
|
|
'notifyurl' => $notifyurl,
|
|
'returnurl' => $returnurl,
|
|
];
|
|
return Service::submitOrder($params);
|
|
}
|
|
|
|
/**
|
|
* 微信支付(公众号支付&PC扫码支付)
|
|
*/
|
|
public function wechat()
|
|
{
|
|
$config = Service::getConfig('wechat');
|
|
|
|
$isWechat = stripos($this->request->server('HTTP_USER_AGENT'), 'MicroMessenger') !== false;
|
|
$isMobile = $this->request->isMobile();
|
|
$this->view->assign("isWechat", $isWechat);
|
|
$this->view->assign("isMobile", $isMobile);
|
|
|
|
//发起PC支付(Scan支付)(PC扫码模式)
|
|
if ($this->request->isAjax()) {
|
|
$pay = Pay::wechat($config);
|
|
$orderid = $this->request->post("orderid");
|
|
try {
|
|
$result = Service::isVersionV3() ? $pay->find(['out_trade_no' => $orderid]) : $pay->find($orderid, 'scan');
|
|
$this->success("", "", ['status' => $result['trade_state'] ?? 'NOTPAY']);
|
|
} catch (GatewayException $e) {
|
|
$this->error("查询失败(1001)");
|
|
}
|
|
}
|
|
|
|
$orderData = Session::get("wechatorderdata");
|
|
if (!$orderData) {
|
|
$this->error("请求参数错误");
|
|
}
|
|
if ($isWechat && $isMobile) {
|
|
//发起公众号(jsapi支付),openid必须
|
|
|
|
//如果没有openid,则自动去获取openid
|
|
if (!isset($orderData['openid']) || !$orderData['openid']) {
|
|
$orderData['openid'] = Service::getOpenid();
|
|
}
|
|
|
|
$orderData['method'] = 'mp';
|
|
$type = 'jsapi';
|
|
$payData = Service::submitOrder($orderData);
|
|
if (!isset($payData['paySign'])) {
|
|
$this->error("创建订单失败,请返回重试", "");
|
|
}
|
|
} else {
|
|
$orderData['method'] = 'scan';
|
|
$type = 'pc';
|
|
$payData = Service::submitOrder($orderData);
|
|
if (!isset($payData['code_url'])) {
|
|
$this->error("创建订单失败,请返回重试", "");
|
|
}
|
|
}
|
|
$this->view->assign("orderData", $orderData);
|
|
$this->view->assign("payData", $payData);
|
|
$this->view->assign("type", $type);
|
|
|
|
$this->view->assign("title", "微信支付");
|
|
return $this->view->fetch();
|
|
}
|
|
|
|
/**
|
|
* 支付宝支付(PC扫码支付)
|
|
*/
|
|
public function alipay()
|
|
{
|
|
$config = Service::getConfig('alipay');
|
|
|
|
$isWechat = stripos($this->request->server('HTTP_USER_AGENT'), 'MicroMessenger') !== false;
|
|
$isMobile = $this->request->isMobile();
|
|
$this->view->assign("isWechat", $isWechat);
|
|
$this->view->assign("isMobile", $isMobile);
|
|
|
|
if ($this->request->isAjax()) {
|
|
$orderid = $this->request->post("orderid");
|
|
$pay = Pay::alipay($config);
|
|
try {
|
|
$result = $pay->find(['out_trade_no' => $orderid]);
|
|
if ($result['code'] == '10000' && $result['trade_status'] == 'TRADE_SUCCESS') {
|
|
$this->success("", "", ['status' => $result['trade_status']]);
|
|
} else {
|
|
$this->error("查询失败");
|
|
}
|
|
} catch (GatewayException $e) {
|
|
$this->error("查询失败(1001)");
|
|
}
|
|
}
|
|
|
|
//发起PC支付(Scan支付)(PC扫码模式)
|
|
$orderData = Session::get("alipayorderdata");
|
|
if (!$orderData) {
|
|
$this->error("请求参数错误");
|
|
}
|
|
|
|
$orderData['method'] = 'scan';
|
|
$payData = Service::submitOrder($orderData);
|
|
if (!isset($payData['qr_code'])) {
|
|
$this->error("创建订单失败,请返回重试");
|
|
}
|
|
|
|
$type = 'pc';
|
|
$this->view->assign("orderData", $orderData);
|
|
$this->view->assign("payData", $payData);
|
|
$this->view->assign("type", $type);
|
|
$this->view->assign("title", "支付宝支付");
|
|
return $this->view->fetch();
|
|
}
|
|
|
|
/**
|
|
* 支付成功回调
|
|
*/
|
|
public function notifyx()
|
|
{
|
|
$paytype = $this->request->param('paytype');
|
|
$pay = Service::checkNotify($paytype);
|
|
if (!$pay) {
|
|
return json(['code' => 'FAIL', 'message' => '失败'], 500, ['Content-Type' => 'application/json']);
|
|
}
|
|
|
|
// 获取回调数据,V3和V2的回调接收不同
|
|
$data = Service::isVersionV3() ? $pay->callback() : $pay->verify();
|
|
|
|
try {
|
|
//微信支付V3返回和V2不同
|
|
if (Service::isVersionV3() && $paytype === 'wechat') {
|
|
$data = $data['resource']['ciphertext'];
|
|
$data['total_fee'] = $data['amount']['total'];
|
|
}
|
|
|
|
\think\Log::record($data);
|
|
//获取支付金额、订单号
|
|
$payamount = $paytype == 'alipay' ? $data['total_amount'] : $data['total_fee'] / 100;
|
|
$out_trade_no = $data['out_trade_no'];
|
|
|
|
\think\Log::record("回调成功,订单号:{$out_trade_no},金额:{$payamount}");
|
|
|
|
//你可以在此编写订单逻辑
|
|
} catch (Exception $e) {
|
|
\think\Log::record("回调逻辑处理错误:" . $e->getMessage(), "error");
|
|
}
|
|
|
|
//下面这句必须要执行,且在此之前不能有任何输出
|
|
if (Service::isVersionV3()) {
|
|
return $pay->success()->getBody()->getContents();
|
|
} else {
|
|
return $pay->success()->send();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 支付成功返回
|
|
*/
|
|
public function returnx()
|
|
{
|
|
$paytype = $this->request->param('paytype');
|
|
if (Service::checkReturn($paytype)) {
|
|
echo '签名错误';
|
|
return;
|
|
}
|
|
|
|
//你可以在这里定义你的提示信息,但切记不可在此编写逻辑
|
|
$this->success("恭喜你!支付成功!", addon_url("epay/index/index"));
|
|
}
|
|
|
|
}
|