feat: 新增充值订单独立管理模块及退款安全拦截

- 新增充值订单菜单及独立路由
- 禁用通用退款入口处理充值订单
- 完善支付场景类型及状态显示
- 补充充值退款测试用例
- 优化各模块未知状态显示提示
- 升级版本号至1.0.94
这个提交包含在:
2026-11-20 13:40:54 +08:00
父节点 8af5672aeb
当前提交 6b83afb750
共有 35 个文件被更改,包括 164 次插入 和 82 次删除

查看文件

@@ -0,0 +1,5 @@
-- 独立充值订单列表;退款仍由服务端安全拦截。
INSERT INTO `fa_auth_rule` (`type`,`pid`,`name`,`title`,`icon`,`condition`,`remark`,`ismenu`,`createtime`,`updatetime`,`weigh`,`status`)
SELECT 'file', p.id, 'pay_order/recharges', '充值订单', 'fa fa-credit-card', '', '用户微信在线充值订单', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 146, 'normal'
FROM `fa_auth_rule` p WHERE p.name='finance_manage'
AND NOT EXISTS (SELECT 1 FROM (SELECT name FROM `fa_auth_rule`) existing WHERE existing.name='pay_order/recharges');

查看文件

@@ -77,6 +77,7 @@ class Invoice extends Backend
}
$linkedOrders = InvoiceService::fetchLinkedOrders((string)$row['order_ids'], (int)$row['id']);
$this->view->assign('row', $row);
$this->view->assign('invoiceIsImage', $this->isInvoiceImage((string)$row['invoice_file']));
$this->view->assign('linkedOrders', $linkedOrders);
$this->view->assign('flowOptions', []);
return $this->view->fetch('edit');
@@ -94,6 +95,7 @@ class Invoice extends Backend
if (false === $this->request->isPost()) {
$linkedOrders = InvoiceService::fetchLinkedOrders((string)$row['order_ids'], (int)$row['id']);
$this->view->assign('row', $row);
$this->view->assign('invoiceIsImage', $this->isInvoiceImage((string)$row['invoice_file']));
$this->view->assign('linkedOrders', $linkedOrders);
$this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []);
return $this->view->fetch();
@@ -169,6 +171,14 @@ class Invoice extends Backend
$this->success();
}
/** 判断发票附件是否为可直接显示的图片,忽略 URL 查询参数。 */
protected function isInvoiceImage($file)
{
$path = parse_url($file, PHP_URL_PATH);
$extension = strtolower(pathinfo(is_string($path) ? $path : '', PATHINFO_EXTENSION));
return in_array($extension, ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp'], true);
}
/**
* 开票申请仅由用户/商户端发起,禁止后台手工添加
*/

查看文件

@@ -670,18 +670,13 @@ class Order extends Backend
unset($appeal);
// 10. 微信支付与原路退款交易流水(含失败错误码及中文诊断原因)
$sceneMap = [
'order' => '主订单支付',
'quote' => '选定师傅报价',
'diff' => '增项补差价',
'batch' => '批量下单',
];
$sceneMap = (new \app\admin\model\PayOrder)->getSceneList();
$payOrders = Db::name('pay_order')
->where('order_id', (int)$row['id'])
->order('id desc')
->select();
foreach ($payOrders as &$poItem) {
$poItem['scene_text'] = $sceneMap[$poItem['scene'] ?? ''] ?? ($poItem['scene'] ?? '-');
$poItem['scene_text'] = $sceneMap[$poItem['scene'] ?? ''] ?? '未知场景';
$poItem['status_text'] = \app\common\library\PaymentService::payOrderStatusLabel($poItem['status'] ?? '');
$poItem['refund_status_text'] = \app\common\library\PaymentService::refundStatusLabel($poItem['refund_status'] ?? 'none');
$poItem['payment_type_text'] = OrderDetailDisplay::paymentRecordType($poItem);
@@ -849,7 +844,9 @@ class Order extends Backend
$orderRefunded = 0.00;
$orderRefundable = 0.00;
$sceneMap = (new \app\admin\model\PayOrder)->getSceneList();
foreach ($payRows as &$po) {
$po['scene_text'] = $sceneMap[$po['scene'] ?? ''] ?? '未知场景';
$po['status_text'] = \app\common\library\PaymentService::payOrderStatusLabel($po['status']);
$po['refund_total'] = round((float)$po['refund_amount'], 2);
$po['refund_left'] = round((float)$po['amount'] - (float)$po['refund_amount'], 2);
@@ -872,11 +869,12 @@ class Order extends Backend
} elseif ((int)$order['settle_status'] === 1) {
$blockReason = '该工单已完成向师傅结算分账,不允许售后退款(请先与师傅线下协商追回)';
} elseif (!$hasWxPayRows) {
$blockReason = '该订单为 mock/月结等线下渠道支付,无微信支付流水,无法线上原路退款,请联系财务线下人工处理并登记';
$blockReason = '该订单无可用的线上支付流水,无法线上原路退款,请联系财务线下人工处理并登记';
} elseif ($orderRefundable <= 0) {
$blockReason = '该订单的支付流水已全部退款,无可退余额';
}
$this->view->assign('row', $order);
$this->view->assign('paymentTypeLabel', OrderDetailDisplay::paymentType($order['pay_type'] ?? ''));
$this->view->assign('payRows', $payRows);
$this->view->assign('orderRefunded', $orderRefunded);
$this->view->assign('orderRefundable', $orderRefundable);

查看文件

@@ -42,28 +42,43 @@ class PayOrder extends Backend
*/
public function index()
{
$rechargeOnly = strtolower($this->request->action()) === 'recharges';
$this->request->filter(['strip_tags', 'trim']);
if (false === $this->request->isAjax()) {
$this->view->assign('rechargeOnly', $rechargeOnly);
$base = function () use ($rechargeOnly) {
$query = Db::name('pay_order');
return $rechargeOnly ? $query->where('scene', 'recharge') : $query;
};
$stats = [
'total_count' => $this->model->count(),
'total_paid_amount' => (float)$this->model->whereIn('status', ['paid', 'refunded', 'refunding', 'refund_failed'])->sum('amount'),
'total_refund_amount' => (float)$this->model->sum('refund_amount'),
'refunding_count' => $this->model->where('status', 'refunding')->whereOr('refund_status', 'processing')->count(),
'abnormal_count' => $this->model->whereIn('status', ['pay_failed', 'refund_failed'])->whereOr('refund_status', 'abnormal')->count(),
'total_count' => $base()->count(),
'total_paid_amount' => (float)$base()->whereIn('status', ['paid', 'refunded', 'refunding', 'refund_failed'])->sum('amount'),
'total_refund_amount' => (float)$base()->sum('refund_amount'),
'refunding_count' => $base()->where(function ($q) { $q->where('status', 'refunding')->whereOr('refund_status', 'processing'); })->count(),
'abnormal_count' => $base()->where(function ($q) { $q->whereIn('status', ['pay_failed', 'refund_failed'])->whereOr('refund_status', 'abnormal'); })->count(),
];
$this->view->assign('stats', $stats);
return $this->view->fetch();
return $this->view->fetch('index');
}
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
$list = $this->model
$query = $this->model
->with(['order', 'user'])
->where($where)
->where($where);
if ($rechargeOnly) {
$query->where('pay_order.scene', 'recharge');
}
$list = $query
->order($sort, $order)
->paginate($limit);
$result = ['total' => $list->total(), 'rows' => $list->items()];
return json($result);
}
public function recharges()
{
return $this->index();
}
/**
* 主动向微信查询该笔流水的最新支付/退款状态并落库
*/
@@ -136,14 +151,8 @@ class PayOrder extends Backend
$user = $userId ? Db::name('user')->where('id', $userId)->field('id,nickname,username,mobile,avatar')->find() : null;
$refundableAmount = round((float)$row['amount'] - (float)$row['refund_amount'], 2);
$sceneMap = [
'order' => '订单支付',
'quote' => '报价支付',
'diff' => '增项补差',
'batch' => '批次支付',
'recharge' => '用户充值'
];
$sceneText = $sceneMap[$row['scene']] ?? $row['scene'];
$sceneMap = $this->model->getSceneList();
$sceneText = $sceneMap[$row['scene']] ?? '未知场景';
$this->view->assign('row', $row);
$this->view->assign('order', $order ?: []);

查看文件

@@ -218,6 +218,7 @@ class Settle extends Backend
'order' => $order ?: [],
'master' => $master ?: [],
'walletLogs' => $walletLogs,
'walletTypeList' => (new \app\admin\model\WalletLog)->getTypeList(),
]);
}
}

