diff --git a/db/finance_menu_ux_20261121.sql b/db/finance_menu_ux_20261121.sql new file mode 100644 index 0000000..a98e8c1 --- /dev/null +++ b/db/finance_menu_ux_20261121.sql @@ -0,0 +1,10 @@ +-- 调整财务菜单顺序与名称,保留原权限节点和路由。 +UPDATE fa_auth_rule SET title='工单结算', weigh=190 WHERE name='settle'; +UPDATE fa_auth_rule SET title='提现管理', weigh=180 WHERE name='withdraw'; +UPDATE fa_auth_rule SET title='充值管理', remark='充值订单与充值退款记录', weigh=170 WHERE name='pay_order/recharges'; +UPDATE fa_auth_rule SET title='充值退款记录', weigh=169 WHERE name='recharge_refund'; +UPDATE fa_auth_rule SET title='支付与退款', remark='全站支付订单及退款状态', weigh=160 WHERE name='pay_order'; +UPDATE fa_auth_rule SET title='钱包流水', weigh=150 WHERE name='wallet_log'; +UPDATE fa_auth_rule SET title='发票申请', weigh=140 WHERE name='invoice'; +UPDATE fa_auth_rule SET title='发票抬头', weigh=139 WHERE name='invoice_title'; +UPDATE fa_auth_rule SET title='财务配置', weigh=130 WHERE name='finance_config'; diff --git a/db/migrate_customer_menu_review.sql b/db/migrate_customer_menu_review.sql new file mode 100644 index 0000000..fda2a7b --- /dev/null +++ b/db/migrate_customer_menu_review.sql @@ -0,0 +1,3 @@ +-- Keep legacy routes and permissions available while simplifying the customer menu. +UPDATE fa_auth_rule SET ismenu=0, updatetime=UNIX_TIMESTAMP() WHERE name='merchant'; +UPDATE fa_auth_rule SET title='企业资质审核', ismenu=1, updatetime=UNIX_TIMESTAMP() WHERE name='merchant/certificates'; diff --git a/docs/superpowers/plans/2026-11-21-finance-ux.md b/docs/superpowers/plans/2026-11-21-finance-ux.md new file mode 100644 index 0000000..6c8869f --- /dev/null +++ b/docs/superpowers/plans/2026-11-21-finance-ux.md @@ -0,0 +1,9 @@ +# 财务管理优化实施计划 + +目标:让财务人员按真实业务状态找到待处理事项并看清资金口径,保持现有资金处理和权限规则。 + +1. 调整菜单标题及排序:支付与退款、充值订单及充值退款相邻;配置移至末尾。保留现有权限节点。 +2. 优化结算、提现与支付表格:默认保留身份、金额、状态和时间,次要字段可通过列选择恢复;修正结算时间用语。 +3. 修正支付/充值统计标题和异常分类;明确钱包流水汇总的全历史余额变动口径。 +4. 完善充值退款列表:中文状态、筛选条件保持、空状态、订单详情和充值订单入口,保留原操作权限。 +5. 检查相关 PHP/JS 语法、回归测试及浏览器页面,不执行资金交易。 diff --git a/server/application/admin/controller/PayOrder.php b/server/application/admin/controller/PayOrder.php index c16b62b..0c4a52a 100644 --- a/server/application/admin/controller/PayOrder.php +++ b/server/application/admin/controller/PayOrder.php @@ -55,7 +55,8 @@ class PayOrder extends Backend '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(), + 'abnormal_count' => $base()->where(function ($q) { $q->where('status', 'refund_failed')->whereOr('refund_status', 'abnormal'); })->count(), + 'pay_failed_count' => $base()->where('status', 'pay_failed')->count(), ]; $this->view->assign('stats', $stats); return $this->view->fetch('index'); diff --git a/server/application/admin/controller/RechargeRefund.php b/server/application/admin/controller/RechargeRefund.php index 58ec1ef..b6e0545 100644 --- a/server/application/admin/controller/RechargeRefund.php +++ b/server/application/admin/controller/RechargeRefund.php @@ -13,10 +13,18 @@ class RechargeRefund extends Backend $query = Db::name('recharge_refund')->alias('r') ->join('pay_order p', 'p.id=r.pay_order_id', 'LEFT') ->join('user u', 'u.id=r.user_id', 'LEFT') - ->field('r.*,p.out_trade_no,u.mobile,u.nickname'); + ->join('admin operator', 'operator.id=r.operator_id', 'LEFT') + ->join('admin reviewer', 'reviewer.id=r.reviewer_id', 'LEFT') + ->field('r.*,p.out_trade_no,u.mobile,u.nickname,operator.nickname AS operator_name,reviewer.nickname AS reviewer_name'); if ($status !== '') $query->where('r.status', $status); $list = $query->order('r.id desc')->paginate(20, false, ['query'=>$this->request->get()]); $this->view->assign('list', $list); + $this->view->assign('selectedStatus', $status); + $this->view->assign('statusLabels', [ + 'pending' => '待提交', 'submitting' => '提交中', 'processing' => '退款处理中', + 'unknown' => '结果待核查', 'abnormal' => '异常待处理', 'success' => '退款成功', + 'closed' => '微信关闭', 'rejected' => '已取消', + ]); return $this->view->fetch(); } diff --git a/server/application/admin/lang/zh-cn/settle.php b/server/application/admin/lang/zh-cn/settle.php index 520c12a..f22ca65 100644 --- a/server/application/admin/lang/zh-cn/settle.php +++ b/server/application/admin/lang/zh-cn/settle.php @@ -8,8 +8,8 @@ return [ 'Commission' => '平台抽佣金额(元)', 'Settle_amount' => '师傅应结所得(元)', 'Status' => '结算流转状态', - 'Settle_time' => '实际打款时间', + 'Settle_time' => '结算时间', 'Wait' => '待财务结算', - 'Settled' => '已划扣结算', + 'Settled' => '已入师傅钱包', 'Offline' => '线下特殊结算', ]; diff --git a/server/application/admin/library/Auth.php b/server/application/admin/library/Auth.php index 91f677e..09f9012 100755 --- a/server/application/admin/library/Auth.php +++ b/server/application/admin/library/Auth.php @@ -476,6 +476,13 @@ class Auth extends \fast\Auth unset($ruleList[$k]); continue; } + // 合并充值入口;仅有退款权限的角色仍保留原菜单入口。 + if ($v['name'] === 'recharge_refund' + && in_array('pay_order/recharges', $userRule) + && $this->check('pay_order/recharges')) { + unset($ruleList[$k]); + continue; + } $v['icon'] = $v['icon'] . ' fa-fw'; $v['url'] = isset($v['url']) && $v['url'] ? $v['url'] : '/' . $module . '/' . $v['name']; $v['badge'] = $badgeList[$v['name']] ?? ''; diff --git a/server/application/admin/view/home/index.html b/server/application/admin/view/home/index.html index c643daa..a5acb4a 100644 --- a/server/application/admin/view/home/index.html +++ b/server/application/admin/view/home/index.html @@ -448,7 +448,7 @@ - +
diff --git a/server/application/admin/view/merchant/certificates.html b/server/application/admin/view/merchant/certificates.html index c8916e2..8c21aa6 100644 --- a/server/application/admin/view/merchant/certificates.html +++ b/server/application/admin/view/merchant/certificates.html @@ -1,5 +1,5 @@
-
企业资质认证

