mirror of
https://gitee.com/technical-laohu/mpay.git
synced 2026-02-15 14:04:27 +08:00
Compare commits
3 Commits
v1.2.2
...
ee49c2a0d0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee49c2a0d0 | ||
|
|
374fc75423 | ||
|
|
fa75d580b8 |
@@ -227,8 +227,8 @@ EOT;
|
|||||||
`order_id` varchar(255) NOT NULL DEFAULT '',
|
`order_id` varchar(255) NOT NULL DEFAULT '',
|
||||||
`type` varchar(255) NOT NULL DEFAULT '',
|
`type` varchar(255) NOT NULL DEFAULT '',
|
||||||
`out_trade_no` varchar(255) NOT NULL DEFAULT '',
|
`out_trade_no` varchar(255) NOT NULL DEFAULT '',
|
||||||
`notify_url` varchar(255) NOT NULL DEFAULT '',
|
`notify_url` varchar(512) NOT NULL DEFAULT '',
|
||||||
`return_url` varchar(255) NOT NULL DEFAULT '',
|
`return_url` varchar(512) NOT NULL DEFAULT '',
|
||||||
`name` varchar(255) NOT NULL DEFAULT '',
|
`name` varchar(255) NOT NULL DEFAULT '',
|
||||||
`really_price` decimal(10, 2) NOT NULL DEFAULT 0.00,
|
`really_price` decimal(10, 2) NOT NULL DEFAULT 0.00,
|
||||||
`money` decimal(10, 2) NOT NULL DEFAULT 0.00,
|
`money` decimal(10, 2) NOT NULL DEFAULT 0.00,
|
||||||
@@ -264,7 +264,7 @@ EOT;
|
|||||||
`account_id` int(11) NOT NULL DEFAULT 0,
|
`account_id` int(11) NOT NULL DEFAULT 0,
|
||||||
`channel` varchar(255) NOT NULL DEFAULT '',
|
`channel` varchar(255) NOT NULL DEFAULT '',
|
||||||
`type` tinyint(4) NOT NULL DEFAULT 0,
|
`type` tinyint(4) NOT NULL DEFAULT 0,
|
||||||
`qrcode` varchar(255) NOT NULL DEFAULT '',
|
`qrcode` varchar(512) NOT NULL DEFAULT '',
|
||||||
`last_time` datetime DEFAULT CURRENT_TIMESTAMP,
|
`last_time` datetime DEFAULT CURRENT_TIMESTAMP,
|
||||||
`state` tinyint(4) NOT NULL DEFAULT 1,
|
`state` tinyint(4) NOT NULL DEFAULT 1,
|
||||||
`delete_time` datetime DEFAULT NULL,
|
`delete_time` datetime DEFAULT NULL,
|
||||||
|
|||||||
@@ -165,6 +165,7 @@ class PayController
|
|||||||
foreach ($activeOrders as $order) {
|
foreach ($activeOrders as $order) {
|
||||||
// 支付方式核对
|
// 支付方式核对
|
||||||
$is_payway = $order->type == $new_order['payway'];
|
$is_payway = $order->type == $new_order['payway'];
|
||||||
|
if ($new_order['payway'] == '') $is_payway = true;
|
||||||
// 支付渠道核对
|
// 支付渠道核对
|
||||||
$is_channel = $cids[$order->cid] == $new_order['channel'];
|
$is_channel = $cids[$order->cid] == $new_order['channel'];
|
||||||
// 金额核对
|
// 金额核对
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ class PayAccount extends BaseModel
|
|||||||
public static function getAccountConfig($aid, $pid = null): array|bool
|
public static function getAccountConfig($aid, $pid = null): array|bool
|
||||||
{
|
{
|
||||||
$aid_info = self::find($aid);
|
$aid_info = self::find($aid);
|
||||||
|
if (!$aid_info) return false;
|
||||||
// 插件配置
|
// 插件配置
|
||||||
$platform = PluginController::getPluginInfo($aid_info->getData('platform'));
|
$platform = PluginController::getPluginInfo($aid_info->getData('platform'));
|
||||||
// 查询参数
|
// 查询参数
|
||||||
|
|||||||
@@ -8,8 +8,6 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>开发文档</title>
|
<title>开发文档</title>
|
||||||
</head>
|
</head>
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="https://cdn.jsdelivr.net/gh/pandao/editor.md@1.5.0/css/editormd.min.css">
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
body {
|
body {
|
||||||
font-family: "Helvetica Neue", "Helvetica", "Microsoft Yahei", "微软雅黑", "Lantinghei SC", "STXihei", "WenQuanYi Micro Hei", Arial, sans-serif;
|
font-family: "Helvetica Neue", "Helvetica", "Microsoft Yahei", "微软雅黑", "Lantinghei SC", "STXihei", "WenQuanYi Micro Hei", Arial, sans-serif;
|
||||||
|
|||||||
@@ -305,9 +305,10 @@
|
|||||||
openAppBtn.className = 'layui-btn layui-btn-normal';
|
openAppBtn.className = 'layui-btn layui-btn-normal';
|
||||||
openAppBtn.onclick = function () {
|
openAppBtn.onclick = function () {
|
||||||
if (codeType == 0) {
|
if (codeType == 0) {
|
||||||
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + payCode;
|
const payUrl = encodeURIComponent(payCode);
|
||||||
|
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + payUrl;
|
||||||
} else {
|
} else {
|
||||||
const currentUrl = window.location.href;
|
const currentUrl = encodeURIComponent(window.location.href);
|
||||||
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + currentUrl;
|
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + currentUrl;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user