查看文件

@@ -102,6 +102,8 @@ class Withdraw extends Backend
'master' => $master ?: [],
'recentSettles' => $recentSettles,
'walletLogs' => $walletLogs,
'verifyStatusList' => ['pending' => '审核中', 'pass' => '已认证', 'reject' => '审核未通过'],
'walletTypeList' => (new \app\admin\model\WalletLog)->getTypeList(),
]);
return $this->view->fetch();
}

查看文件

@@ -205,6 +205,7 @@ class User extends Backend
'recentOrders' => $recentOrders,
'coupons' => $coupons,
'recentWalletLogs' => $recentWalletLogs,
'walletTypeList' => (new \app\admin\model\WalletLog)->getTypeList(),
'orderCount' => (int)($orderAgg['total_cnt'] ?? 0),
'totalSpent' => number_format((float)($orderAgg['total_spent'] ?? 0), 2, '.', ''),
]);

查看文件

@@ -30,7 +30,7 @@ class PayOrder extends Model
*/
public function getStatusList()
{
return ['pending' => '待支付', 'paid' => '已支付', 'refunded' => '已退款', 'refunding' => '退款处理中', 'refund_failed' => '退款失败', 'closed' => '已关闭'];
return ['pending' => '待支付', 'paid' => '已支付', 'pay_failed' => '支付失败', 'refunded' => '已退款', 'refunding' => '退款处理中', 'refund_failed' => '退款失败', 'closed' => '已关闭'];
}
public function getStatusTextAttr($value, $data)
@@ -60,7 +60,7 @@ class PayOrder extends Model
*/
public function getSceneList()
{
return ['order' => '订单支付', 'prepay' => '预付款充值'];
return ['order' => '订单支付', 'quote' => '报价支付', 'diff' => '增项补差', 'batch' => '批次支付', 'recharge' => '用户在线充值', 'prepay' => '预付款充值'];
}
public function getSceneTextAttr($value, $data)

查看文件