个人用户和商家用户均可提交企业资质认证;认证不会改变用户类型。

+
企业资质审核

个人用户和商家用户均可提交企业资质认证;认证不会改变用户类型。

{:token()}
diff --git a/server/application/admin/view/pay_order/index.html b/server/application/admin/view/pay_order/index.html index 03d9cee..66aa322 100644 --- a/server/application/admin/view/pay_order/index.html +++ b/server/application/admin/view/pay_order/index.html @@ -126,6 +126,12 @@
{:build_heading()} + {if $rechargeOnly} + + {/if}
@@ -135,9 +141,9 @@
-
微信支付流水总量
+
{if $rechargeOnly}充值订单总数{else /}支付订单总数{/if}
{$stats.total_count|default=0} 笔
-
微信支付全部交易记录
+
含待支付、已关闭等全部状态
@@ -145,9 +151,9 @@
-
实收交易累计金额
+
{if $rechargeOnly}充值支付累计金额{else /}支付累计金额{/if}
¥{$stats.total_paid_amount|number_format=2}
-
包含订单支付与预充值
+
已支付订单原额,未扣除退款
@@ -172,7 +178,7 @@ / {$stats.abnormal_count} 异常 {/if}
-
需关注或重新同步微信
+
退款异常 {$stats.abnormal_count} 笔;支付失败 {$stats.pay_failed_count} 笔
@@ -187,7 +193,7 @@
操作指引: - {if $rechargeOnly}可对已支付的充值订单发起原路退款,确认后占用余额并向微信提交退款。{else /}展示全站微信支付与原路退款记录。充值退款请使用充值订单中的专用入口。{/if} + {if $rechargeOnly}可对已支付的充值订单发起原路退款,确认后占用余额并向微信提交退款。统计为全部历史充值记录。{else /}展示全站支付订单及其退款状态,统计为全部历史记录。充值退款请使用充值订单中的专用入口。{/if}
diff --git a/server/application/admin/view/recharge_refund/index.html b/server/application/admin/view/recharge_refund/index.html index 0aa6f91..8f75eb3 100644 --- a/server/application/admin/view/recharge_refund/index.html +++ b/server/application/admin/view/recharge_refund/index.html @@ -1,15 +1,43 @@
-