@@ -14,12 +14,12 @@
<div class="appeal-card-hd">
<i class="fa fa-gavel text-warning"></i> 申诉工单概览 #AP{$row.id}
<span class="pull-right label {if $row.status=='done'}label-success{elseif $row.status=='reject'/}label-danger{elseif $row.status=='handling'/}label-info{else/}label-warning{/if}">
{$statusList[$row.status]|default=$row.status|htmlentities}
{$statusList[$row.status]|default='未知状态'|htmlentities}
</span>
</div>
<div class="appeal-card-bd">
<div class="row">
<div class="col-sm-6 appeal-kv"><span class="k">申诉类型:</span><span class="label label-primary">{$typeList[$row.type]|default=$row.type|htmlentities}</span></div>
<div class="col-sm-6 appeal-kv"><span class="k">申诉类型:</span><span class="label label-primary">{$typeList[$row.type]|default='未知类型'|htmlentities}</span></div>
<div class="col-sm-6 appeal-kv"><span class="k">提交时间:</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
<div class="col-sm-6 appeal-kv"><span class="k">申诉师傅:</span><strong>{$master.realname|default='-'|htmlentities}</strong> {if !empty($master.mobile)}({$master.mobile|htmlentities}){/if}</div>
<div class="col-sm-6 appeal-kv"><span class="k">师傅评分:</span>
@@ -50,7 +50,7 @@
{if !empty($order)}
<div class="row">
<div class="col-sm-6 appeal-kv"><span class="k">关联单号:</span><code>{$order.order_no|htmlentities}</code></div>
<div class="col-sm-6 appeal-kv"><span class="k">工单状态:</span><span class="label label-default">{$orderStatusMap[$order.status]|default=$order.status}</span></div>
<div class="col-sm-6 appeal-kv"><span class="k">工单状态:</span><span class="label label-default">{$orderStatusMap[$order.status]|default='未知状态'}</span></div>
<div class="col-sm-6 appeal-kv"><span class="k">服务项目:</span>{$order.service_name|default='-'|htmlentities} {if $order.goods_model}({$order.goods_model|htmlentities}){/if}</div>
<div class="col-sm-6 appeal-kv"><span class="k">实付金额:</span><strong class="text-danger">¥{$order.pay_amount|default='0.00'|htmlentities}</strong>(师傅结算:¥{$order.settle_amount|default='0.00'|htmlentities})</div>
<div class="col-sm-6 appeal-kv"><span class="k">下单雇主:</span>{$order.contact|default='-'|htmlentities}({$order.mobile|default='-'|htmlentities})</div>
@@ -100,7 +100,7 @@
<div class="appeal-card" style="margin-bottom:0;">
<div class="appeal-card-hd"><i class="fa fa-check-circle text-success"></i> 平台仲裁答复记录</div>
<div class="appeal-card-bd">
<div class="appeal-kv"><span class="k">处理状态:</span><strong>{$statusList[$row.status]|default=$row.status|htmlentities}</strong></div>
<div class="appeal-kv"><span class="k">处理状态:</span><strong>{$statusList[$row.status]|default='未知状态'|htmlentities}</strong></div>
<div class="appeal-kv"><span class="k">更新时间:</span>{:date('Y-m-d H:i:s', $row.updatetime)}</div>
<div class="appeal-kv" style="margin-bottom:0;">
<span class="k">官方答复:</span>

查看文件

@@ -23,7 +23,7 @@
<label class="control-label col-xs-12 col-sm-4">申诉类型:</label>
<div class="col-xs-12 col-sm-8">
<p class="form-control-static">
<span class="label label-warning">{$typeList[$row.type]|default=$row.type|htmlentities}</span>
<span class="label label-warning">{$typeList[$row.type]|default='未知类型'|htmlentities}</span>
<small class="text-muted" style="margin-left:8px;">提交于 {:date('Y-m-d H:i', $row.createtime)}</small>
</p>
</div>
@@ -39,7 +39,7 @@
<div class="col-xs-12 col-sm-8">
<p class="form-control-static">
<code>{$order.order_no|htmlentities}</code>
<span class="label label-default" style="margin-left:4px;">{$orderStatusMap[$order.status]|default=$order.status}</span>
<span class="label label-default" style="margin-left:4px;">{$orderStatusMap[$order.status]|default='未知状态'}</span>
</p>
</div>
</div>

查看文件

@@ -14,7 +14,7 @@
<div class="cpn-card-hd">
<i class="fa fa-ticket text-warning"></i> {$row.name|htmlentities}
<span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
{$statusList[$row.status]|default=$row.status}
{$statusList[$row.status]|default='未知状态'}
</span>
</div>
<div class="cpn-card-bd">

查看文件

@@ -1,4 +1,11 @@
<script>require.config.site.version += "-invoice-flow-20261120";</script>
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
{if condition="!empty($flowOptions)"}
<div class="alert alert-info" style="line-height:1.8;margin-bottom:15px">
<strong>处理步骤:</strong>① 核对下方申请信息和订单 → ② 在税务开票系统开具发票 → ③ 回到本页填写发票号码并上传文件。<br>
本页面只登记开票结果,不会自动开票或发送邮件。无法开票时请选择驳回并填写原因。
</div>
{/if}
<!-- 1. 开票申请信息(只读) -->
<div class="panel panel-default panel-form-section">
@@ -28,7 +35,7 @@
<p class="form-control-static">
<strong class="text-danger" style="font-size:15px">¥{$row.amount|htmlentities}</strong>
<span class="label {if $row.type == 'special'}label-warning{else/}label-info{/if}" style="margin-left:6px">
{$typeList[$row.type]|default=$row.type}
{$typeList[$row.type]|default='未知类型'}
</span>
<span class="label label-default" style="margin-left:4px">
{$titleTypeList[$row.title_type]|default='个人/非企业'}
@@ -178,7 +185,7 @@
<h4 class="panel-title"><i class="fa fa-file-text-o"></i> 财务开票处理</h4>
</div>
<div class="panel-body">
<p class="text-muted" style="margin-top:0">线上开具数电发票后标记「开票完成」,填写发票号码并可上传电子发票原件(PDF/图片),申请人即可在小程序直接预览下载;无法开票时请驳回并说明原因,额度及关联订单将自动释放。</p>
<p class="text-muted" style="margin-top:0;line-height:1.8">请先在税务开票系统开具发票,再登记结果。提交后状态不能在此修改,请核对发票号码和文件。</p>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">处理结果:</label>
@@ -186,20 +193,22 @@
<div class="radio" style="margin-top:5px">
{foreach name="flowOptions" item="op"}
{if $op == 'issued'}
<label style="margin-right:18px"><input name="row[status]" type="radio" value="issued" checked /> 开票完成</label>
<label style="margin-right:18px"><input name="row[status]" type="radio" value="issued" checked /> 已在税务系统开票,登记结果</label>
{elseif $op == 'reject' /}
<label><input name="row[status]" type="radio" value="reject" /> 驳回(释放额度与订单)</label>
<label><input name="row[status]" type="radio" value="reject" /> 无法开票,驳回申请</label>
{/if}
{/foreach}
</div>
</div>
</div>
<p id="invoice-issued-hint" class="text-muted" style="margin:0 0 18px 16.7%">填写真实发票号码,建议上传原件供申请人在小程序查看和下载。</p>
<p id="invoice-reject-hint" class="text-muted" style="display:none;margin:0 0 18px 16.7%">驳回后将释放开票额度和关联订单,请在处理说明中填写原因。</p>
<div id="box-issued-fields">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">发票号码:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-invoice_no" class="form-control" name="row[invoice_no]" type="text" value="{$row.invoice_no|htmlentities}" placeholder="必填:请输入数电发票号码(20位)或传统发票号码">
<input id="c-invoice_no" class="form-control" name="row[invoice_no]" type="text" value="{$row.invoice_no|htmlentities}" placeholder="必填:填写税务系统开具的真实发票号码">
</div>
</div>
@@ -214,13 +223,14 @@
<label class="control-label col-xs-12 col-sm-2">电子发票文件:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-invoice_file" class="form-control" size="50" name="row[invoice_file]" type="text" value="{$row.invoice_file|htmlentities}" placeholder="支持上传 PDF / OFD / PNG / JPG 格式电子发票原件">
<input id="c-invoice_file" class="form-control" size="50" name="row[invoice_file]" type="text" value="{$row.invoice_file|htmlentities}" placeholder="上传后自动填写文件地址(选填)" readonly>
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-invoice_file" class="btn btn-danger faupload" data-category="invoice" data-input-id="c-invoice_file" data-mimetype="pdf,ofd,jpg,jpeg,png,webp" data-multiple="false" data-preview-id="p-invoice_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-invoice_file" class="btn btn-primary fachoose" data-input-id="c-invoice_file" data-mimetype="application/pdf,image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
<span><button type="button" id="faupload-invoice_file" class="btn btn-danger faupload" data-category="invoice" data-input-id="c-invoice_file" data-mimetype="pdf,ofd,jpg,jpeg,png,webp" data-multiple="false" data-preview-id="p-invoice_file"><i class="fa fa-upload"></i> 上传本地发票</button></span>
<span><button type="button" id="fachoose-invoice_file" class="btn btn-primary fachoose" data-input-id="c-invoice_file" data-mimetype="application/pdf,image/*" data-multiple="false"><i class="fa fa-list"></i> 从附件库选择</button></span>
</div>
<span class="msg-box n-right" for="c-invoice_file"></span>
</div>
<p class="help-block">支持 PDF、OFD、JPG、PNG、WEBP。未上传文件时,申请人无法在线查看或下载;提交后不能在此补传。</p>
<ul class="row list-inline faupload-preview" id="p-invoice_file"></ul>
</div>
</div>
@@ -238,7 +248,7 @@
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
<button type="submit" id="invoice-submit" class="btn btn-primary btn-embossed disabled">确认登记开票结果</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
@@ -253,7 +263,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-4">当前状态:</label>
<div class="col-xs-12 col-sm-8">
<p class="form-control-static"><strong>{$statusList[$row.status]|default=$row.status}</strong></p>
<p class="form-control-static"><strong>{$statusList[$row.status]|default='未知状态'}</strong></p>
</div>
</div>
</div>
@@ -272,8 +282,16 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">电子发票原件:</label>
<div class="col-xs-12 col-sm-10">
{if $invoiceIsImage}
<div style="margin:8px 0 12px">
<a href="{$row.invoice_file|cdnurl|htmlentities}" target="_blank" rel="noopener noreferrer" class="js-image-preview-link" title="点击查看大图">
<img src="{$row.invoice_file|cdnurl|htmlentities}" alt="电子发票图片,点击查看大图" style="display:block;max-width:100%;max-height:480px;width:auto;height:auto;border:1px solid #e4e8ed;border-radius:4px">
</a>
<p class="help-block">点击图片可查看大图</p>
</div>
{/if}
<p class="form-control-static">
<a href="{$row.invoice_file|cdnurl|htmlentities}" target="_blank" class="btn btn-xs btn-info js-image-preview-if-image"><i class="fa fa-download"></i> 查看/下载电子发票</a>
<a href="{$row.invoice_file|cdnurl|htmlentities}" target="_blank" rel="noopener noreferrer" class="btn btn-xs btn-info"><i class="fa fa-external-link"></i> 打开电子发票原件</a>
</p>
</div>
</div>

查看文件

@@ -13,12 +13,12 @@
<i class="fa fa-address-card-o text-primary"></i> {$row.title|htmlentities}
{if $row.is_default}<span class="label label-success" style="margin-left:6px;">默认抬头</span>{/if}
<span class="pull-right label {if $row.title_type=='enterprise'}label-primary{else/}label-default{/if}">
{$titleTypeList[$row.title_type]|default=$row.title_type}
{$titleTypeList[$row.title_type]|default='未知类型'}
</span>
</div>
<div class="it-card-bd">
<div class="row">
<div class="col-sm-6 it-kv"><span class="k">默认票种:</span>{$invoiceTypeList[$row.default_invoice_type]|default=$row.default_invoice_type}</div>
<div class="col-sm-6 it-kv"><span class="k">默认票种:</span>{$invoiceTypeList[$row.default_invoice_type]|default='未知类型'}</div>
<div class="col-sm-6 it-kv"><span class="k">纳税人识别号:</span>{if $row.tax_no}<code>{$row.tax_no|htmlentities}</code>{else/}<span class="text-muted">-</span>{/if}</div>
<div class="col-sm-6 it-kv"><span class="k">归属用户:</span>{$row.user.nickname|default=$row.user.username|default='-'|htmlentities}</div>
<div class="col-sm-6 it-kv"><span class="k">归属签约企业:</span>{if $row.merchant_id}{$row.merchant.name|default='-'|htmlentities}{else/}<span class="text-muted">个人业主抬头</span>{/if}</div>