充值退款记录

退款处理中、状态未知及异常时,余额保持占用;请核实微信状态。

+
+

充值管理

+

查看充值退款进度。处理中、结果待核查及异常时,余额保持占用;请核实微信状态。

+
+
-
-
- {volist name="list" id="row"} - - {/volist} -
退款单号充值支付单号用户金额状态退款原因 / 处理备注操作人 / 处理人 ID创建时间操作
{$row.refund_no|htmlentities}{$row.out_trade_no|htmlentities}{$row.nickname|htmlentities} {$row.mobile|htmlentities}¥{$row.amount|htmlentities}{$row.status|htmlentities}{$row.reason|htmlentities}
{$row.audit_note|htmlentities}
{$row.error|htmlentities}
{$row.operator_id|htmlentities} / {$row.reviewer_id|htmlentities}{$row.createtime|date='Y-m-d H:i:s',###} - {if $row.status == 'pending' && $auth->check('recharge_refund/review')}处理{/if} - {if in_array($row.status, ['submitting','unknown','processing','abnormal']) && $auth->check('recharge_refund/resolve')}处理{/if} -
+
+ + + +
+
+ + + {volist name="list" id="row"} + + + + + + + + + + {/volist} + {if count($list) == 0}{/if} + +
退款单号充值支付单号用户退款金额状态退款原因 / 处理备注操作人 / 处理人创建时间操作
{$row.refund_no|htmlentities}{if $auth->check('pay_order/detail')}{$row.out_trade_no|htmlentities}{else /}{$row.out_trade_no|htmlentities}{/if}{$row.nickname|htmlentities} {$row.mobile|htmlentities}¥{$row.amount|htmlentities}{if isset($statusLabels[$row.status])}{$statusLabels[$row.status]|htmlentities}{else /}{$row.status|htmlentities}{/if}{$row.reason|htmlentities}
{$row.audit_note|htmlentities}
{$row.error|htmlentities}
{if $row.operator_name}{$row.operator_name|htmlentities}{else /}—{/if} / {if $row.reviewer_name}{$row.reviewer_name|htmlentities}{else /}—{/if}{$row.createtime|date='Y-m-d H:i:s',###} + {if $row.status == 'pending' && $auth->check('recharge_refund/review')}处理{/if} + {if in_array($row.status, ['submitting','unknown','processing','abnormal']) && $auth->check('recharge_refund/resolve')}核查处理{/if} +
当前条件下暂无充值退款记录
{$list->render()}
diff --git a/server/application/admin/view/user/user/detail.html b/server/application/admin/view/user/user/detail.html index f87b6ff..9f946a6 100644 --- a/server/application/admin/view/user/user/detail.html +++ b/server/application/admin/view/user/user/detail.html @@ -82,6 +82,16 @@
{/if} + {if !empty($merchantProfile) && !empty($merchantProfile.id) && $auth->check('merchant/detail')} +
+
关联历史企业资料
+
+ {$merchantProfile.name|htmlentities} + 查看历史业务记录 +
+
+ {/if} + {if $row.identity_selected && $row.user_type=='merchant'}
商家用户资料
diff --git a/server/application/admin/view/wallet_log/index.html b/server/application/admin/view/wallet_log/index.html index ecf8270..5c2fa23 100644 --- a/server/application/admin/view/wallet_log/index.html +++ b/server/application/admin/view/wallet_log/index.html @@ -16,12 +16,13 @@
- 累计入账总额:¥{$totalIncome|number_format=2} + 全部历史余额增加:¥{$totalIncome|number_format=2} - 累计扣减/提现:¥{$totalOutflow|number_format=2} + 全部历史余额减少:¥{$totalOutflow|number_format=2}
+

以上为全部历史钱包余额变动汇总,不随列表筛选变化;包含充值退款占用与释放,不代表平台收入或实际收付款。

'优匠优服', 'beian' => '', 'cdnurl' => '', - 'version' => '1.0.94', + 'version' => '1.0.95', 'timezone' => 'Asia/Shanghai', 'forbiddenip' => '', 'languages' => diff --git a/server/public/assets/js/backend/invoice.js b/server/public/assets/js/backend/invoice.js index 2b88c23..2b6f5ea 100644 --- a/server/public/assets/js/backend/invoice.js +++ b/server/public/assets/js/backend/invoice.js @@ -22,7 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', fixedRightNumber: 0, columns: [ [ - {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'}, + {field: 'index', visible: false, title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'}, {field: 'invoice_sn', title: '申请单号', operate: 'LIKE'}, {field: 'title', title: '发票抬头', operate: 'LIKE', align: 'left'}, {field: 'tax_no', title: '税号', operate: 'LIKE', visible: false}, @@ -33,8 +33,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', {field: 'user.nickname', title: '申请用户', operate: 'LIKE'}, {field: 'email', title: '接收邮箱', operate: 'LIKE', visible: false}, {field: 'status', title: '处理状态', searchList: {"wait":__('Wait'),"issued":__('Issued'),"reject":__('Reject'),"cancel":__('Cancel')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', issued: 'success', reject: 'danger', cancel: 'gray'}}, - {field: 'invoice_no', title: '发票号码', operate: 'LIKE'}, - {field: 'invoice_file', title: '电子票', operate: false, formatter: function (v) { return v ? '查看' : '—'; }}, + {field: 'invoice_no', visible: false, title: '发票号码', operate: 'LIKE'}, + {field: 'invoice_file', visible: false, title: '电子票', operate: false, formatter: function (v) { return v ? '查看' : '—'; }}, {field: 'audit_msg', title: '处理说明', operate: 'LIKE', visible: false}, {field: 'createtime', title: '申请时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '145px'}, {field: 'operate', title: '操作', table: table, events: Table.api.events.operate, diff --git a/server/public/assets/js/backend/invoice_title.js b/server/public/assets/js/backend/invoice_title.js index 49f2d9e..e081668 100644 --- a/server/public/assets/js/backend/invoice_title.js +++ b/server/public/assets/js/backend/invoice_title.js @@ -23,7 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', fixedRightNumber: 0, columns: [ [ - {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, + {field: 'index', visible: false, title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, {field: 'title', title: '发票抬头', operate: 'LIKE', formatter: function (v, row) { var def = Number(row.is_default) === 1 ? ' 默认' : ''; return '' + Fast.api.escape(v || '-') + '' + def; @@ -37,9 +37,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', return v ? Fast.api.escape(v) : '个人业主'; }}, {field: 'user.nickname', title: '维护用户', operate: 'LIKE'}, - {field: 'email', title: '接收邮箱', operate: 'LIKE', formatter: function (v) { return v ? Fast.api.escape(v) : '-'; }}, - {field: 'issued_count', title: '已开票数', operate: false}, - {field: 'issued_amount', title: '已开票金额', operate: false}, + {field: 'email', visible: false, title: '接收邮箱', operate: 'LIKE', formatter: function (v) { return v ? Fast.api.escape(v) : '-'; }}, + {field: 'issued_count', visible: false, title: '已开票数', operate: false}, + {field: 'issued_amount', visible: false, title: '已开票金额', operate: false}, {field: 'updatetime', title: '更新时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, buttons: [ diff --git a/server/public/assets/js/backend/pay_order.js b/server/public/assets/js/backend/pay_order.js index 321aba9..ee26222 100644 --- a/server/public/assets/js/backend/pay_order.js +++ b/server/public/assets/js/backend/pay_order.js @@ -26,7 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', {checkbox: true}, {field: 'id', title: 'ID', sortable: true, operate: false, visible: false}, {field: 'out_trade_no', title: '商户支付单号', align: 'left', operate: 'LIKE'}, - {field: 'order.order_no', title: '关联订单', align: 'left', operate: 'LIKE', formatter: function (value, row) { + {field: 'order.order_no', visible: false, title: '关联订单', align: 'left', operate: 'LIKE', formatter: function (value, row) { return value ? '' + Fast.api.escape(value) + '' : '—'; }}, {field: 'user.nickname', title: '支付用户', operate: 'LIKE'}, @@ -136,8 +136,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', search: true, commonSearch: true, showToggle: $('.fa-columns').length > 0, - showSearch: false, - showColumns: false, + showSearch: true, + showColumns: true, showExport: false, exportTypes: ['csv', 'excel'], exportOptions: {fileName: 'pay_order_' + new Date().getTime(), ignoreColumn: [0, 'operate']}, diff --git a/server/public/assets/js/backend/settle.js b/server/public/assets/js/backend/settle.js index f610ccf..7706e6d 100644 --- a/server/public/assets/js/backend/settle.js +++ b/server/public/assets/js/backend/settle.js @@ -22,12 +22,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', fixedRightNumber: 0, columns: [ [ - {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, + {field: 'index', visible: false, title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, {field: 'order.order_no', title: '关联订单号', operate: 'LIKE', formatter: function (v) { return v ? '' + Fast.api.escape(v) + '' : '-'; }}, {field: 'master.realname', title: '结算师傅', operate: 'LIKE'}, - {field: 'master.mobile', title: '师傅电话', operate: 'LIKE'}, + {field: 'master.mobile', visible: false, title: '师傅电话', operate: 'LIKE'}, {field: 'order_amount', title: '工单原额', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2); }}, @@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', }}, {field: 'status', title: __('Status'), searchList: {"wait":__('Wait'),"settled":__('Settled'),"offline":__('Offline')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', settled: 'success', offline: 'info'}}, {field: 'settle_time', title: __('Settle_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, - {field: 'createtime', title: '生成时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, + {field: 'createtime', visible: false, title: '生成时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, buttons: [ { diff --git a/server/public/assets/js/backend/wallet_log.js b/server/public/assets/js/backend/wallet_log.js index bc750c3..1e37405 100644 --- a/server/public/assets/js/backend/wallet_log.js +++ b/server/public/assets/js/backend/wallet_log.js @@ -21,13 +21,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', fixedRightNumber: 0, columns: [ [ - {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, + {field: 'index', visible: false, title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, {field: 'user_type', title: '账户角色', searchList: {"master":"认证师傅","user":"业主/企业用户"}, formatter: Table.api.formatter.label, custom: {master: 'warning', user: 'info'}}, {field: 'account_name', title: '账户主体', operate: false, formatter: function (v, row) { var mob = row.account_mobile ? ' (' + Fast.api.escape(row.account_mobile) + ')' : ''; return '' + Fast.api.escape(v || '-') + '' + 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":"奖励补贴","recharge_refund_hold":"充值退款占用","recharge_refund_release":"充值退款余额释放"}, formatter: Table.api.formatter.label, custom: {recharge: 'success', consume: 'warning', refund: 'info', settle: 'success', withdraw: 'primary', income: 'success', recharge_refund_hold: 'warning', recharge_refund_release: 'info'}}, {field: 'amount', title: '变动金额', operate: 'BETWEEN', formatter: function (v) { var num = Number(v || 0); if (num > 0) return '+¥' + num.toFixed(2) + ''; diff --git a/server/public/assets/js/backend/withdraw.js b/server/public/assets/js/backend/withdraw.js index 85eca8f..2eaeb2d 100644 --- a/server/public/assets/js/backend/withdraw.js +++ b/server/public/assets/js/backend/withdraw.js @@ -22,18 +22,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', fixedRightNumber: 0, columns: [ [ - {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, + {field: 'index', visible: false, title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'}, {field: 'master.realname', title: '提现师傅', operate: 'LIKE'}, - {field: 'master.mobile', title: '师傅手机号', operate: 'LIKE'}, + {field: 'master.mobile', visible: false, title: '师傅手机号', operate: 'LIKE'}, {field: 'amount', title: '申请金额', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2); }}, {field: 'fee', title: '手续费', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2); }}, - {field: 'arrive_amount', title: '应打款净额', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2) + ''; }}, + {field: 'arrive_amount', title: '应打款净额', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2) + ''; }}, {field: 'channel', title: '结算渠道', searchList: {"wechat":__('Wechat'),"bank":__('Bank')}, formatter: Table.api.formatter.label, custom: {wechat: 'success', bank: 'primary'}}, - {field: 'out_bill_no', title: '商户转账单号', operate: 'LIKE', formatter: function (v) { return v ? '' + v + '' : '-'; }}, + {field: 'out_bill_no', visible: false, title: '商户转账单号', operate: 'LIKE', formatter: function (v) { return v ? '' + v + '' : '-'; }}, {field: 'transfer_state_text', title: '微信转账状态', operate: false, formatter: function (v, row) { if (row.channel !== 'wechat') return '线下卡转'; var st = row.transfer_state || ''; - if (!st && !row.fail_reason) return '待审核发起'; + if (!st && !row.fail_reason) return '' + (row.status === 'reject' ? '未发起转账' : '待审核发起') + ''; var cls = 'label-default'; if (st === 'SUCCESS') cls = 'label-success'; else if (st === 'WAIT_USER_CONFIRM' || st === 'TRANSFERING' || st === 'ACCEPTED' || st === 'PROCESSING') cls = 'label-warning'; @@ -42,14 +42,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'backend/admin-table-layout', return '' + (v || st || '发起异常') + ''; }}, {field: 'status', title: '审核状态', searchList: {"wait":__('Wait'),"pass":__('Pass'),"reject":__('Reject'),"done":__('Done')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', pass: 'info', reject: 'danger', done: 'success'}}, - {field: 'fail_reason', title: '失败 / 异常诊断原因', operate: 'LIKE', align: 'left', formatter: function (v, row) { + {field: 'fail_reason', visible: false, title: '失败 / 异常诊断原因', operate: 'LIKE', align: 'left', formatter: function (v, row) { if (!v && !row.fail_code) return '-'; var codeHtml = row.fail_code ? '' + Table.api.formatter.normal.call(this, row.fail_code, row) + '' : ''; return '
' + codeHtml + Table.api.formatter.normal.call(this, v || '', row) + '
'; }}, - {field: 'audit_msg', title: '审核批注', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'audit_msg', visible: false, title: '审核批注', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'createtime', title: '申请时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, - {field: 'updatetime', title: '处理时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, + {field: 'updatetime', visible: false, title: '处理时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'}, {field: 'operate', title: '操作', table: table, events: Table.api.events.operate, buttons: [ { diff --git a/tests/enterprise_cert_admin.js b/tests/enterprise_cert_admin.js index bf81902..eb37dc6 100644 --- a/tests/enterprise_cert_admin.js +++ b/tests/enterprise_cert_admin.js @@ -18,6 +18,8 @@ function request(route, data, token, html) { return new Promise((resolve, reject }); } (async () => { if (!process.env.TEST_ADMIN_PASSWORD) throw new Error('Set TEST_ADMIN_PASSWORD for local admin integration test'); + assert.strictEqual(sql("SELECT CONCAT(ismenu, ':', title) FROM fa_auth_rule WHERE name='merchant'"), '0:企业业务档案'); + assert.strictEqual(sql("SELECT CONCAT(ismenu, ':', title) FROM fa_auth_rule WHERE name='merchant/certificates'"), '1:企业资质审核'); let mobile, uid = 0, certId = 0; do { mobile = '166' + String(Math.floor(Math.random() * 100000000)).padStart(8, '0'); } while (sql(`SELECT COUNT(*) FROM fa_user WHERE mobile='${mobile}'`) !== '0'); try { @@ -40,14 +42,14 @@ function request(route, data, token, html) { return new Promise((resolve, reject result = JSON.parse(response.text); assert.ok(result.rows.some(row => Number(row.id) === certId && row.user_type === 'personal'), 'personal user certification appears in admin'); // A normal page request yields the same CSRF token the audit form uses. response = await request('/s.php/merchant/certificates', null, null, true); - assert.strictEqual(response.status, 200); assert.ok(response.text.includes('企业资质认证')); assert.ok(!response.text.includes('商家用户')); + assert.strictEqual(response.status, 200); assert.ok(response.text.includes('企业资质审核')); assert.ok(!response.text.includes('商家用户')); csrf = (response.text.match(/name="__token__"[^>]*value="([^"]+)"/) || [])[1]; assert.ok(csrf, 'audit CSRF'); result = JSON.parse((await request('/s.php/merchant/index', {view:'audit_cert', id:certId, decision:'reject', audit_msg:'Test rejection', __token__:csrf})).text); assert.strictEqual(result.code, 1, result.msg); result = JSON.parse((await request('/api/security/status', null, token)).text); assert.strictEqual(result.data.enterprise_cert.verify_status, 'reject'); assert.strictEqual(result.data.enterprise_cert.audit_msg, 'Test rejection'); result = JSON.parse((await request('/api/security/submitEnterpriseCert', {company_name:'Security Test Company',license_no:'123456789012345678',license_image:image}, token)).text); assert.strictEqual(result.code, 1, result.msg); response = await request('/s.php/merchant/certificates', null, null, true); - assert.strictEqual(response.status, 200); assert.ok(response.text.includes('企业资质认证')); assert.ok(!response.text.includes('商家用户')); + assert.strictEqual(response.status, 200); assert.ok(response.text.includes('企业资质审核')); assert.ok(!response.text.includes('商家用户')); csrf = (response.text.match(/name="__token__"[^>]*value="([^"]+)"/) || [])[1]; assert.ok(csrf); result = JSON.parse((await request('/s.php/merchant/index', {view:'audit_cert', id:certId, decision:'pass', __token__:csrf})).text); assert.strictEqual(result.code, 1, result.msg); result = JSON.parse((await request('/api/security/status', null, token)).text); assert.strictEqual(result.data.enterprise_cert.verify_status, 'pass'); diff --git a/tests/finance_recharge_navigation.test.js b/tests/finance_recharge_navigation.test.js new file mode 100644 index 0000000..b0f3f48 --- /dev/null +++ b/tests/finance_recharge_navigation.test.js @@ -0,0 +1,9 @@ +const assert = require('assert'); +const fs = require('fs'); +const orders = fs.readFileSync('server/application/admin/view/pay_order/index.html', 'utf8'); +const refunds = fs.readFileSync('server/application/admin/view/recharge_refund/index.html', 'utf8'); +const auth = fs.readFileSync('server/application/admin/library/Auth.php', 'utf8'); +assert(orders.includes('充值退款记录') && orders.includes("$auth->check('recharge_refund/index')"), '充值页应提供有权限的退款页签'); +assert(refunds.includes('充值订单') && refunds.includes("$auth->check('pay_order/recharges')"), '退款页应提供有权限的订单页签'); +assert(auth.includes("$v['name'] === 'recharge_refund'") && auth.includes("$this->check('pay_order/recharges')"), '仅在充值入口可访问时隐藏重复菜单'); +console.log('充值管理入口及权限检查通过'); diff --git a/tests/finance_withdraw_state.test.js b/tests/finance_withdraw_state.test.js new file mode 100644 index 0000000..3526aa6 --- /dev/null +++ b/tests/finance_withdraw_state.test.js @@ -0,0 +1,10 @@ +const fs = require('fs'); +const assert = require('assert'); +const source = fs.readFileSync('server/public/assets/js/backend/withdraw.js', 'utf8'); +const match = source.match(/field: 'transfer_state_text'[\s\S]*?formatter: function \(v, row\) \{([\s\S]*?)\n \}\}/); +assert(match, '转账状态格式化函数不存在'); +const format = new Function('v', 'row', match[1]); +assert(!format('', {channel:'wechat', status:'reject', transfer_state:'', fail_reason:''}).includes('待审核发起'), '驳回记录不应显示待审核发起'); +assert(format('', {channel:'wechat', status:'wait', transfer_state:'', fail_reason:''}).includes('待审核发起')); +assert(format('转账成功', {channel:'wechat', status:'done', transfer_state:'SUCCESS'}).includes('转账成功')); +console.log('提现转账状态展示通过');