查看文件

@@ -8,11 +8,11 @@
<div class="row" style="margin-bottom:10px;line-height:1.8;">
<div class="col-sm-6">
<span class="text-muted">接收端类型:</span>
<span class="label {if $row.receive_type=='master'}label-warning{else/}label-info{/if}">{$receiveTypeList[$row.receive_type]|default=$row.receive_type}</span>
<span class="label {if $row.receive_type=='master'}label-warning{else/}label-info{/if}">{$receiveTypeList[$row.receive_type]|default='未知类型'}</span>
</div>
<div class="col-sm-6">
<span class="text-muted">消息分类:</span>
<span class="label label-default">{$typeList[$row.type]|default=$row.type}</span>
<span class="label label-default">{$typeList[$row.type]|default='未知类型'}</span>
</div>
<div class="col-sm-6">
<span class="text-muted">接收人信息:</span>

查看文件

@@ -37,7 +37,7 @@
</div>
<div class="as-meta">
<div><strong>下单客户:</strong>{$row.user.nickname|default=$row.user.username|htmlentities}({$row.mobile|htmlentities}) <strong>承接师傅:</strong>{if $row.master_id && $row.master}{$row.master.realname|htmlentities}{else/}<span class="text-muted">未指派</span>{/if}</div>
<div><strong>订单实付:</strong>¥{$row.pay_amount|htmlentities} <strong>支付渠道:</strong>{$row.pay_type|htmlentities} <strong>结算状态:</strong>{if $row.settle_status == 1}<span class="text-danger">已向师傅结算</span>{else/}<span class="text-success">未结算(可安全退款)</span>{/if}</div>
<div><strong>订单实付:</strong>¥{$row.pay_amount|htmlentities} <strong>支付渠道:</strong>{$paymentTypeLabel|htmlentities} <strong>结算状态:</strong>{if $row.settle_status == 1}<span class="text-danger">已向师傅结算</span>{else/}<span class="text-success">未结算(可安全退款)</span>{/if}</div>
</div>
</div>
@@ -76,7 +76,7 @@
{foreach name="payRows" item="po"}
<tr>
<td style="font-family:monospace;">{$po.out_trade_no|htmlentities}</td>
<td>{$po.scene|htmlentities}</td>
<td>{$po.scene_text|htmlentities}</td>
<td style="font-family:monospace;">¥{$po.amount}</td>
<td style="font-family:monospace;color:#dc2626;">¥{$po.refund_total}</td>
<td style="font-family:monospace;color:#16a34a;">¥{$po.refund_left}</td>
@@ -84,7 +84,7 @@
</tr>
{/foreach}
{else /}
<tr><td colspan="6" style="text-align:center;color:#94a3b8;padding:14px;">该订单无有效微信支付流水(如为 mock/月结渠道订单请线下人工处理)</td></tr>
<tr><td colspan="6" style="text-align:center;color:#94a3b8;padding:14px;">该订单无有效线上支付流水,请联系财务核实处理</td></tr>
{/if}
</tbody>
</table>

查看文件

@@ -241,7 +241,7 @@
<label class="control-label col-xs-12 col-sm-2">计价与支付:</label>
<div class="col-xs-12 col-sm-8">
<p class="form-control-static">
计价模式:<span class="label label-primary">{$priceTypeList[$row.price_type]|default=$row.price_type|htmlentities}</span>
计价模式:<span class="label label-primary">{$priceTypeList[$row.price_type]|default='未知类型'|htmlentities}</span>
<span class="text-muted" style="margin:0 10px;">|</span>
支付状态:
{if $row.pay_status == 1}<span class="label label-success">已支付</span>

查看文件

@@ -654,7 +654,7 @@
<i class="fa fa-refresh"></i> 同步微信状态
</button>
{/if}
{if ($row.status == 'refund_failed' || ($row.status == 'paid' && $refundableAmount > 0)) && $refundableAmount > 0}
{if $row.scene != 'recharge' && ($row.status == 'refund_failed' || ($row.status == 'paid' && $refundableAmount > 0)) && $refundableAmount > 0}
<button type="button" class="btn btn-danger js-action-retry" data-id="{$row.id}">
<i class="fa fa-undo"></i> 重发原路退款 (¥{$refundableAmount})
</button>

查看文件

@@ -187,7 +187,7 @@
</div>
<div class="po-guide-body">
<strong>操作指引:</strong>
展示全站微信支付与原路退款记录。若记录长期显示“退款处理中”,可点击【同步微信】获取最新到账结果;若遇“退款失败”或有可退余额,可点击【重发退款】发起原路退回,系统会自动核实已退金额,避免重复退款。
{if $rechargeOnly}展示用户微信在线充值记录。充值退款功能正在完善,暂不可通过退款台账发起充值退款。{else /}展示全站微信支付与原路退款记录。充值流水暂不可通过此处发起退款。{/if}
</div>
</div>
@@ -195,7 +195,7 @@
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="刷新"><i class="fa fa-refresh"></i> 刷新</a>
<button type="button" id="js-sync-pay-order" class="btn btn-info btn-disabled disabled"><i class="fa fa-exchange"></i> 批量同步微信状态</button>
<button type="button" id="js-retry-refund" class="btn btn-danger btn-disabled disabled"><i class="fa fa-undo"></i> 批量重发原路退款</button>
{if !$rechargeOnly}<button type="button" id="js-retry-refund" class="btn btn-danger btn-disabled disabled"><i class="fa fa-undo"></i> 批量重发原路退款</button>{/if}
</div>
<!-- 表格 -->

查看文件

@@ -13,7 +13,7 @@
<div class="rev-card-hd">
<i class="fa fa-star text-warning"></i> 服务评价详情 #RV{$row.id}
<span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
{$statusList[$row.status]|default=$row.status|htmlentities}
{$statusList[$row.status]|default='未知状态'|htmlentities}
</span>
</div>
<div class="rev-card-bd">

查看文件

@@ -16,7 +16,7 @@
<div class="stl-card-hd">
<i class="fa fa-calculator text-primary"></i> 结算单清分凭证 #ST{$row.id}
<span class="pull-right label {if $row.status=='settled'}label-success{elseif $row.status=='offline'/}label-info{else/}label-warning{/if}">
{$statusList[$row.status]|default=$row.status|htmlentities}
{$statusList[$row.status]|default='未知状态'|htmlentities}
</span>
</div>
<div class="stl-card-bd">
@@ -77,7 +77,7 @@
{volist name="walletLogs" id="wl"}
<tr>
<td>#{$wl.id}</td>
<td><span class="label label-success">{$wl.type|htmlentities}</span></td>
<td><span class="label label-success">{$walletTypeList[$wl.type]|default='未知类型'|htmlentities}</span></td>
<td class="text-success"><strong>+¥{$wl.amount|htmlentities}</strong></td>
<td>¥{$wl.balance|htmlentities}</td>
<td>{$wl.remark|htmlentities}</td>

查看文件

@@ -105,7 +105,7 @@
<div class="panel panel-default panel-form-section">
<div class="panel-body">
<p class="text-muted" style="margin-bottom:0;">
<i class="fa fa-lock"></i> 该结算单已于 {:$row.settle_time ? date('Y-m-d H:i:s', $row.settle_time) : '-'} 归档(状态:<strong>{$statusList[$row.status]|default=$row.status}</strong>),账务已锁定。
<i class="fa fa-lock"></i> 该结算单已于 {:$row.settle_time ? date('Y-m-d H:i:s', $row.settle_time) : '-'} 归档(状态:<strong>{$statusList[$row.status]|default='未知状态'}</strong>),账务已锁定。
</p>
</div>
</div>

查看文件

@@ -13,7 +13,7 @@
<div class="sc-card-hd">
<i class="fa fa-camera text-primary"></i> 业主公开晒单详情 #SC{$row.id}
<span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
{$statusList[$row.status]|default=$row.status}
{$statusList[$row.status]|default='未知状态'}
</span>
</div>
<div class="sc-card-bd">

查看文件

@@ -151,10 +151,10 @@
<tr>
<td><code>#WL{$wl.id}</code></td>
<td>
{if $wl.type=='recharge'}<span class="label label-success">{if !empty($wl.voucher)}后台充值{else/}微信充值{/if}</span>
{if $wl.type=='recharge'}<span class="label label-success">账户充值</span>
{elseif $wl.type=='consume'/}<span class="label label-warning">余额消费</span>
{elseif $wl.type=='refund'/}<span class="label label-info">原路退款</span>
{else/}<span class="label label-default">{$wl.type}</span>{/if}
{elseif $wl.type=='refund'/}<span class="label label-info">退回/退款</span>
{else/}<span class="label label-default">{$walletTypeList[$wl.type]|default='未知类型'|htmlentities}</span>{/if}
</td>
<td style="font-weight:700;{if $wl.amount > 0}color:#16a34a;{else/}color:#1f1f1f;{/if}">
{if $wl.amount > 0}+{/if}¥{:number_format($wl.amount, 2)}

查看文件

@@ -11,7 +11,7 @@
<div class="wl-card">
<div class="wl-card-hd">
<i class="fa fa-exchange text-primary"></i> 资金流水审计凭证 #WL{$row.id}
<span class="pull-right label label-info">{if !empty($recharge)}后台充值{else/}{$typeList[$row.type]|default=$row.type}{/if}</span>
<span class="pull-right label label-info">{if !empty($recharge)}后台充值{else/}{$typeList[$row.type]|default='未知类型'|htmlentities}{/if}</span>
</div>
<div class="wl-card-bd">
<div class="row">
@@ -27,7 +27,7 @@
</div>
<div class="col-sm-6 wl-kv"><span class="k">变动后余额:</span><strong>¥{$row.balance|htmlentities}</strong></div>
<div class="col-sm-6 wl-kv"><span class="k">记账时间:</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
<div class="col-sm-6 wl-kv"><span class="k">账户归属端:</span>{$userTypeList[$row.user_type]|default=$row.user_type}</div>
<div class="col-sm-6 wl-kv"><span class="k">账户归属端:</span>{$userTypeList[$row.user_type]|default='未知类型'}</div>
<div class="col-sm-12 wl-kv" style="margin-bottom:0;"><span class="k">记账摘要:</span>{$row.remark|default='-'|htmlentities}</div>
</div>
</div>

查看文件

@@ -16,7 +16,7 @@
<div class="wd-card-hd">
<i class="fa fa-rmb text-danger"></i> 提现申请单 #WD{$row.id}
<span class="pull-right label {if $row.status=='done'}label-success{elseif $row.status=='pass'/}label-info{elseif $row.status=='reject'/}label-danger{else/}label-warning{/if}">
{$statusList[$row.status]|default=$row.status|htmlentities}
{$statusList[$row.status]|default='未知状态'|htmlentities}
</span>
</div>
<div class="wd-card-bd">
@@ -26,12 +26,12 @@
<div class="col-xs-4"><div class="wd-stat"><div class="lbl">应打款到账净额</div><div class="val text-danger">¥{$row.arrive_amount|htmlentities}</div></div></div>
</div>
<div class="row">
<div class="col-sm-6 wd-kv"><span class="k">提现渠道:</span><span class="label label-primary">{$channelList[$row.channel]|default=$row.channel|htmlentities}</span></div>
<div class="col-sm-6 wd-kv"><span class="k">提现渠道:</span><span class="label label-primary">{$channelList[$row.channel]|default='未知类型'|htmlentities}</span></div>
<div class="col-sm-6 wd-kv"><span class="k">收款账号:</span><code>{$row.account|default='微信零钱'|htmlentities}</code></div>
{if !empty($row.out_bill_no)}
<div class="col-sm-6 wd-kv"><span class="k">商户转账单:</span><code>{$row.out_bill_no|htmlentities}</code></div>
<div class="col-sm-6 wd-kv"><span class="k">微信转账单:</span><code>{$row.transfer_bill_no|default='-'|htmlentities}</code></div>
<div class="col-sm-6 wd-kv"><span class="k">微信转账态:</span><span class="label label-info">{$row.transfer_state_text|default=$row.transfer_state|htmlentities}</span></div>
<div class="col-sm-6 wd-kv"><span class="k">微信转账态:</span><span class="label label-info">{$row.transfer_state_text|default='状态未记录'|htmlentities}</span></div>
<div class="col-sm-6 wd-kv"><span class="k">确认收款时:</span>{if $row.confirm_time}{:date('Y-m-d H:i:s', $row.confirm_time)}{else/}-{/if}</div>
{/if}
{if !empty($row.fail_reason) || !empty($row.fail_code)}
@@ -62,7 +62,7 @@
<div class="col-sm-6 wd-kv"><span class="k">师傅姓名:</span><strong>{$master.realname|htmlentities}</strong>({$master.mobile|htmlentities})</div>
<div class="col-sm-6 wd-kv">
<span class="k">实名状态:</span>
{if $master.verify_status=='pass'}<span class="label label-success">已实名认证</span>{else/}<span class="label label-warning">{$master.verify_status|htmlentities}</span>{/if}
{if $master.verify_status=='pass'}<span class="label label-success">已实名认证</span>{else/}<span class="label label-warning">{$verifyStatusList[$master.verify_status]|default='未知状态'|htmlentities}</span>{/if}
</div>
<div class="col-sm-6 wd-kv"><span class="k">当前可用余额:</span><strong class="text-success">¥{$master.money|default='0.00'|htmlentities}</strong></div>
<div class="col-sm-6 wd-kv"><span class="k">当前提现冻结:</span><strong class="text-warning">¥{$master.frozen_money|default='0.00'|htmlentities}</strong></div>
@@ -129,7 +129,7 @@
<tbody>
{volist name="walletLogs" id="wl"}
<tr>
<td><code>{$wl.type|htmlentities}</code></td>
<td><code>{$walletTypeList[$wl.type]|default='未知类型'|htmlentities}</code></td>
<td class="{if $wl.amount >= 0}text-success{else/}text-danger{/if}"><strong>{$wl.amount|htmlentities}</strong></td>
<td>¥{$wl.balance|htmlentities}</td>
<td>{$wl.remark|htmlentities}</td>

查看文件

@@ -37,7 +37,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-4">结算账户:</label>
<div class="col-xs-12 col-sm-8">
<p class="form-control-static">{$channelList[$row.channel]|default=$row.channel} · {$row.account|default='微信零钱'|htmlentities}</p>
<p class="form-control-static">{$channelList[$row.channel]|default='未知类型'} · {$row.account|default='微信零钱'|htmlentities}</p>
</div>
</div>
</div>

查看文件

@@ -883,6 +883,9 @@ class PaymentService
if (!$po) {
throw new \InvalidArgumentException('支付交易单不存在');
}
if ($po['scene'] === 'recharge') {
throw new \InvalidArgumentException('充值退款须使用专用退款流程,通用退款入口已禁用');
}
if ($po['status'] === 'refunded') {
return $po;
}

查看文件

@@ -4,7 +4,7 @@ return array (
'name' => '优匠优服',
'beian' => '',
'cdnurl' => '',
'version' => '1.0.92',
'version' => '1.0.94',
'timezone' => 'Asia/Shanghai',
'forbiddenip' => '',
'languages' =>

查看文件

@@ -40,7 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
}},
{field: 'type', title: __('Type'), searchList: {"misjudge":__('Misjudge'),"review":__('Review'),"deduct":__('Deduct'),"other":__('Other'),"aftersale":'用户售后退款'}, formatter: function (val, row) {
// 使用模型 type_text 追加属性,保证新增申诉类型与文案单一来源
var text = row.type_text || val;
var text = row.type_text || '未知类型';
var clsMap = {misjudge: 'warning', review: 'info', deduct: 'danger', other: 'default', aftersale: 'danger'};
return '<span class="label label-' + (clsMap[val] || 'default') + '">' + Fast.api.escape(text) + '</span>';
}, custom: {misjudge: 'warning', review: 'info', deduct: 'danger', other: 'default', aftersale: 'danger'}},

查看文件

@@ -69,10 +69,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
var val = $(this).val();
if (val === 'reject') {
$('#box-issued-fields').slideUp(150);
$('#invoice-issued-hint').hide();
$('#invoice-reject-hint').show();
$('#invoice-submit').text('确认驳回申请');
} else {
$('#box-issued-fields').slideDown(150);
$('#invoice-issued-hint').show();
$('#invoice-reject-hint').hide();
$('#invoice-submit').text('确认登记开票结果');
}
});
$('#edit-form').on('reset', function () {
setTimeout(function () {
$('input[name="row[status]"]:checked').trigger('change');
}, 0);
});
Controller.api.bindevent();
},
detail: function () {

查看文件

@@ -104,7 +104,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
} else if (val === 'reject') {
return '<span class="label label-danger" title="' + (row.audit_msg || '') + '"><i class="fa fa-times-circle"></i> 已驳回</span>';
}
return val || '-';
return val ? '未知状态' : '-';
}
},
{field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},

查看文件

@@ -79,7 +79,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
}},
{field: 'price_type', visible: false, title: '计价方式', operate: false, formatter: function (val) {
var labels = {quote: '报价', custom: '自定', fixed: '一口价'};
return escapeText(labels[val] || val);
return escapeText(labels[val] || '未知类型');
}},
{
field: 'status',

查看文件

@@ -5,7 +5,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'pay_order/index' + location.search,
index_url: (/(?:\/|^)recharges(?:\.html)?(?:\/|$)/i.test(location.pathname) ? 'pay_order/recharges' : 'pay_order/index') + location.search,
detail_url: 'pay_order/detail',
sync_url: 'pay_order/sync',
retryrefund_url: 'pay_order/retryrefund',
@@ -30,9 +30,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
return value ? '<a href="' + Fast.api.fixurl('order/detail/ids/' + row.order_id) + '" class="dialogit" data-title="订单详情">' + Fast.api.escape(value) + '</a>' : '—';
}},
{field: 'user.nickname', title: '支付用户', operate: 'LIKE'},
{field: 'scene', title: '业务场景', operate: '=', searchList: {'order': '订单支付', 'quote': '报价支付', 'diff': '增项补差', 'batch': '批次支付', 'recharge': '用户在线充值'}, formatter: function (value) {
var labels = {'order': '订单支付', 'quote': '报价支付', 'diff': '增项补差', 'batch': '批次支付', 'recharge': '用户在线充值'};
return Fast.api.escape(labels[value] || value || '');
{field: 'scene', title: '业务场景', operate: '=', searchList: {'order': '订单支付', 'quote': '报价支付', 'diff': '增项补差', 'batch': '批次支付', 'recharge': '用户在线充值', 'prepay': '预付款充值'}, formatter: function (value) {
var labels = {'order': '订单支付', 'quote': '报价支付', 'diff': '增项补差', 'batch': '批次支付', 'recharge': '用户在线充值', 'prepay': '预付款充值'};
return Fast.api.escape(labels[value] || '未知场景');
}},
{field: 'amount', title: '实付金额', operate: false, align: 'right', formatter: function (value) {
return '<span style="font-family:Menlo,Monaco,Consolas,monospace;font-size:13px;font-weight:700;color:#F0710D;">¥' + value + '</span>';
@@ -48,7 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
'refund_failed': ['#b91c1c', '#fee2e2', '退款失败'],
'closed': ['#94a3b8', '#f8fafc', '已关闭']
};
var item = map[value] || ['#64748b', '#f1f5f9', value];
var item = map[value] || ['#64748b', '#f1f5f9', '未知状态'];
var html = '<span class="label" style="display:inline-block;padding:2px 8px;border-radius:12px;font-size:11.5px;font-weight:600;color:' + item[0] + ';background:' + item[1] + ';border:1px solid ' + item[0] + '33;">' + item[2] + '</span>';
return html;
}},
@@ -104,7 +104,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
confirm: '确定对该笔流水重新发起微信原路退款吗?系统将自动退剩余可退金额并核实旧退款单状态。',
visible: function (row) {
var left = Number(row.amount) - Number(row.refund_amount);
return (row.status === 'refund_failed' || (row.status === 'paid' && left > 0)) && left > 0;
return row.scene !== 'recharge' && (row.status === 'refund_failed' || (row.status === 'paid' && left > 0)) && left > 0;
},
success: function (data, ret) {
table.bootstrapTable('refresh');
@@ -206,6 +206,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
});
});
},
recharges: function () {
Controller.index();
},
detail: function () {
// 流水详情弹窗事件由 detail.html 内部原生脚本统一接管
Controller.api.bindevent();

查看文件

@@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout',
var mob = row.account_mobile ? ' <small class="text-muted">(' + Fast.api.escape(row.account_mobile) + ')</small>' : '';
return '<strong>' + Fast.api.escape(v || '-') + '</strong>' + mob;
}},
{field: 'type', title: '变动类型', searchList: {"recharge":"微信充值","consume":"余额消费","refund":"退回/退款","settle":"佣金结算","withdraw":"余额提现","income":"奖励补贴"}, formatter: Table.api.formatter.label, custom: {recharge: 'success', consume: 'warning', refund: 'info', settle: 'success', withdraw: 'primary', income: 'success'}},
{field: 'type', title: '变动类型', searchList: {"recharge":"账户充值","consume":"余额消费","refund":"退回/退款","settle":"佣金结算","withdraw":"余额提现","income":"奖励补贴"}, formatter: Table.api.formatter.label, custom: {recharge: 'success', consume: 'warning', refund: 'info', settle: 'success', withdraw: 'primary', income: 'success'}},
{field: 'amount', title: '变动金额', operate: 'BETWEEN', formatter: function (v) {
var num = Number(v || 0);
if (num > 0) return '<strong class="text-success">+¥' + num.toFixed(2) + '</strong>';

查看文件

@@ -0,0 +1,21 @@
<?php
define('APP_PATH', __DIR__ . '/../server/application/');
require __DIR__ . '/../server/thinkphp/base.php';
\think\App::initCommon();
use app\common\library\PaymentService;
use think\Db;
Db::startTrans();
try {
$id = Db::name('pay_order')->insertGetId([
'out_trade_no' => 'TEST' . bin2hex(random_bytes(10)), 'order_id' => 0,
'order_no' => '', 'user_id' => 1, 'scene' => 'recharge', 'openid' => 'TEST',
'amount' => '10.00', 'status' => 'pending',
]);
try {
PaymentService::refundSinglePayOrder($id);
throw new RuntimeException('充值流水未被通用退款入口拦截');
} catch (InvalidArgumentException $e) {
if (strpos($e->getMessage(), '充值退款') === false) throw $e;
}
echo "Recharge generic refund guard passed\n";
} finally { Db::rollback(); }