From d218c0a8194e395e3bd9f5f5d74fa99bbd643204 Mon Sep 17 00:00:00 2001
From: xcbyy <2578898740@qq.com>
Date: Sat, 21 Nov 2026 14:31:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E5=8F=A3=E9=80=80=E6=AC=BE?=
=?UTF-8?q?=E9=89=B4=E6=9D=83=E3=80=81=E6=A0=B8=E9=94=80=E7=9B=AE=E6=A0=87?=
=?UTF-8?q?=E5=92=8C=E5=BE=AE=E4=BF=A1=E9=80=80=E6=AC=BE=E5=8D=A0=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
管理员退款只认管理员令牌。通用核销锁定具体票据,同码多目标时拒绝。已结算订单不再覆盖退款状态。微信退款先落库并占用处理中额度,未到账不把订单标成已退款。
---
pwuniapp/pages/order/list.vue | 15 +-
server/src/core/finance/clawback.ts | 50 +
server/src/core/pay/refund-bridge.ts | 4 +
server/src/db/repository.ts | 1321 ++++++++++++-----
server/src/index.ts | 187 ++-
.../tests/checkin-refund-regression.spec.ts | 32 +
server/tests/clawback-math.spec.ts | 43 +
server/tests/funds-closed-loop.spec.ts | 140 ++
server/tests/ownership-hardening.spec.ts | 8 +-
9 files changed, 1387 insertions(+), 413 deletions(-)
create mode 100644 server/src/core/finance/clawback.ts
create mode 100644 server/tests/checkin-refund-regression.spec.ts
create mode 100644 server/tests/clawback-math.spec.ts
create mode 100644 server/tests/funds-closed-loop.spec.ts
diff --git a/pwuniapp/pages/order/list.vue b/pwuniapp/pages/order/list.vue
index 63d2b06..2123df2 100644
--- a/pwuniapp/pages/order/list.vue
+++ b/pwuniapp/pages/order/list.vue
@@ -95,7 +95,7 @@
-
+
@@ -598,15 +598,18 @@ const payOrder = async (id) => {
scene: 'ORDER',
userId: uid
});
- await payOrderApi(id, {
- targetStatus: '履约中',
+ const paid = await payOrderApi(id, {
payType: 'WECHAT',
buyerId: uid
});
uni.hideLoading();
- applyOrderStatus(o, 'IN_SERVICE');
- if (o) o.rawStatus = '履约中';
- uni.showToast({ title: '支付成功,服务已开始', icon: 'success' });
+ const nextStatus = paid && paid.status ? paid.status : 'IN_SERVICE';
+ applyOrderStatus(o, nextStatus);
+ if (o) o.rawStatus = (paid && paid.rawStatus) || (nextStatus === 'PENDING_ACCEPT' ? '待接单' : '履约中');
+ uni.showToast({
+ title: nextStatus === 'PENDING_ACCEPT' ? '支付成功,等待大神接单' : '支付成功,服务已开始',
+ icon: 'success'
+ });
} catch (err) {
uni.hideLoading();
if (err && err.cancelled) {
diff --git a/server/src/core/finance/clawback.ts b/server/src/core/finance/clawback.ts
new file mode 100644
index 0000000..3aaa64a
--- /dev/null
+++ b/server/src/core/finance/clawback.ts
@@ -0,0 +1,50 @@
+/** 已退金额加上处理中的微信退款,再加上本次申请,不得超过订单金额。 */
+export function canReserveRefund(
+ amountCents: number,
+ refundedCents: number,
+ pendingOtherCents: number,
+ requestCents: number
+): boolean {
+ if (!(requestCents > 0)) return false;
+ return refundedCents + pendingOtherCents + requestCents <= amountCents;
+}
+
+/** 本次退款应从一笔已入账佣金里扣回的金额。按「退款 / 退款前仍留在平台的订单金额」计算,避免剩余结算后再退时少扣。 */
+export function clawbackDelta(
+ credit: number,
+ alreadyClawed: number,
+ orderAmount: number,
+ alreadyRefunded: number,
+ refund: number
+): number {
+ const room = Number((Number(credit || 0) - Number(alreadyClawed || 0)).toFixed(2));
+ if (!(room > 0) || !(Number(refund) > 0)) return 0;
+ const retainedBefore = Number((Number(orderAmount || 0) - Number(alreadyRefunded || 0)).toFixed(2));
+ if (!(retainedBefore > 0)) return room;
+ const fraction = Math.min(1, Number(refund) / retainedBefore);
+ if (fraction >= 1 - 1e-9) return room;
+ return Number(Math.min(room, room * fraction).toFixed(2));
+}
+
+/** 入账类型可能是「一级分销佣金」或「一级分销佣金 (5%)」。 */
+export function payoutClawbackKind(type: string): 'expert' | 'referral1' | 'referral2' | null {
+ const t = String(type || '');
+ if (t === '大神完单收益结算' || t === '仲裁部分结算' || t === '部分退款剩余结算') return 'expert';
+ if (t.startsWith('一级分销佣金')) return 'referral1';
+ if (t.startsWith('二级分销佣金')) return 'referral2';
+ return null;
+}
+
+export function wechatRefundCounterparty(outRefundNo: string): string {
+ return `微信支付原路退款:${outRefundNo}`;
+}
+
+/** 同一笔逻辑退款使用稳定单号,便于受理中重试;不同金额或不同已退进度使用不同单号。 */
+export function buildOutRefundNo(tag: string, orderId: string, priorCents: number, refundCents: number): string {
+ const clean = `${tag}_${orderId}_${priorCents}_${refundCents}`.replace(/[^A-Za-z0-9_]/g, '');
+ if (clean.length >= 6 && clean.length <= 64) return clean;
+ let hash = 0;
+ for (let i = 0; i < clean.length; i += 1) hash = (hash * 33 + clean.charCodeAt(i)) >>> 0;
+ const head = String(tag || 'RFND').replace(/[^A-Za-z0-9_]/g, '').slice(0, 12) || 'RFND';
+ return `${head}_${hash.toString(16)}_${priorCents}_${refundCents}`.slice(0, 64);
+}
diff --git a/server/src/core/pay/refund-bridge.ts b/server/src/core/pay/refund-bridge.ts
index 93fbe6b..df8b5bd 100644
--- a/server/src/core/pay/refund-bridge.ts
+++ b/server/src/core/pay/refund-bridge.ts
@@ -6,8 +6,12 @@
export interface WeChatRefundResult {
ok: boolean;
skipped?: boolean;
+ /** 微信已受理但尚未到账。此时不得把订单标成已退款。 */
+ pending?: boolean;
status?: string;
refundId?: string;
+ /** 实际提交给微信的退款单号。失败重试时可能带后缀,记账必须用这个值。 */
+ outRefundNo?: string;
error?: string;
}
diff --git a/server/src/db/repository.ts b/server/src/db/repository.ts
index acf6be2..6404405 100644
--- a/server/src/db/repository.ts
+++ b/server/src/db/repository.ts
@@ -1,5 +1,6 @@
import { pool } from './mysql';
import { tryRefundToWeChat } from '../core/pay/refund-bridge';
+import { buildOutRefundNo, canReserveRefund, clawbackDelta, payoutClawbackKind, wechatRefundCounterparty } from '../core/finance/clawback';
// 统一服务端错误日志(替代静默吞错,保证资金/结算异常可观测)
function logServerError(scope: string, err: any): void {
@@ -371,7 +372,207 @@ export class MysqlRepository {
return this.getActivityById(id);
}
+ /** 分销从平台抽成中列支。比例之和超过抽成时压缩,避免应付超过实收。 */
+ private capReferralRates(platformPct: number, firstPct: number, secondPct: number): { platformPct: number; firstPct: number; secondPct: number } {
+ const p = Math.max(0, Number(platformPct) || 0);
+ let f = Math.max(0, Number(firstPct) || 0);
+ let s = Math.max(0, Number(secondPct) || 0);
+ if (f + s > p && f + s > 0) {
+ const scale = p / (f + s);
+ f = Number((f * scale).toFixed(4));
+ s = Number(Math.max(0, p - f).toFixed(4));
+ }
+ return { platformPct: p, firstPct: f, secondPct: s };
+ }
+
+ private splitFundedPayout(amountYuan: number, platformPct: number, firstPct: number, secondPct: number): {
+ platformFee: number;
+ expertIncome: number;
+ comm1: number;
+ comm2: number;
+ platformPct: number;
+ firstPct: number;
+ secondPct: number;
+ } {
+ const rates = this.capReferralRates(platformPct, firstPct, secondPct);
+ const platformFee = Number(((amountYuan * rates.platformPct) / 100).toFixed(2));
+ const expertIncome = Number(Math.max(0, amountYuan - platformFee).toFixed(2));
+ let comm1 = Number(((amountYuan * rates.firstPct) / 100).toFixed(2));
+ let comm2 = Number(((amountYuan * rates.secondPct) / 100).toFixed(2));
+ if (comm1 + comm2 > platformFee) {
+ comm2 = Number(Math.max(0, platformFee - comm1).toFixed(2));
+ if (comm1 > platformFee) {
+ comm1 = Number(platformFee.toFixed(2));
+ comm2 = 0;
+ }
+ }
+ return { platformFee, expertIncome, comm1, comm2, ...rates };
+ }
+
+ private async loadPayoutSplit(conn: any, amountYuan: number) {
+ const [cfgRows]: any = await conn.query('SELECT * FROM finance_config WHERE id = 1 LIMIT 1');
+ const cfg = (cfgRows && cfgRows[0]) || {
+ platform_rate_percent: 10,
+ first_referral_percent: 5,
+ second_referral_percent: 2,
+ };
+ return this.splitFundedPayout(
+ amountYuan,
+ Number(cfg.platform_rate_percent ?? 10),
+ Number(cfg.first_referral_percent ?? 5),
+ Number(cfg.second_referral_percent ?? 2)
+ );
+ }
+
+ /** 按已入账流水回冲佣金。比例是本次退款占「退款前仍留在平台的金额」,剩余结算后再退也能扣满。 */
+ private async clawbackOrderSettlements(conn: any, order: any, refundYuan: number): Promise {
+ const orderId = String(order.id);
+ const orderAmount = Number(order.amount || 0);
+ const refund = Number(Number(refundYuan || 0).toFixed(2));
+ const alreadyRefunded = Number(order.refund_amount || 0);
+ if (!(orderAmount > 0) || !(refund > 0)) return;
+ const [rows]: any = await conn.query(
+ `SELECT id, user_id as userId, type, amount FROM finance_records
+ WHERE related_id = ? AND direction = 'IN'
+ AND (
+ type IN ('大神完单收益结算', '仲裁部分结算', '部分退款剩余结算')
+ OR type LIKE '一级分销佣金%'
+ OR type LIKE '二级分销佣金%'
+ )`,
+ [orderId]
+ );
+ const [prev]: any = await conn.query(
+ `SELECT counterparty, COALESCE(SUM(amount), 0) as clawed
+ FROM finance_records
+ WHERE related_id = ? AND type = '结算回冲' AND direction = 'OUT'
+ GROUP BY counterparty`,
+ [orderId]
+ );
+ const clawed = new Map();
+ for (const p of prev || []) clawed.set(String(p.counterparty), Number(p.clawed || 0));
+
+ for (const rec of rows || []) {
+ const kind = payoutClawbackKind(String(rec.type || ''));
+ if (!kind) continue;
+ const userId = Number(rec.userId || 0);
+ if (userId <= 0) continue;
+ const srcId = String(rec.id);
+ const delta = clawbackDelta(Number(rec.amount || 0), clawed.get(srcId) || 0, orderAmount, alreadyRefunded, refund);
+ if (!(delta > 0)) continue;
+ await conn.query('UPDATE users SET commission = COALESCE(commission, 0) - ? WHERE id = ?', [delta, userId]);
+ const ts = Date.now();
+ const rand = Math.floor(100 + Math.random() * 900);
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, '结算回冲', ?, 'OUT', ?, ?, NOW())`,
+ [`fin_cb_${ts}_${rand}`, `CB${ts}${rand}`, userId, delta.toFixed(2), srcId, orderId]
+ );
+ clawed.set(srcId, Number(((clawed.get(srcId) || 0) + delta).toFixed(2)));
+ if (kind === 'referral1' || kind === 'referral2') {
+ const level = kind === 'referral1' ? 1 : 2;
+ const orderNo = order.order_no || orderId;
+ const [dRows]: any = await conn.query(
+ `SELECT id, commission FROM distribution_records
+ WHERE user_id = ? AND order_no IN (?, ?) AND level = ? AND status = '已入账'
+ ORDER BY created_at DESC LIMIT 1`,
+ [userId, orderNo, orderId, level]
+ );
+ if (dRows && dRows[0]) {
+ const left = Number(Math.max(0, Number(dRows[0].commission || 0) - delta).toFixed(2));
+ await conn.query(
+ 'UPDATE distribution_records SET commission = ?, status = ? WHERE id = ?',
+ [left, left > 0 ? '已入账' : '已回冲', dRows[0].id]
+ );
+ }
+ }
+ }
+ }
+
+ /** 未支付的微信订单在创建时记了收入流水,取消时冲销,避免账上虚增。 */
+ private async reverseUnpaidWechatLedger(conn: any, order: any): Promise {
+ const orderId = String(order.id);
+ const [rows]: any = await conn.query(
+ `SELECT id, user_id as userId, amount FROM finance_records
+ WHERE related_id = ? AND direction = 'IN' AND type = '服务预约订单付款 (微信支付)'`,
+ [orderId]
+ );
+ const [doneRows]: any = await conn.query(
+ `SELECT counterparty FROM finance_records WHERE related_id = ? AND type = '未支付订单冲销' AND direction = 'OUT'`,
+ [orderId]
+ );
+ const done = new Set((doneRows || []).map((r: any) => String(r.counterparty)));
+ for (const rec of rows || []) {
+ const srcId = String(rec.id);
+ if (done.has(srcId)) continue;
+ const amt = Number(rec.amount || 0);
+ if (!(amt > 0)) continue;
+ const ts = Date.now();
+ const rand = Math.floor(100 + Math.random() * 900);
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, '未支付订单冲销', ?, 'OUT', ?, ?, NOW())`,
+ [`fin_rv_${ts}_${rand}`, `RV${ts}${rand}`, Number(rec.userId) || 0, amt.toFixed(2), srcId, orderId]
+ );
+ }
+ }
+
+ private async creditOrderReferrals(
+ conn: any,
+ opts: {
+ relatedId: string;
+ orderNo: string;
+ amountYuan?: number;
+ buyerId: number;
+ fromUserName?: string;
+ split: { comm1: number; comm2: number; firstPct: number; secondPct: number };
+ }
+ ): Promise {
+ const split = opts.split;
+ if (!(split.comm1 > 0) && !(split.comm2 > 0)) return;
+ const buyerId = Number(opts.buyerId) || 0;
+ if (buyerId <= 0) return;
+ const [buyerRows]: any = await conn.query('SELECT id, nickname, inviter_id FROM users WHERE id = ? LIMIT 1', [buyerId]);
+ const buyer = buyerRows && buyerRows[0];
+ if (!buyer || !buyer.inviter_id) return;
+ const fromUserName = opts.fromUserName || buyer.nickname || '客户玩家';
+ const ts = Date.now();
+ const rand = () => Math.floor(100 + Math.random() * 900);
+ const lv1UserId = Number(buyer.inviter_id);
+ if (split.comm1 > 0 && lv1UserId > 0 && lv1UserId !== buyerId) {
+ await conn.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [split.comm1, lv1UserId]);
+ await conn.query(
+ `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, '已入账', NOW())`,
+ [`dst_1_${ts}_${rand()}`, lv1UserId, buyerId, fromUserName, opts.orderNo, Number(opts.amountYuan || 0), split.comm1, split.firstPct]
+ );
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())`,
+ [`fin_ref1_${ts}_${rand()}`, `FX1${ts}${rand()}`, lv1UserId, `一级分销佣金 (${split.firstPct}%)`, split.comm1, fromUserName, opts.relatedId]
+ );
+ const [lv1Rows]: any = await conn.query('SELECT id, inviter_id FROM users WHERE id = ? LIMIT 1', [lv1UserId]);
+ const lv1User = lv1Rows && lv1Rows[0];
+ if (lv1User && lv1User.inviter_id && split.comm2 > 0) {
+ const lv2UserId = Number(lv1User.inviter_id);
+ if (lv2UserId > 0 && lv2UserId !== buyerId && lv2UserId !== lv1UserId) {
+ await conn.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [split.comm2, lv2UserId]);
+ await conn.query(
+ `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, 2, ?, '已入账', NOW())`,
+ [`dst_2_${ts}_${rand()}`, lv2UserId, buyerId, fromUserName, opts.orderNo, Number(opts.amountYuan || 0), split.comm2, split.secondPct]
+ );
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())`,
+ [`fin_ref2_${ts}_${rand()}`, `FX2${ts}${rand()}`, lv2UserId, `二级分销佣金 (${split.secondPct}%)`, split.comm2, fromUserName, opts.relatedId]
+ );
+ }
+ }
+ }
+ }
+
private async settleActivityCheckinAndReferral(
+ conn: any,
activityId: string,
creatorId: number,
participantId: string,
@@ -381,70 +582,88 @@ export class MysqlRepository {
const feeYuan = Number((Number(payAmountCents || 0) / 100).toFixed(2));
if (feeYuan <= 0) return;
- try {
- const ts = Date.now();
- const rand = () => Math.floor(100 + Math.random() * 900);
+ const ts = Date.now();
+ const rand = () => Math.floor(100 + Math.random() * 900);
+ const split = await this.loadPayoutSplit(conn, feeYuan);
- // 1. 触发活动费用清算逻辑:将核销款项划入活动发起人账户并记录清算流水
- if (creatorId > 0) {
- await pool.query(
- 'UPDATE users SET balance = COALESCE(balance, 0) + ?, activity_count = COALESCE(activity_count, 0) + 1 WHERE id = ?',
- [feeYuan, creatorId]
- );
- await pool.query(
- `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
- VALUES (?, ?, ?, '活动核销费用清算', ?, 'IN', ?, ?, NOW())`,
- [
- `fin_act_${ts}_${rand()}`,
- `AC${ts}${rand()}`,
- creatorId,
- feeYuan,
- `参与搭子 ${participantUserId} (凭证 ${participantId})`,
- activityId
- ]
- );
- }
-
- // 2. 付费活动完成后触发一级(5%) / 二级(2%)分销返佣
- const cfg = await this.getFinanceConfig();
- const firstRefPct = Number(cfg.firstReferralPercent ?? 5);
- const secondRefPct = Number(cfg.secondReferralPercent ?? 2);
-
- const [buyerRows]: any = await pool.query(
- 'SELECT id, nickname, inviter_id FROM users WHERE id = ? LIMIT 1',
- [participantUserId]
+ // 核销收入记入可提现佣金。分销从平台抽成中列支,不再另造一笔余额。
+ if (creatorId > 0 && split.expertIncome > 0) {
+ await conn.query(
+ 'UPDATE users SET commission = COALESCE(commission, 0) + ?, activity_count = COALESCE(activity_count, 0) + 1 WHERE id = ?',
+ [split.expertIncome, creatorId]
);
- const buyer = buyerRows && buyerRows[0];
- const fromUserName = buyer?.nickname || `搭子_${participantUserId}`;
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, '活动核销费用清算', ?, 'IN', ?, ?, NOW())`,
+ [
+ `fin_act_${ts}_${rand()}`,
+ `AC${ts}${rand()}`,
+ creatorId,
+ split.expertIncome,
+ `参与搭子 ${participantUserId} (凭证 ${participantId})`,
+ activityId
+ ]
+ );
+ } else if (creatorId > 0) {
+ await conn.query('UPDATE users SET activity_count = COALESCE(activity_count, 0) + 1 WHERE id = ?', [creatorId]);
+ }
- if (buyer && buyer.inviter_id && firstRefPct > 0) {
- const lv1UserId = Number(buyer.inviter_id);
- const comm1 = Number(((feeYuan * firstRefPct) / 100).toFixed(2));
- if (comm1 > 0 && lv1UserId > 0 && lv1UserId !== participantUserId) {
- await pool.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [comm1, lv1UserId]);
- await pool.query(
- `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
- VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, '已入账', NOW())`,
- [`dst_act1_${ts}_${rand()}`, lv1UserId, participantUserId, fromUserName, activityId, feeYuan, comm1, firstRefPct]
- );
- }
+ await this.creditOrderReferrals(conn, {
+ relatedId: activityId,
+ orderNo: activityId,
+ amountYuan: feeYuan,
+ buyerId: participantUserId,
+ fromUserName: `搭子_${participantUserId}`,
+ split,
+ });
+ }
- const [lv1Rows]: any = await pool.query('SELECT id, inviter_id FROM users WHERE id = ? LIMIT 1', [lv1UserId]);
- const lv1User = lv1Rows && lv1Rows[0];
- if (lv1User && lv1User.inviter_id && secondRefPct > 0) {
- const lv2UserId = Number(lv1User.inviter_id);
- const comm2 = Number(((feeYuan * secondRefPct) / 100).toFixed(2));
- if (comm2 > 0 && lv2UserId > 0 && lv2UserId !== participantUserId && lv2UserId !== lv1UserId) {
- await pool.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [comm2, lv2UserId]);
- await pool.query(
- `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
- VALUES (?, ?, ?, ?, ?, ?, ?, 2, ?, '已入账', NOW())`,
- [`dst_act2_${ts}_${rand()}`, lv2UserId, participantUserId, fromUserName, activityId, feeYuan, comm2, secondRefPct]
- );
- }
- }
+ /** 已核销后退局:扣回发起人佣金和该成员触发的分销。 */
+ private async clawbackActivitySettlement(conn: any, activityId: string, participant: any): Promise {
+ const voucher = String(participant.id);
+ const participantUserId = Number(participant.user_id || participant.userId || 0);
+ const [rows]: any = await conn.query(
+ `SELECT id, user_id as userId, amount FROM finance_records
+ WHERE related_id = ? AND type = '活动核销费用清算' AND direction = 'IN' AND counterparty LIKE ?`,
+ [activityId, `%${voucher}%`]
+ );
+ const [doneRows]: any = await conn.query(
+ `SELECT counterparty FROM finance_records WHERE related_id = ? AND type = '活动核销回冲' AND direction = 'OUT'`,
+ [activityId]
+ );
+ const done = new Set((doneRows || []).map((r: any) => String(r.counterparty)));
+ for (const rec of rows || []) {
+ const srcId = String(rec.id);
+ if (done.has(srcId)) continue;
+ const hostId = Number(rec.userId || 0);
+ const amt = Number(rec.amount || 0);
+ if (hostId > 0 && amt > 0) {
+ await conn.query('UPDATE users SET commission = COALESCE(commission, 0) - ? WHERE id = ?', [amt, hostId]);
}
- } catch (_) {}
+ const ts = Date.now();
+ const rand = Math.floor(100 + Math.random() * 900);
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, '活动核销回冲', ?, 'OUT', ?, ?, NOW())`,
+ [`fin_acb_${ts}_${rand}`, `ACB${ts}${rand}`, hostId, amt.toFixed(2), srcId, activityId]
+ );
+ }
+
+ if (participantUserId > 0) {
+ const [dRows]: any = await conn.query(
+ `SELECT id, user_id as userId, commission FROM distribution_records
+ WHERE order_no = ? AND from_user_id = ? AND status = '已入账'`,
+ [activityId, participantUserId]
+ );
+ for (const d of dRows || []) {
+ const comm = Number(d.commission || 0);
+ const referrerId = Number(d.userId || 0);
+ if (referrerId > 0 && comm > 0) {
+ await conn.query('UPDATE users SET commission = COALESCE(commission, 0) - ? WHERE id = ?', [comm, referrerId]);
+ }
+ await conn.query("UPDATE distribution_records SET commission = 0, status = '已回冲' WHERE id = ?", [d.id]);
+ }
+ }
}
async joinActivity(activityId: string, params: { userId: number; payAmountCents: number }): Promise {
@@ -463,21 +682,29 @@ export class MysqlRepository {
// 2. 行级锁锁定活动,串行化同一活动的并发报名,从根上杜绝超卖
const [actRows]: any = await conn.query(
- 'SELECT id, max_participants, pay_type, per_person_fee_cents, COALESCE(gender_requirement, "ALL") as genderRequirement FROM activities WHERE id = ? FOR UPDATE',
+ 'SELECT id, status, max_participants, pay_type, per_person_fee_cents, COALESCE(gender_requirement, "ALL") as genderRequirement FROM activities WHERE id = ? FOR UPDATE',
[activityId]
);
if (!actRows || actRows.length === 0) throw new Error('活动不存在');
+ if (String(actRows[0].status || 'RECRUITING') === 'CANCELLED') {
+ const err: any = new Error('活动已解散,无法报名');
+ err.status = 409;
+ err.code = 40900;
+ throw err;
+ }
- // 组局性别限制合规校验
+ // 组局性别限制合规校验:未填写性别不能进入限性别的局
const genderReq = String(actRows[0].genderRequirement || 'ALL');
const userGender = String(userRows?.[0]?.gender || '').trim();
- if (genderReq === 'FEMALE_ONLY' && userGender === '男') {
+ const isFemale = userGender === '女' || userGender === 'female' || userGender === 'FEMALE';
+ const isMale = userGender === '男' || userGender === 'male' || userGender === 'MALE';
+ if (genderReq === 'FEMALE_ONLY' && !isFemale) {
const err: any = new Error('该组局仅限女生报名参与');
err.status = 400;
err.code = 40011;
throw err;
}
- if (genderReq === 'MALE_ONLY' && userGender === '女') {
+ if (genderReq === 'MALE_ONLY' && !isMale) {
const err: any = new Error('该组局仅限男生报名参与');
err.status = 400;
err.code = 40012;
@@ -591,55 +818,72 @@ export class MysqlRepository {
}
async verifyCheckin(activityId: string, verifyCode: string, operatorId: number): Promise {
- const act = await this.getActivityById(activityId);
- if (!act) throw new Error('活动不存在');
- if (Number(act.creatorId) !== Number(operatorId)) {
- throw new Error('无权核销该活动的核销码');
+ const conn = await pool.getConnection();
+ try {
+ await conn.beginTransaction();
+ const [actRows]: any = await conn.query(
+ 'SELECT id, creator_id as creatorId, status FROM activities WHERE id = ? FOR UPDATE',
+ [activityId]
+ );
+ if (!actRows || actRows.length === 0) throw new Error('活动不存在');
+ const act = actRows[0];
+ if (String(act.status || '') === 'CANCELLED') throw new Error('活动已解散,无法核销');
+ if (Number(act.creatorId) !== Number(operatorId)) {
+ throw new Error('无权核销该活动的核销码');
+ }
+
+ const [rows]: any = await conn.query(`
+ SELECT * FROM participants
+ WHERE activity_id = ? AND verify_code = ?
+ FOR UPDATE
+ `, [activityId, verifyCode]);
+
+ if (!rows || rows.length === 0) {
+ throw new Error('核销码错误或该码不属于此活动');
+ }
+ const pt = rows[0];
+ if (pt.checkin_status) {
+ throw new Error('该核销码已核销过,不可重复核销(防重校验已生效)');
+ }
+
+ // CAS 原子状态跃迁校验:防止高并发重复核销
+ const [updateRes]: any = await conn.query(`
+ UPDATE participants
+ SET checkin_status = 1, verified_at = NOW(), verified_by = ?
+ WHERE id = ? AND checkin_status = 0
+ `, [operatorId, pt.id]);
+
+ if (!updateRes || updateRes.affectedRows === 0) {
+ throw new Error('该核销码已核销过,不可重复核销(防重校验已生效)');
+ }
+
+ // 与签到同一事务清算:失败则整笔回滚,避免已签到但钱没到账
+ await this.settleActivityCheckinAndReferral(
+ conn,
+ activityId,
+ Number(act.creatorId),
+ pt.id,
+ Number(pt.user_id),
+ Number(pt.pay_amount_cents || 0)
+ );
+
+ await conn.commit();
+ return {
+ success: true,
+ participantId: pt.id,
+ activityId,
+ userId: pt.user_id,
+ verifyCode,
+ settledFeeYuan: Number((Number(pt.pay_amount_cents || 0) / 100).toFixed(2)),
+ verifiedAt: new Date(),
+ operatorId,
+ };
+ } catch (err) {
+ await conn.rollback();
+ throw err;
+ } finally {
+ conn.release();
}
-
- const [rows]: any = await pool.query(`
- SELECT * FROM participants
- WHERE activity_id = ? AND verify_code = ?
- `, [activityId, verifyCode]);
-
- if (!rows || rows.length === 0) {
- throw new Error('核销码错误或该码不属于此活动');
- }
- const pt = rows[0];
- if (pt.checkin_status) {
- throw new Error('该核销码已核销过,不可重复核销(防重校验已生效)');
- }
-
- // CAS 原子状态跃迁校验:防止高并发重复核销
- const [updateRes]: any = await pool.query(`
- UPDATE participants
- SET checkin_status = 1, verified_at = NOW(), verified_by = ?
- WHERE id = ? AND checkin_status = 0
- `, [operatorId, pt.id]);
-
- if (!updateRes || updateRes.affectedRows === 0) {
- throw new Error('该核销码已核销过,不可重复核销(防重校验已生效)');
- }
-
- // 触发活动费用清算逻辑(划入发起人账户)及二级分销返佣
- await this.settleActivityCheckinAndReferral(
- activityId,
- Number(act.creatorId),
- pt.id,
- Number(pt.user_id),
- Number(pt.pay_amount_cents || 0)
- );
-
- return {
- success: true,
- participantId: pt.id,
- activityId,
- userId: pt.user_id,
- verifyCode,
- settledFeeYuan: Number((Number(pt.pay_amount_cents || 0) / 100).toFixed(2)),
- verifiedAt: new Date(),
- operatorId,
- };
}
async queryCheckinCodeInfo(verifyCode: string): Promise {
@@ -706,41 +950,129 @@ export class MysqlRepository {
throw new Error(`核销码 [${verifyCode}] 无效或不存在`);
}
- async universalVerifyCheckin(verifyCode: string, operatorId: number = 1001): Promise {
- const info = await this.queryCheckinCodeInfo(verifyCode);
- if (info.checkedIn) {
- throw new Error(`核销码 [${verifyCode}] 已完成现场签到,不可重复核销(防重校验已生效)`);
- }
+ async universalVerifyCheckin(verifyCode: string, operatorId = 0, asAdmin = false): Promise {
+ const conn = await pool.getConnection();
+ const operator = Number(operatorId) || 0;
+ const adminFlag = asAdmin ? 1 : 0;
+ try {
+ await conn.beginTransaction();
+ const denied: any = new Error('无权核销该门票(非活动发起人或承接大神)');
+ denied.status = 403;
+ denied.code = 40300;
+ if (!asAdmin && !(operator > 0)) throw denied;
+ const ambiguous: any = new Error('核销码对应多张未核销门票,无法确定目标');
+ ambiguous.status = 409;
+ ambiguous.code = 40900;
- if (info.type === 'ACTIVITY') {
- const [updateRes]: any = await pool.query(`
- UPDATE participants
- SET checkin_status = 1, verified_at = NOW(), verified_by = ?
- WHERE id = ? AND checkin_status = 0
- `, [operatorId, info.id]);
- if (!updateRes || updateRes.affectedRows === 0) {
- throw new Error(`核销码 [${verifyCode}] 已完成现场签到,不可重复核销(防重校验已生效)`);
- }
- await this.settleActivityCheckinAndReferral(
- String(info.relatedId),
- Number(info.creatorId || operatorId),
- String(info.id),
- Number(info.userId || 0),
- Number(info.payAmountCents || Math.round(Number(info.fee || 0) * 100))
+ const [cand]: any = await conn.query(
+ `SELECT p.id
+ FROM participants p
+ JOIN activities a ON a.id = p.activity_id
+ WHERE p.verify_code = ?
+ AND p.checkin_status = 0
+ AND a.status <> 'CANCELLED'
+ AND (? = 1 OR a.creator_id = ?)
+ ORDER BY (a.creator_id = ?) DESC, p.created_at DESC`,
+ [verifyCode, adminFlag, operator, operator]
);
- } else if (info.type === 'ORDER') {
- await pool.query(`
- UPDATE orders
- SET status = '已到场核销'
- WHERE id = ?
- `, [info.id]);
- }
+ const [orderCand]: any = await conn.query(
+ `SELECT o.id
+ FROM orders o
+ LEFT JOIN companions c ON c.id = o.expert_id
+ WHERE o.verify_code = ?
+ AND o.status IN ('履约中', '服务中')
+ AND (? = 1 OR o.claimed_by = ? OR o.expert_id = ? OR c.user_id = ?)
+ ORDER BY o.created_at DESC`,
+ [verifyCode, adminFlag, operator, operator, operator]
+ );
+ if ((cand?.length || 0) + (orderCand?.length || 0) > 1) throw ambiguous;
+ if (cand && cand.length === 1) {
+ const [locked]: any = await conn.query(
+ `SELECT p.*, a.creator_id as creatorId, a.status as actStatus
+ FROM participants p
+ JOIN activities a ON a.id = p.activity_id
+ WHERE p.id = ? AND p.verify_code = ?
+ FOR UPDATE`,
+ [cand[0].id, verifyCode]
+ );
+ const pt = locked && locked[0];
+ if (!pt) throw new Error(`核销码 [${verifyCode}] 无效或不存在`);
+ if (!asAdmin && Number(pt.creatorId) !== operator) throw denied;
+ if (String(pt.actStatus || '') === 'CANCELLED') throw new Error('活动已解散,无法核销');
+ if (pt.checkin_status) {
+ throw new Error(`核销码 [${verifyCode}] 已完成现场签到,不可重复核销(防重校验已生效)`);
+ }
+ const [updateRes]: any = await conn.query(
+ `UPDATE participants
+ SET checkin_status = 1, verified_at = NOW(), verified_by = ?
+ WHERE id = ? AND checkin_status = 0`,
+ [operator, pt.id]
+ );
+ if (!updateRes || updateRes.affectedRows === 0) {
+ throw new Error(`核销码 [${verifyCode}] 已完成现场签到,不可重复核销(防重校验已生效)`);
+ }
+ await this.settleActivityCheckinAndReferral(
+ conn,
+ String(pt.activity_id),
+ Number(pt.creatorId || operator),
+ String(pt.id),
+ Number(pt.user_id || 0),
+ Number(pt.pay_amount_cents || 0)
+ );
+ await conn.commit();
+ return {
+ success: true,
+ info: {
+ type: 'ACTIVITY',
+ id: pt.id,
+ relatedId: pt.activity_id,
+ userId: pt.user_id,
+ creatorId: pt.creatorId,
+ code: verifyCode,
+ checkedIn: true,
+ },
+ verifiedAt: new Date().toISOString()
+ };
+ }
- return {
- success: true,
- info,
- verifiedAt: new Date().toISOString()
- };
+ if (!orderCand || orderCand.length === 0) {
+ throw denied;
+ }
+ if (orderCand.length > 1) throw ambiguous;
+ const [lockedOrder]: any = await conn.query(
+ 'SELECT id, status, expert_id, claimed_by FROM orders WHERE id = ? AND verify_code = ? FOR UPDATE',
+ [orderCand[0].id, verifyCode]
+ );
+ const ord = lockedOrder && lockedOrder[0];
+ if (!ord || !['履约中', '服务中'].includes(String(ord.status))) {
+ throw new Error(`核销码 [${verifyCode}] 当前状态不可核销`);
+ }
+ if (!asAdmin && Number(ord.claimed_by) !== operator && Number(ord.expert_id) !== operator) {
+ const [ownRows]: any = await conn.query(
+ 'SELECT id FROM companions WHERE id = ? AND user_id = ? LIMIT 1',
+ [Number(ord.expert_id) || 0, operator]
+ );
+ if (!ownRows || ownRows.length === 0) throw denied;
+ }
+ const [orderUpd]: any = await conn.query(
+ `UPDATE orders SET status = '已到场核销' WHERE id = ? AND status IN ('履约中', '服务中')`,
+ [ord.id]
+ );
+ if (!orderUpd || orderUpd.affectedRows === 0) {
+ throw new Error(`核销码 [${verifyCode}] 当前状态不可核销`);
+ }
+ await conn.commit();
+ return {
+ success: true,
+ info: { type: 'ORDER', id: ord.id, code: verifyCode, checkedIn: true },
+ verifiedAt: new Date().toISOString()
+ };
+ } catch (err) {
+ await conn.rollback();
+ throw err;
+ } finally {
+ conn.release();
+ }
}
async adjustPrice(activityId: string, newPriceCents: number, operatorId: number): Promise {
@@ -796,50 +1128,55 @@ export class MysqlRepository {
}
async cancelActivity(id: string, hostId: number, reason?: string, isAdmin?: boolean): Promise {
- const act = await this.getActivityById(id);
- if (!act) {
- throw new Error('活动不存在');
- }
- if (!isAdmin && Number(act.creatorId) !== Number(hostId)) {
- throw new Error('只有发起人或平台管理员有权解散此组局');
- }
- const hasCheckedIn = act.participants.some((p: any) => p.checkinStatus);
- if (!isAdmin && hasCheckedIn) {
- throw new Error('聚会已有成员到场核销,不可随意解散');
- }
-
const conn = await pool.getConnection();
try {
await conn.beginTransaction();
+ const [actRows]: any = await conn.query('SELECT * FROM activities WHERE id = ? FOR UPDATE', [id]);
+ if (!actRows || actRows.length === 0) {
+ throw new Error('活动不存在');
+ }
+ const act = actRows[0];
+ if (!isAdmin && Number(act.creator_id) !== Number(hostId)) {
+ throw new Error('只有发起人或平台管理员有权解散此组局');
+ }
+ if (String(act.status || '') === 'CANCELLED') {
+ throw new Error('活动已解散,不可重复退款');
+ }
+
+ const [pts]: any = await conn.query('SELECT * FROM participants WHERE activity_id = ? FOR UPDATE', [id]);
+ const participants = pts || [];
+ const hasCheckedIn = participants.some((p: any) => p.checkin_status);
+ if (!isAdmin && hasCheckedIn) {
+ throw new Error('聚会已有成员到场核销,不可随意解散');
+ }
- // 1. 更新活动状态为已取消
await conn.query(`UPDATE activities SET status = 'CANCELLED' WHERE id = ?`, [id]);
- // 2. 遍历已报名成员,原路退还报名费并记录财务流水
const refundDetails = [];
let totalRefundCents = 0;
-
- for (const p of act.participants) {
- const refundAmount = p.payAmountCents;
+ for (const p of participants) {
+ if (p.checkin_status) {
+ await this.clawbackActivitySettlement(conn, id, p);
+ }
+ const refundAmount = Number(p.pay_amount_cents || 0);
totalRefundCents += refundAmount;
- refundDetails.push({ userId: p.userId, refundAmountCents: refundAmount });
-
- // 退款至用户钱包余额
- await conn.query(`UPDATE users SET balance = balance + ? WHERE id = ?`, [refundAmount / 100, p.userId]);
-
- // 插入财务流水记录
- const finId = `fin_ref_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
- const recordNo = `RF${Date.now()}`;
- await conn.query(`
- INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id)
- VALUES (?, ?, ?, '组局解散全额退款', ?, 'IN', ?, ?)
- `, [finId, recordNo, p.userId, (refundAmount / 100).toFixed(2), `房主 ${hostId}`, id]);
+ refundDetails.push({ userId: p.user_id, refundAmountCents: refundAmount });
+ if (refundAmount > 0) {
+ await conn.query(`UPDATE users SET balance = balance + ? WHERE id = ?`, [refundAmount / 100, p.user_id]);
+ const finId = `fin_ref_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
+ const recordNo = `RF${Date.now()}${Math.floor(Math.random() * 100)}`;
+ await conn.query(`
+ INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id)
+ VALUES (?, ?, ?, '组局解散全额退款', ?, 'IN', ?, ?)
+ `, [finId, recordNo, p.user_id, (refundAmount / 100).toFixed(2), `房主 ${hostId}`, id]);
+ }
}
await conn.commit();
return {
success: true,
status: 'CANCELLED',
+ reason: reason || '',
refundedCount: refundDetails.length,
totalRefundCents,
refundDetails,
@@ -853,36 +1190,40 @@ export class MysqlRepository {
}
async leaveActivity(id: string, userId: number): Promise {
- const act = await this.getActivityById(id);
- if (!act) {
- throw new Error('活动不存在');
- }
- const pt = act.participants.find((p: any) => Number(p.userId) === Number(userId));
- if (!pt) {
- throw new Error('用户未报名该活动');
- }
- if (pt.checkinStatus) {
- throw new Error('已核销到场,无法申请退席');
- }
-
const conn = await pool.getConnection();
try {
await conn.beginTransaction();
+ const [actRows]: any = await conn.query('SELECT id, status FROM activities WHERE id = ? FOR UPDATE', [id]);
+ if (!actRows || actRows.length === 0) {
+ throw new Error('活动不存在');
+ }
+ if (String(actRows[0].status || '') === 'CANCELLED') {
+ throw new Error('活动已解散,请勿重复退席');
+ }
+ const [ptRows]: any = await conn.query(
+ 'SELECT * FROM participants WHERE activity_id = ? AND user_id = ? FOR UPDATE',
+ [id, userId]
+ );
+ if (!ptRows || ptRows.length === 0) {
+ throw new Error('用户未报名该活动');
+ }
+ const pt = ptRows[0];
+ if (pt.checkin_status) {
+ throw new Error('已核销到场,无法申请退席');
+ }
- // 删除参与者记录
- await conn.query(`DELETE FROM participants WHERE id = ?`, [pt.id]);
+ await conn.query(`DELETE FROM participants WHERE id = ? AND checkin_status = 0`, [pt.id]);
- // 原路退还报名费
- const refundAmount = pt.payAmountCents;
- await conn.query(`UPDATE users SET balance = balance + ? WHERE id = ?`, [refundAmount / 100, userId]);
-
- // 记录财务流水
- const finId = `fin_ref_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
- const recordNo = `RF${Date.now()}`;
- await conn.query(`
- INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id)
- VALUES (?, ?, ?, '成员退席原路退款', ?, 'IN', ?, ?)
- `, [finId, recordNo, userId, (refundAmount / 100).toFixed(2), `用户 ${userId} (组局退款)`, id]);
+ const refundAmount = Number(pt.pay_amount_cents || 0);
+ if (refundAmount > 0) {
+ await conn.query(`UPDATE users SET balance = balance + ? WHERE id = ?`, [refundAmount / 100, userId]);
+ const finId = `fin_ref_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
+ const recordNo = `RF${Date.now()}`;
+ await conn.query(`
+ INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id)
+ VALUES (?, ?, ?, '成员退席原路退款', ?, 'IN', ?, ?)
+ `, [finId, recordNo, userId, (refundAmount / 100).toFixed(2), `用户 ${userId} (组局退款)`, id]);
+ }
await conn.commit();
return {
@@ -1487,7 +1828,13 @@ export class MysqlRepository {
(out_refund_no, out_trade_no, order_id, refund_id, refund_cents, total_cents, status, reason, created_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())
ON DUPLICATE KEY UPDATE
- refund_id = VALUES(refund_id), status = VALUES(status), reason = VALUES(reason)`,
+ order_id = IF(VALUES(order_id) = '' OR VALUES(order_id) IS NULL, order_id, VALUES(order_id)),
+ out_trade_no = IF(VALUES(out_trade_no) = '' OR VALUES(out_trade_no) IS NULL, out_trade_no, VALUES(out_trade_no)),
+ refund_id = IF(VALUES(refund_id) = '' OR VALUES(refund_id) IS NULL, refund_id, VALUES(refund_id)),
+ refund_cents = IF(UPPER(status) IN ('SUCCESS', 'CLOSED', 'ABNORMAL'), refund_cents, VALUES(refund_cents)),
+ total_cents = IF(UPPER(status) IN ('SUCCESS', 'CLOSED', 'ABNORMAL'), total_cents, VALUES(total_cents)),
+ status = IF(UPPER(status) = 'SUCCESS' AND UPPER(VALUES(status)) <> 'SUCCESS', status, VALUES(status)),
+ reason = IF(VALUES(reason) = '' OR VALUES(reason) IS NULL, reason, VALUES(reason))`,
[
data.outRefundNo,
data.outTradeNo,
@@ -1502,9 +1849,185 @@ export class MysqlRepository {
return { ...data };
}
+ private async insertWechatRefundLedger(conn: any, order: any, amountYuan: number, financeType: string, outRefundNo: string): Promise {
+ const orderId = String(order.id);
+ const marker = wechatRefundCounterparty(outRefundNo);
+ const [done]: any = await conn.query(
+ 'SELECT id FROM finance_records WHERE related_id = ? AND direction = ? AND counterparty = ? LIMIT 1',
+ [orderId, 'IN', marker]
+ );
+ if (done && done.length) return;
+ await conn.query(`
+ INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())
+ `, [
+ `fin_wxr_${Date.now()}_${Math.floor(100 + Math.random() * 900)}`,
+ `WXR${Date.now()}${Math.floor(100 + Math.random() * 900)}`,
+ Number(order.buyer_id) || 0,
+ financeType,
+ amountYuan.toFixed(2),
+ marker,
+ orderId,
+ ]);
+ }
+
+ /**
+ * 微信退款到账后补记订单。同步受理时若仍是 PROCESSING,事务会回滚;回调 SUCCESS 再走这里。
+ * 已有同一退款单号的流水则直接返回,避免和同步成功路径重复扣佣。
+ */
+ async completeAcceptedWechatRefund(outRefundNo: string): Promise {
+ const conn = await pool.getConnection();
+ try {
+ await conn.beginTransaction();
+ const [rfRows]: any = await conn.query('SELECT * FROM payment_refunds WHERE out_refund_no = ? FOR UPDATE', [outRefundNo]);
+ const rec = rfRows && rfRows[0];
+ if (!rec || !rec.order_id) {
+ const missing: any = new Error('退款记录尚未落库,拒绝确认该回调');
+ missing.status = 409;
+ throw missing;
+ }
+ const [ordRows]: any = await conn.query('SELECT * FROM orders WHERE id = ? FOR UPDATE', [rec.order_id]);
+ const order = ordRows && ordRows[0];
+ if (!order) {
+ await conn.query('UPDATE payment_refunds SET status = ? WHERE out_refund_no = ?', ['SUCCESS', outRefundNo]);
+ await conn.commit();
+ return;
+ }
+ const marker = wechatRefundCounterparty(outRefundNo);
+ const [done]: any = await conn.query(
+ 'SELECT id FROM finance_records WHERE related_id = ? AND direction = ? AND counterparty = ? LIMIT 1',
+ [String(order.id), 'IN', marker]
+ );
+ if (done && done.length) {
+ await conn.query('UPDATE payment_refunds SET status = ? WHERE out_refund_no = ?', ['SUCCESS', outRefundNo]);
+ await conn.commit();
+ return;
+ }
+ const amountYuan = Number((Number(rec.refund_cents || 0) / 100).toFixed(2));
+ if (amountYuan > 0) {
+ await this.clawbackOrderSettlements(conn, order, amountYuan);
+ const total = Number(order.amount || 0);
+ const cumulative = Number(Math.min(total, Number(order.refund_amount || 0) + amountYuan).toFixed(2));
+ const nextStatus = cumulative >= total - 0.001 ? '已全额退款' : '已部分退款';
+ await conn.query('UPDATE orders SET status = ?, refund_amount = ? WHERE id = ?', [nextStatus, cumulative, order.id]);
+ await this.insertWechatRefundLedger(conn, order, amountYuan, '微信原路退款', outRefundNo);
+ if (nextStatus === '已全额退款') {
+ await this.releaseCouponWithConn(conn, order.id);
+ await conn.query('UPDATE arbitrations SET status = "已全额退款用户" WHERE order_id = ? AND status = "待平台仲裁"', [order.id]);
+ } else {
+ await conn.query('UPDATE arbitrations SET status = "已部分退款用户" WHERE order_id = ? AND status = "待平台仲裁"', [order.id]);
+ const remainAmt = Number(Math.max(0, total - cumulative).toFixed(2));
+ const [settledMark]: any = await conn.query(
+ `SELECT id FROM finance_records
+ WHERE related_id = ? AND direction = 'IN'
+ AND type IN ('大神完单收益结算', '仲裁部分结算', '部分退款剩余结算')
+ LIMIT 1`,
+ [String(order.id)]
+ );
+ if (remainAmt > 0 && !(settledMark && settledMark.length)) {
+ const split = await this.loadPayoutSplit(conn, remainAmt);
+ const comp = await this.resolveCompanionRow(order.expert_id || order.companion_name || 101);
+ const expertUserId = await this.resolveExpertCreditUserId(conn, order, comp);
+ await conn.query(
+ 'UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?',
+ [split.expertIncome, expertUserId]
+ );
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
+ VALUES (?, ?, ?, '部分退款剩余结算', ?, 'IN', ?, ?, NOW())`,
+ [`fin_wxset_${Date.now()}`, `PJS${Date.now()}`, expertUserId, split.expertIncome, order.client_name || '买家客户', String(order.id)]
+ );
+ await this.creditOrderReferrals(conn, {
+ relatedId: String(order.id),
+ orderNo: order.order_no || String(order.id),
+ amountYuan: remainAmt,
+ buyerId: Number(order.buyer_id) || 0,
+ fromUserName: order.client_name || '买家客户',
+ split,
+ });
+ }
+ }
+ }
+ await conn.query('UPDATE payment_refunds SET status = ? WHERE out_refund_no = ?', ['SUCCESS', outRefundNo]);
+ await conn.commit();
+ } catch (err) {
+ await conn.rollback();
+ throw err;
+ } finally {
+ conn.release();
+ }
+ }
+
+ /**
+ * 占住这笔微信退款的额度直到受理结束。处理中的记录留在 payment_refunds,后续退款要扣掉它。
+ * 锁在独立连接上,调用方事务回滚也不会把占额抹掉。
+ */
+ private async occupyRefundSlot(order: any, cents: number, outRefundNo: string, reason: string): Promise<{ release: () => Promise; newlyCreated: boolean }> {
+ const lockConn = await pool.getConnection();
+ const lockName = `pw_refund_${String(order.id)}`.slice(0, 64);
+ let locked = false;
+ let freed = false;
+ const release = async () => {
+ if (freed) return;
+ freed = true;
+ if (locked) {
+ locked = false;
+ try {
+ await lockConn.query('SELECT RELEASE_LOCK(?)', [lockName]);
+ } catch (e) {
+ logServerError('occupyRefundSlot.release', e);
+ }
+ }
+ lockConn.release();
+ };
+ try {
+ const [lk]: any = await lockConn.query('SELECT GET_LOCK(?, 8) AS got', [lockName]);
+ locked = Number(lk && lk[0] && lk[0].got) === 1;
+ if (!locked) {
+ const err: any = new Error('退款处理中,请稍后重试');
+ err.status = 409;
+ err.code = 40900;
+ throw err;
+ }
+ const amountCents = Math.round(Number(order.amount || 0) * 100);
+ const refundedCents = Math.round(Number(order.refund_amount || 0) * 100);
+ const [sumRows]: any = await lockConn.query(
+ `SELECT COALESCE(SUM(refund_cents), 0) AS pendingCents
+ FROM payment_refunds
+ WHERE order_id = ? AND UPPER(status) = 'PROCESSING' AND out_refund_no <> ?`,
+ [String(order.id), outRefundNo]
+ );
+ const pendingOthers = Number(sumRows && sumRows[0] && sumRows[0].pendingCents) || 0;
+ if (!canReserveRefund(amountCents, refundedCents, pendingOthers, cents)) {
+ const err: any = new Error('已有退款正在处理或超出可退金额');
+ err.status = 409;
+ err.code = 40900;
+ throw err;
+ }
+ const [existingRows]: any = await lockConn.query('SELECT out_refund_no FROM payment_refunds WHERE out_refund_no = ?', [outRefundNo]);
+ const newlyCreated = !existingRows?.length;
+ await lockConn.query(
+ `INSERT INTO payment_refunds
+ (out_refund_no, out_trade_no, order_id, refund_id, refund_cents, total_cents, status, reason, created_at)
+ VALUES (?, ?, ?, '', ?, ?, 'PROCESSING', ?, NOW())
+ ON DUPLICATE KEY UPDATE
+ order_id = IF(VALUES(order_id) = '' OR VALUES(order_id) IS NULL, order_id, VALUES(order_id)),
+ refund_cents = IF(UPPER(status) IN ('SUCCESS', 'CLOSED', 'ABNORMAL'), refund_cents, VALUES(refund_cents)),
+ total_cents = IF(UPPER(status) IN ('SUCCESS', 'CLOSED', 'ABNORMAL'), total_cents, VALUES(total_cents)),
+ status = IF(UPPER(status) IN ('SUCCESS', 'CLOSED', 'ABNORMAL'), status, 'PROCESSING'),
+ reason = IF(VALUES(reason) = '', reason, VALUES(reason))`,
+ [outRefundNo, String(order.id), String(order.id), cents, Math.max(amountCents, cents), (reason || '').slice(0, 255)]
+ );
+ return { release, newlyCreated };
+ } catch (err) {
+ await release();
+ throw err;
+ }
+ }
+
/**
* 执行订单退款(按支付渠道分流):
- * - 微信支付订单:调用微信原路退款(幂等 out_refund_no),失败抛错(不回退余额,防重复退款);
+ * - 微信支付订单:先占住可退额度;仅 SUCCESS 记账;PROCESSING 抛错让订单事务回滚,等回调到账后再结案;
* - 余额支付订单:退回用户钱包余额。
*/
private async refundOrderPayment(
@@ -1522,27 +2045,34 @@ export class MysqlRepository {
const paid = await this.orderPaidViaWechat(orderId);
if (paid.wechat) {
- const outRefundNo = `${tag}_${orderId}`.slice(0, 64);
- const r = await tryRefundToWeChat(orderId, cents, paid.totalCents || cents, reason, outRefundNo);
- if (r && r.ok) {
- await conn.query(`
- INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
- VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())
- `, [
- `fin_wxr_${Date.now()}_${Math.floor(100 + Math.random() * 900)}`,
- `WXR${Date.now()}${Math.floor(100 + Math.random() * 900)}`,
- Number(order.buyer_id) || 0,
- financeType,
- amountYuan.toFixed(2),
- '微信支付原路退款',
- orderId,
- ]);
- return { viaWechat: true };
+ const priorCents = Math.round(Number(order.refund_amount || 0) * 100);
+ const outRefundNo = buildOutRefundNo(tag, orderId, priorCents, cents);
+ const slot = await this.occupyRefundSlot(order, cents, outRefundNo, reason);
+ try {
+ const r = await tryRefundToWeChat(orderId, cents, paid.totalCents || cents, reason, outRefundNo);
+ const wxStatus = String((r && r.status) || '').toUpperCase();
+ const bookedNo = String((r && r.outRefundNo) || outRefundNo);
+ if (r && r.ok && wxStatus === 'SUCCESS') {
+ await this.insertWechatRefundLedger(conn, order, amountYuan, financeType, bookedNo);
+ return { viaWechat: true };
+ }
+ if (r && (r.pending || wxStatus === 'PROCESSING')) {
+ const err: any = new Error('微信退款已受理,到账确认前不会把订单标成已退款,请稍后重试');
+ err.status = 409;
+ err.code = 40900;
+ throw err;
+ }
+ // 只有本次新建且明确没有提交微信的占额可以释放;已有记录可能代表结果未知的请求。
+ if (r?.skipped && slot.newlyCreated) {
+ await pool.query("UPDATE payment_refunds SET status = 'CLOSED' WHERE out_refund_no = ? AND status = 'PROCESSING' AND (refund_id IS NULL OR refund_id = '')", [outRefundNo]);
+ }
+ const err: any = new Error(`微信原路退款失败:${(r && r.error) || '未知错误'}`);
+ err.status = 502;
+ err.code = 50200;
+ throw err;
+ } finally {
+ await slot.release();
}
- const err: any = new Error(`微信原路退款失败:${(r && r.error) || '未知错误'}`);
- err.status = 502;
- err.code = 50200;
- throw err;
}
// 余额支付:退回钱包余额
@@ -1572,27 +2102,44 @@ export class MysqlRepository {
let completedCount = 0;
try {
- // 1. 15分钟超时未支付 -> 自动流转为已取消
- const [cancelRes]: any = await pool.query(`
- UPDATE orders
- SET status = '已取消'
+ // 1. 15分钟超时未支付 -> 取消,并退券、冲销创建时写下的微信收入流水
+ const [unpaidRows]: any = await pool.query(`
+ SELECT * FROM orders
WHERE status IN ('待支付', '待付款')
AND created_at <= DATE_SUB(NOW(), INTERVAL 15 MINUTE)
`);
- cancelledCount = Number(cancelRes?.affectedRows || 0);
+ for (const ord of unpaidRows || []) {
+ const [upd]: any = await pool.query(
+ "UPDATE orders SET status = '已取消' WHERE id = ? AND status IN ('待支付', '待付款')",
+ [ord.id]
+ );
+ if (upd && upd.affectedRows === 1) {
+ await this.releaseCouponWithConn(pool, ord.id);
+ await this.reverseUnpaidWechatLedger(pool, ord);
+ cancelledCount += 1;
+ }
+ }
} catch (_) {}
try {
- // 2. 30分钟超时未接单 -> 自动流转为已全额退款并退还买家余额
+ // 2. 30分钟无人接单 -> 原路退款。含卡在「履约中」但没有承接人的派单(微信回调误推进)
const [expiredAcceptRows]: any = await pool.query(`
SELECT * FROM orders
- WHERE status = '待接单'
+ WHERE (
+ status = '待接单'
+ OR (
+ status = '履约中'
+ AND (expert_id IS NULL OR expert_id = 0)
+ AND (claimed_by IS NULL OR claimed_by = 0)
+ )
+ )
AND COALESCE(paid_at, created_at) <= DATE_SUB(NOW(), INTERVAL 30 MINUTE)
`);
for (const ord of expiredAcceptRows || []) {
+ const prevStatus = String(ord.status);
const [upd]: any = await pool.query(
- "UPDATE orders SET status = '已全额退款', refund_amount = amount WHERE id = ? AND status = '待接单'",
- [ord.id]
+ "UPDATE orders SET status = '已全额退款', refund_amount = amount WHERE id = ? AND status = ?",
+ [ord.id, prevStatus]
);
if (upd && upd.affectedRows === 1) {
const refundAmt = Number(ord.amount || 0);
@@ -1605,7 +2152,7 @@ export class MysqlRepository {
} catch (e) {
// 退款失败(如微信原路退款异常):回滚状态,等待下次扫描重试,避免"已退款但未到账"
try {
- await pool.query("UPDATE orders SET status = '待接单', refund_amount = 0 WHERE id = ?", [ord.id]);
+ await pool.query('UPDATE orders SET status = ?, refund_amount = 0 WHERE id = ?', [prevStatus, ord.id]);
} catch (_) {}
logServerError('processOrderTimeouts.refund', e);
}
@@ -2010,6 +2557,7 @@ export class MysqlRepository {
} else {
await conn.query('UPDATE orders SET status = "已取消" WHERE id = ?', [order.id]);
await this.releaseCouponWithConn(conn, order.id);
+ await this.reverseUnpaidWechatLedger(conn, order);
}
await conn.commit();
@@ -2023,6 +2571,53 @@ export class MysqlRepository {
}
}
+ /** 管理员取消:未支付只关单;已支付按剩余金额原路退,并扣回已结算佣金。 */
+ async adminCancelOrder(orderId: string): Promise {
+ const conn = await pool.getConnection();
+ try {
+ await conn.beginTransaction();
+ const [rows]: any = await conn.query('SELECT * FROM orders WHERE id = ? OR order_no = ? FOR UPDATE', [orderId, orderId]);
+ if (!rows || rows.length === 0) {
+ const err: any = new Error('订单不存在');
+ err.status = 404;
+ err.code = 40400;
+ throw err;
+ }
+ const order = rows[0];
+ const st = String(order.status);
+ if (['已取消', '已退款', '已全额退款'].includes(st)) {
+ await conn.commit();
+ return order;
+ }
+ if (st === '待付款' || st === '待支付') {
+ await conn.query('UPDATE orders SET status = "已取消" WHERE id = ?', [order.id]);
+ await this.releaseCouponWithConn(conn, order.id);
+ await this.reverseUnpaidWechatLedger(conn, order);
+ await conn.commit();
+ const [updated]: any = await pool.query('SELECT * FROM orders WHERE id = ?', [order.id]);
+ return updated[0] || order;
+ }
+
+ const alreadyRefunded = Number(order.refund_amount || 0);
+ const refundable = Number(Math.max(0, Number(order.amount || 0) - alreadyRefunded).toFixed(2));
+ if (refundable > 0) {
+ await this.clawbackOrderSettlements(conn, order, refundable);
+ await this.refundOrderPayment(conn, order, Math.round(refundable * 100), '管理员取消订单', '管理员取消订单退款', 'RFND_ADM_CX');
+ }
+ await conn.query('UPDATE orders SET status = "已全额退款", refund_amount = amount WHERE id = ?', [order.id]);
+ await this.releaseCouponWithConn(conn, order.id);
+ await conn.query('UPDATE arbitrations SET status = "已全额退款用户" WHERE order_id = ? AND status = "待平台仲裁"', [order.id]);
+ await conn.commit();
+ const [updated]: any = await pool.query('SELECT * FROM orders WHERE id = ?', [order.id]);
+ return updated[0] || order;
+ } catch (err) {
+ await conn.rollback();
+ throw err;
+ } finally {
+ conn.release();
+ }
+ }
+
/**
* 解析订单归属关系(买家 / 大神),用于写接口的身份越权校验。
* 大神身份采用「并集」策略:claimed_by(抢单人)∪ expert_id ∪ companions.user_id,
@@ -2174,23 +2769,39 @@ export class MysqlRepository {
);
const alreadySettled = settledRows && settledRows.length > 0;
+ if (['已部分退款', '争议仲裁中', '退款处理中'].includes(String(order.status))) {
+ const e: any = new Error(`订单当前状态【${order.status}】不可结算,已阻止覆盖退款状态`);
+ e.status = 409;
+ e.code = 40900;
+ throw e;
+ }
+
+ if (alreadySettled) {
+ if (String(order.status) === '待确认') {
+ await conn.query("UPDATE orders SET status = '已完成' WHERE id = ? AND status = '待确认'", [order.id]);
+ }
+ await conn.commit();
+ const [doneRows]: any = await conn.query('SELECT * FROM orders WHERE id = ?', [order.id]);
+ return doneRows[0] || order;
+ }
+
+ // 新结算只从「待确认」进入。履约中直接完成会跳过买家验收,把担保提前释放。
+ if (String(order.status) !== '待确认') {
+ const e: any = new Error(`订单当前状态【${order.status}】不可结算,请先由大神申请完成并进入待确认`);
+ e.status = 409;
+ e.code = 40900;
+ throw e;
+ }
+
await conn.query("UPDATE orders SET status = '已完成' WHERE id = ?", [order.id]);
if (!alreadySettled) {
- const [cfgRows]: any = await conn.query('SELECT * FROM finance_config WHERE id = 1 LIMIT 1');
- const cfg = (cfgRows && cfgRows[0]) || {
- platform_rate_percent: 10,
- first_referral_percent: 5,
- second_referral_percent: 2
- };
- const platformPct = Number(cfg.platform_rate_percent ?? 10);
- const firstRefPct = Number(cfg.first_referral_percent ?? 5);
- const secondRefPct = Number(cfg.second_referral_percent ?? 2);
-
const orderAmount = Number(order.amount) || 0;
+ const split = await this.loadPayoutSplit(conn, orderAmount);
+ const platformPct = split.platformPct;
if (orderAmount > 0) {
- const platformFee = Number(((orderAmount * platformPct) / 100).toFixed(2));
- const expertIncome = Number(Math.max(0, orderAmount - platformFee).toFixed(2));
+ const platformFee = split.platformFee;
+ const expertIncome = split.expertIncome;
const comp = await this.resolveCompanionRow(order.expert_id || order.companion_name || 101);
if (comp) {
@@ -2198,6 +2809,16 @@ export class MysqlRepository {
}
const expertUserId = await this.resolveExpertCreditUserId(conn, order, comp);
+ const [pendRf]: any = await conn.query(
+ "SELECT id FROM payment_refunds WHERE order_id = ? AND UPPER(status) = 'PROCESSING' LIMIT 1 FOR UPDATE",
+ [String(order.id)]
+ );
+ if (pendRf && pendRf.length) {
+ const e: any = new Error('退款处理中,暂不可结算');
+ e.status = 409;
+ e.code = 40900;
+ throw e;
+ }
await conn.query(
'UPDATE users SET commission = COALESCE(commission, 0) + ?, order_count = COALESCE(order_count, 0) + 1 WHERE id = ?',
[expertIncome, expertUserId]
@@ -2240,65 +2861,15 @@ export class MysqlRepository {
);
}
- // 二级分销自动返佣结算
- const [buyerRows]: any = await conn.query('SELECT id, nickname, inviter_id FROM users WHERE id = ? LIMIT 1', [buyerId]);
- const buyer = buyerRows && buyerRows[0];
- const fromUserName = buyer?.nickname || order.client_name || '客户玩家';
- const orderNo = order.order_no || String(order.id);
-
- if (buyer && buyer.inviter_id && firstRefPct > 0) {
- const lv1UserId = Number(buyer.inviter_id);
- const comm1 = Number(((orderAmount * firstRefPct) / 100).toFixed(2));
- if (comm1 > 0 && lv1UserId > 0 && lv1UserId !== buyerId) {
- await conn.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [comm1, lv1UserId]);
- await conn.query(
- `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
- VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, '已入账', NOW())`,
- [`dst_1_${ts}_${rand()}`, lv1UserId, buyerId, fromUserName, orderNo, orderAmount, comm1, firstRefPct]
- );
- await conn.query(
- `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
- VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())`,
- [
- `fin_ref1_${ts}_${rand()}`,
- `FX1${ts}${rand()}`,
- lv1UserId,
- `一级分销佣金 (${firstRefPct}%)`,
- comm1,
- fromUserName,
- String(order.id)
- ]
- );
- }
-
- const [lv1Rows]: any = await conn.query('SELECT id, inviter_id FROM users WHERE id = ? LIMIT 1', [lv1UserId]);
- const lv1User = lv1Rows && lv1Rows[0];
- if (lv1User && lv1User.inviter_id && secondRefPct > 0) {
- const lv2UserId = Number(lv1User.inviter_id);
- const comm2 = Number(((orderAmount * secondRefPct) / 100).toFixed(2));
- if (comm2 > 0 && lv2UserId > 0 && lv2UserId !== buyerId && lv2UserId !== lv1UserId) {
- await conn.query('UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?', [comm2, lv2UserId]);
- await conn.query(
- `INSERT INTO distribution_records (id, user_id, from_user_id, from_user_name, order_no, order_amount, commission, level, rate_percent, status, created_at)
- VALUES (?, ?, ?, ?, ?, ?, ?, 2, ?, '已入账', NOW())`,
- [`dst_2_${ts}_${rand()}`, lv2UserId, buyerId, fromUserName, orderNo, orderAmount, comm2, secondRefPct]
- );
- await conn.query(
- `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
- VALUES (?, ?, ?, ?, ?, 'IN', ?, ?, NOW())`,
- [
- `fin_ref2_${ts}_${rand()}`,
- `FX2${ts}${rand()}`,
- lv2UserId,
- `二级分销佣金 (${secondRefPct}%)`,
- comm2,
- fromUserName,
- String(order.id)
- ]
- );
- }
- }
- }
+ // 二级分销从平台抽成中列支,比例已在 splitFundedPayout 内封顶
+ await this.creditOrderReferrals(conn, {
+ relatedId: String(order.id),
+ orderNo: order.order_no || String(order.id),
+ amountYuan: orderAmount,
+ buyerId,
+ fromUserName: order.client_name || '客户玩家',
+ split,
+ });
}
}
@@ -3563,13 +4134,15 @@ export class MysqlRepository {
const order = ordRows && ordRows[0];
if (decision === 'refund_full' && order) {
- const refundAmount = Number(order.amount || 0);
+ const alreadyRefunded = Number(order.refund_amount || 0);
+ const refundAmount = Number(Math.max(0, Number(order.amount || 0) - alreadyRefunded).toFixed(2));
finalRefundAmount = refundAmount;
- // 1. 更新订单为已全额退款
- await conn.query('UPDATE orders SET status = "已全额退款", refund_amount = ? WHERE id = ?', [refundAmount, order.id]);
+ // 1. 更新订单为已全额退款(累计已退不超过原价)
+ await conn.query('UPDATE orders SET status = "已全额退款", refund_amount = amount WHERE id = ?', [order.id]);
- // 2. 原路退款:微信支付订单走微信退款 API,余额支付退回钱包余额
+ // 2. 先扣回已入账佣金,再原路退剩余金额
if (refundAmount > 0) {
+ await this.clawbackOrderSettlements(conn, order, refundAmount);
await this.refundOrderPayment(conn, order, Math.round(refundAmount * 100), '平台仲裁退款', '仲裁退款', 'RFND_ARB');
}
await this.releaseCouponWithConn(conn, order.id);
@@ -3582,24 +4155,37 @@ export class MysqlRepository {
}
} else if (decision === 'refund_partial' && order) {
const totalOrderAmt = Number(order.amount || 0);
- const partialAmt = refundAmountInput !== undefined && Number(refundAmountInput) > 0
- ? Math.min(totalOrderAmt, Number(Number(refundAmountInput).toFixed(2)))
+ const alreadyRefunded = Number(order.refund_amount || 0);
+ const refundable = Number(Math.max(0, totalOrderAmt - alreadyRefunded).toFixed(2));
+ const requested = refundAmountInput !== undefined && Number(refundAmountInput) > 0
+ ? Number(Number(refundAmountInput).toFixed(2))
: Number((totalOrderAmt * 0.5).toFixed(2));
- finalRefundAmount = partialAmt;
-
- await conn.query('UPDATE orders SET status = "已部分退款", refund_amount = ? WHERE id = ?', [partialAmt, order.id]);
-
- // 原路退款(微信支付→微信退款;余额支付→退回余额)
- if (partialAmt > 0) {
- await this.refundOrderPayment(conn, order, Math.round(partialAmt * 100), '平台仲裁部分退款', '仲裁部分退款', 'RFND_ARBP');
+ const partialAmt = Math.min(refundable, requested);
+ if (!(partialAmt > 0)) {
+ throw new Error('该订单已无可退金额');
}
+ finalRefundAmount = partialAmt;
+ const cumulative = Number((alreadyRefunded + partialAmt).toFixed(2));
+ const nextStatus = cumulative >= totalOrderAmt - 0.001 ? '已全额退款' : '已部分退款';
+ await conn.query('UPDATE orders SET status = ?, refund_amount = ? WHERE id = ?', [nextStatus, cumulative, order.id]);
- // 剩余未退部分解冻结算给大神
- const remainAmt = Number(Math.max(0, totalOrderAmt - partialAmt).toFixed(2));
- if (remainAmt > 0) {
+ await this.clawbackOrderSettlements(conn, order, partialAmt);
+ await this.refundOrderPayment(conn, order, Math.round(partialAmt * 100), '平台仲裁部分退款', '仲裁部分退款', 'RFND_ARBP');
+
+ // 尚未整单结算时,剩余金额按平台抽成配置结算给大神;已结算的只回冲,不再加一笔
+ const remainAmt = Number(Math.max(0, totalOrderAmt - cumulative).toFixed(2));
+ const [settledMark]: any = await conn.query(
+ `SELECT id FROM finance_records
+ WHERE related_id = ? AND direction = 'IN'
+ AND type IN ('大神完单收益结算', '仲裁部分结算', '部分退款剩余结算')
+ LIMIT 1`,
+ [String(order.id)]
+ );
+ if (remainAmt > 0 && !(settledMark && settledMark.length)) {
+ const split = await this.loadPayoutSplit(conn, remainAmt);
const comp = await this.resolveCompanionRow(order.expert_id || order.companion_name || 101);
const expertUserId = await this.resolveExpertCreditUserId(conn, order, comp);
- const expertIncome = Number((remainAmt * 0.9).toFixed(2));
+ const expertIncome = split.expertIncome;
await conn.query(
'UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?',
[expertIncome, expertUserId]
@@ -3610,10 +4196,18 @@ export class MysqlRepository {
INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
VALUES (?, ?, ?, '仲裁部分结算', ?, 'IN', ?, ?, NOW())
`, [setId, setNo, expertUserId, expertIncome, order.client_name || '买家客户', String(order.id)]);
+ await this.creditOrderReferrals(conn, {
+ relatedId: String(order.id),
+ orderNo: order.order_no || String(order.id),
+ amountYuan: remainAmt,
+ buyerId: Number(order.buyer_id) || 0,
+ fromUserName: order.client_name || '买家客户',
+ split,
+ });
}
} else if (order) {
- // 驳回退款申诉或仅扣减大神信用分:订单恢复为已完成并进入完单结算闭环
- await conn.query('UPDATE orders SET status = "已完成" WHERE id = ?', [order.id]);
+ // 驳回退款申诉或仅扣减大神信用分:先回到待确认,再走完单结算(只允许从待确认入账)
+ await conn.query('UPDATE orders SET status = "待确认" WHERE id = ?', [order.id]);
shouldSettleOrderId = String(order.id);
if (decision === 'deduct_credit') {
const expertId = Number(order.expert_id);
@@ -3675,7 +4269,7 @@ export class MysqlRepository {
}
orderRow = ordRows[0];
const curStatus = String(orderRow.status || '');
- const nonRefundable = ['待支付', '已取消', '已全额退款'];
+ const nonRefundable = ['待支付', '待付款', '已取消', '已全额退款'];
if (nonRefundable.includes(curStatus)) {
throw new Error(`当前订单状态为「${curStatus}」,不可执行退款`);
}
@@ -3684,12 +4278,17 @@ export class MysqlRepository {
if (totalOrderAmt <= 0) {
throw new Error('订单金额为0,无需退款');
}
+ const alreadyRefunded = Number(orderRow.refund_amount || 0);
+ const refundable = Number(Math.max(0, totalOrderAmt - alreadyRefunded).toFixed(2));
+ if (!(refundable > 0)) {
+ throw new Error('该订单已无可退金额');
+ }
if (refundType === 'full') {
- finalRefundAmount = totalOrderAmt;
- await conn.query('UPDATE orders SET status = "已全额退款", refund_amount = ? WHERE id = ?', [finalRefundAmount, orderId]);
+ finalRefundAmount = refundable;
+ await conn.query('UPDATE orders SET status = "已全额退款", refund_amount = ? WHERE id = ?', [totalOrderAmt, orderId]);
- // 原路退款(微信支付走微信退款 API,余额支付退回用户钱包)
+ await this.clawbackOrderSettlements(conn, orderRow, finalRefundAmount);
await this.refundOrderPayment(conn, orderRow, Math.round(finalRefundAmount * 100), reason || '平台管理员后台全额退款', '后台全额退款', 'ADM_RFND');
await this.releaseCouponWithConn(conn, orderId);
@@ -3697,38 +4296,57 @@ export class MysqlRepository {
await conn.query('UPDATE arbitrations SET status = "已全额退款用户" WHERE order_id = ? AND status = "待平台仲裁"', [orderId]);
} else {
const partialAmt = refundAmountInput !== undefined && Number(refundAmountInput) > 0
- ? Math.min(totalOrderAmt, Number(Number(refundAmountInput).toFixed(2)))
- : Number((totalOrderAmt * 0.5).toFixed(2));
+ ? Math.min(refundable, Number(Number(refundAmountInput).toFixed(2)))
+ : Math.min(refundable, Number((totalOrderAmt * 0.5).toFixed(2)));
if (partialAmt <= 0) {
throw new Error('部分退款金额必须大于0');
}
finalRefundAmount = partialAmt;
+ const cumulative = Number((alreadyRefunded + partialAmt).toFixed(2));
+ const nextStatus = cumulative >= totalOrderAmt - 0.001 ? '已全额退款' : '已部分退款';
+ await conn.query('UPDATE orders SET status = ?, refund_amount = ? WHERE id = ?', [nextStatus, cumulative, orderId]);
- await conn.query('UPDATE orders SET status = "已部分退款", refund_amount = ? WHERE id = ?', [finalRefundAmount, orderId]);
+ await this.clawbackOrderSettlements(conn, orderRow, partialAmt);
+ await this.refundOrderPayment(conn, orderRow, Math.round(partialAmt * 100), reason || '平台管理员后台部分退款', '后台部分退款', 'ADM_PRFND');
- // 原路退款
- await this.refundOrderPayment(conn, orderRow, Math.round(finalRefundAmount * 100), reason || '平台管理员后台部分退款', '后台部分退款', 'ADM_PRFND');
-
- // 剩余未退款项解冻结算至大神佣金账户
- const remainAmt = Number(Math.max(0, totalOrderAmt - finalRefundAmount).toFixed(2));
- if (remainAmt > 0) {
+ const remainAmt = Number(Math.max(0, totalOrderAmt - cumulative).toFixed(2));
+ const [settledMark]: any = await conn.query(
+ `SELECT id FROM finance_records
+ WHERE related_id = ? AND direction = 'IN'
+ AND type IN ('大神完单收益结算', '仲裁部分结算', '部分退款剩余结算')
+ LIMIT 1`,
+ [String(orderRow.id)]
+ );
+ if (remainAmt > 0 && !(settledMark && settledMark.length)) {
+ const split = await this.loadPayoutSplit(conn, remainAmt);
const comp = await this.resolveCompanionRow(orderRow.expert_id || orderRow.companion_name || 101);
const expertUserId = await this.resolveExpertCreditUserId(conn, orderRow, comp);
- const expertIncome = Number((remainAmt * 0.9).toFixed(2));
+ const expertIncome = split.expertIncome;
await conn.query(
'UPDATE users SET commission = COALESCE(commission, 0) + ? WHERE id = ?',
[expertIncome, expertUserId]
);
const setId = `fin_admset_${Date.now()}`;
const setNo = `PJS${Date.now()}`;
- await conn.query(`
- INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at)
- VALUES (?, ?, ?, '部分退款剩余结算', ?, 'IN', ?, ?, NOW())
- `, [setId, setNo, expertUserId, expertIncome, orderRow.client_name || '买家客户', String(orderRow.id)]);
+ await conn.query(
+ `INSERT INTO finance_records (id, record_no, user_id, type, amount, direction, counterparty, related_id, created_at) VALUES (?, ?, ?, '部分退款剩余结算', ?, 'IN', ?, ?, NOW())`,
+ [setId, setNo, expertUserId, expertIncome, orderRow.client_name || '买家客户', String(orderRow.id)]
+ );
+ await this.creditOrderReferrals(conn, {
+ relatedId: String(orderRow.id),
+ orderNo: orderRow.order_no || String(orderRow.id),
+ amountYuan: remainAmt,
+ buyerId: Number(orderRow.buyer_id) || 0,
+ fromUserName: orderRow.client_name || '买家客户',
+ split,
+ });
}
// 如果存在关联的待仲裁单,自动标记仲裁结案
- await conn.query('UPDATE arbitrations SET status = "已部分退款用户" WHERE order_id = ? AND status = "待平台仲裁"', [orderId]);
+ await conn.query(
+ 'UPDATE arbitrations SET status = ? WHERE order_id = ? AND status = "待平台仲裁"',
+ [nextStatus === '已全额退款' ? '已全额退款用户' : '已部分退款用户', orderId]
+ );
}
await conn.commit();
@@ -4126,15 +4744,24 @@ export class MysqlRepository {
}
async updateFinanceConfig(data: any): Promise {
+ const platformRatePercent = Number(data.platformRatePercent || 10);
+ const firstReferralPercent = Number(data.firstReferralPercent || 5);
+ const secondReferralPercent = Number(data.secondReferralPercent || 2);
+ if (firstReferralPercent + secondReferralPercent > platformRatePercent + 1e-9) {
+ const err: any = new Error('一级与二级分销比例之和不能超过平台抽成比例,分销从平台抽成中列支');
+ err.status = 400;
+ err.code = 40000;
+ throw err;
+ }
await pool.query(`
UPDATE finance_config
SET platform_rate_percent = ?, first_referral_percent = ?, second_referral_percent = ?,
min_withdraw_amount = ?, max_withdraw_amount = ?, withdraw_fee_percent = ?
WHERE id = 1
`, [
- data.platformRatePercent || 10,
- data.firstReferralPercent || 5,
- data.secondReferralPercent || 2,
+ platformRatePercent,
+ firstReferralPercent,
+ secondReferralPercent,
data.minWithdrawAmount || 50,
data.maxWithdrawAmount || 20000,
data.withdrawFeePercent || 0,
@@ -5053,8 +5680,12 @@ export class MysqlRepository {
if (intent.scene === 'RECHARGE') {
credited = await this.creditRechargeInTx(conn, intent);
} else if (intent.scene === 'ORDER' && intent.order_id) {
+ // 无指定大神的派单进入待接单池;指定大神的订单进入履约中
await conn.query(
- `UPDATE orders SET status = CASE WHEN status IN ('待支付','待付款') THEN '履约中' ELSE status END,
+ `UPDATE orders SET status = CASE
+ WHEN status IN ('待支付','待付款') AND (expert_id IS NULL OR expert_id = 0) THEN '待接单'
+ WHEN status IN ('待支付','待付款') THEN '履约中'
+ ELSE status END,
paid_at = COALESCE(paid_at, NOW())
WHERE id = ? OR order_no = ?`,
[intent.order_id, intent.order_id]
@@ -5562,8 +6193,10 @@ export class MysqlRepository {
const tagsJson = JSON.stringify(data.tags || []);
const content = data.content || '体验非常棒,好评!';
- // 6. 先完成结算(幂等且原子),再落库评价,避免"评价已存但结算失败"的半成品状态
- await this.completeOrderWithSettlement(String(order.id));
+ // 6. 只有待确认或已完成才触发结算。履约中评价不能把担保提前打给大神。
+ if (String(order.status) === '待确认' || String(order.status) === '已完成') {
+ await this.completeOrderWithSettlement(String(order.id));
+ }
await pool.query(`
INSERT INTO order_reviews (
diff --git a/server/src/index.ts b/server/src/index.ts
index ecde020..90fe9df 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -27,6 +27,7 @@ import {
transferToWallet,
queryTransferByOutBillNo,
createRefund,
+ queryRefundByOutRefundNo,
} from './core/pay/wechat-pay-v3';
import { sendSubscribeMessageHttp, buildTemplateData } from './core/notify/wechat-subscribe.service';
import { setWeChatRefundFn } from './core/pay/refund-bridge';
@@ -1241,7 +1242,7 @@ app.post('/api/activities/all/verify', async (req: Request, res: Response) => {
try {
const { operatorId, verifyCode } = req.body;
let operator = resolveSecureUserId(req, Number(operatorId || 0), '核销组局门票');
- const result = await repo.universalVerifyCheckin(String(verifyCode), operator);
+ const result = await repo.universalVerifyCheckin(String(verifyCode), operator, isVerifiedAdminRequest(req));
res.json({ code: 20000, data: result, message: '核销成功,已完成现场到场签到' });
} catch (err: any) {
const statusCode = err.status || 400;
@@ -1302,21 +1303,8 @@ app.post('/api/verify/universal', async (req: Request, res: Response) => {
try {
const { verifyCode, operatorId } = req.body;
const operator = resolveSecureUserId(req, Number(operatorId || 0), '核销门票');
- // 校验核销人归属:活动门票仅限发起人核销;订单门票仅限承接大神核销(不依赖 NODE_ENV)
- if (SECURE_MODE && !isVerifiedAdminRequest(req)) {
- const info = await repo.queryCheckinCodeInfo(String(verifyCode));
- let allowed = false;
- if (info.type === 'ACTIVITY') {
- allowed = Number(info.creatorId) === operator;
- } else if (info.type === 'ORDER') {
- const own = await repo.getOrderOwnership(String(info.id));
- allowed = Boolean(own) && own!.companionIds.includes(operator);
- }
- if (!allowed) {
- return res.status(403).json({ code: 40300, message: '无权核销该门票(非活动发起人或承接大神)' });
- }
- }
- const result = await repo.universalVerifyCheckin(String(verifyCode), operator);
+ // 仓储在事务内按操作人筛选并锁定唯一票据,避免全局撞码造成误拒绝。
+ const result = await repo.universalVerifyCheckin(String(verifyCode), operator, isVerifiedAdminRequest(req));
res.json({
code: 20000,
data: result,
@@ -2517,7 +2505,7 @@ app.post('/api/orders/:id/cancel', async (req: Request, res: Response) => {
}
// 买家取消:按状态安全处理(已付款待接单会原路退款;已进入履约需走退款申诉),避免静默吞掉已付款资金
const order = role.isAdmin
- ? await repo.updateOrderStatus(orderId, '已取消')
+ ? await repo.adminCancelOrder(orderId)
: await repo.buyerCancelOrder(orderId);
res.json({ code: 20000, data: order, message: '订单已取消' });
} catch (err: any) {
@@ -2591,16 +2579,22 @@ app.post('/api/orders/:id/pay', async (req: Request, res: Response) => {
return res.status(403).json({ code: 40300, message: '支付未通过服务端收款确认,禁止直接变更订单支付状态' });
}
- // 沙箱仅允许推进到「已支付待履约」的合法状态,严禁客户端任意指定终态或退款态
- const requested = String(req.body?.targetStatus || (Number(own.expertId) ? '履约中' : '待接单'));
+ // 沙箱只接受合法已支付状态。派单订单一律待接单,客户端不能把派单推进到履约中。
+ const requested = String(req.body?.targetStatus || '履约中');
const allowedSandboxStatuses = ['履约中', '待接单'];
if (!allowedSandboxStatuses.includes(requested)) {
- return res.status(400).json({ code: 40000, message: `非法的目标订单状态: ${requested}` });
+ return res.status(400).json({ code: 40000, message: '不支持的支付后状态' });
}
- const order = await repo.updateOrderStatus(orderId, requested);
- if (requested === '待接单') void notifyNearbyExpertsForOrder(order);
+ const isMarketplace = !Number(own.expertId);
+ const paidStatus = isMarketplace ? '待接单' : '履约中';
+ const order = await repo.updateOrderStatus(orderId, paidStatus);
const buyer = Number(own.buyerId || 0);
- pushUserNotification(buyer, 'ORDER_STATUS', '订单已开始服务', `订单 ${order?.order_no || orderId} 已进入${requested}${order?.verify_code ? `,核销码 ${order.verify_code}` : ''},请按时到场。`, '/pages/order/list');
+ if (paidStatus === '待接单') {
+ void notifyNearbyExpertsForOrder(order);
+ pushUserNotification(buyer, 'ORDER_STATUS', '支付成功,等待大神接单', `订单 ${order?.order_no || orderId} 已支付,正在为您匹配附近大神;30 分钟内无人接单将自动全额退款。`, '/pages/order/list');
+ return res.json({ code: 20000, data: order, message: '支付成功,已进入派单池,等待附近大神接单' });
+ }
+ pushUserNotification(buyer, 'ORDER_STATUS', '订单已开始服务', `订单 ${order?.order_no || orderId} 已进入履约中${order?.verify_code ? `,核销码 ${order.verify_code}` : ''},请按时到场。`, '/pages/order/list');
void notifyBySubscribe('orderStatus', {
userId: buyer,
page: '/pages/order/list',
@@ -2611,7 +2605,7 @@ app.post('/api/orders/:id/pay', async (req: Request, res: Response) => {
thing4: order?.verify_code ? `核销码${order.verify_code},请出示` : '请按时到场,感谢支持'
}
});
- res.json({ code: 20000, data: order, message: `支付成功,订单已进入${requested}` });
+ res.json({ code: 20000, data: order, message: '支付成功,订单已进入履约中' });
} catch (err: any) {
const statusCode = err.status || 400;
const errCode = err.code || 40000;
@@ -3140,39 +3134,111 @@ async function notifyBySubscribe(
}
}
-// 注册微信原路退款执行器(供仓储层退款时调用;未就绪时返回 skipped,由调用方回退余额退款)
+function wechatRefundResult(status: string, outRefundNo: string, refundId?: string) {
+ const st = String(status || 'PROCESSING').toUpperCase();
+ if (st === 'SUCCESS') return { ok: true, status: 'SUCCESS', refundId, outRefundNo };
+ if (st === 'PROCESSING') {
+ return { ok: false, pending: true, status: 'PROCESSING', refundId, outRefundNo, error: '微信退款处理中' };
+ }
+ return { ok: false, status: st, refundId, outRefundNo, error: `微信退款未成功:${st}` };
+}
+
+async function resolveWechatRefundStatus(cfg: any, outRefundNo: string, hinted?: string): Promise {
+ let status = String(hinted || '').toUpperCase();
+ if (status === 'SUCCESS' || status === 'CLOSED' || status === 'ABNORMAL') return status;
+ for (let i = 0; i < 3; i += 1) {
+ if (i > 0) await new Promise((resolve) => setTimeout(resolve, 500));
+ try {
+ const queried = await queryRefundByOutRefundNo(cfg, outRefundNo);
+ status = String((queried && queried.status) || status || 'PROCESSING').toUpperCase();
+ if (status === 'SUCCESS' || status === 'CLOSED' || status === 'ABNORMAL') return status;
+ } catch (e) {
+ logServerError('wechatRefund.query', e);
+ break;
+ }
+ }
+ return status || 'PROCESSING';
+}
+
+// 注册微信原路退款执行器。只有 SUCCESS 视为到账;PROCESSING 交给退款回调补记。
setWeChatRefundFn(async (orderId, refundCents, totalCents, reason, outRefundNo) => {
try {
const cfg: any = await resolveWechatPayRuntimeConfig();
if (!(cfg.effectiveMode === 'LIVE' && cfg.isReadyForLive)) {
return { ok: false, skipped: true, error: '微信支付未就绪' };
}
- // 幂等:已成功的退款直接返回
const existing = await repo.getRefundByOutRefundNo(outRefundNo);
- if (existing && existing.status === 'SUCCESS') {
- return { ok: true, status: 'SUCCESS', refundId: existing.refund_id };
+ if (existing && String(existing.status).toUpperCase() === 'SUCCESS') {
+ if (Number(existing.refund_cents) !== Math.round(Number(refundCents) || 0)) {
+ return { ok: false, error: '退款单号已占用且金额不一致' };
+ }
+ return { ok: true, status: 'SUCCESS', refundId: existing.refund_id, outRefundNo };
}
- const resp = await createRefund(cfg, {
- outTradeNo: orderId,
- outRefundNo,
- refundCents,
- totalCents,
- reason,
- notifyUrl: cfg.refundNotifyUrl || undefined,
- });
+ let activeNo = outRefundNo;
+ if (existing && ['CLOSED', 'ABNORMAL'].includes(String(existing.status).toUpperCase())) {
+ activeNo = `${outRefundNo}_R${Date.now().toString(36)}`.replace(/[^A-Za-z0-9_]/g, '').slice(0, 64);
+ }
+ const active = activeNo === outRefundNo ? existing : await repo.getRefundByOutRefundNo(activeNo);
+ const submitted = !!(active && String(active.refund_id || '').trim());
+ // 先写入退款记录,微信回调即使早于本次 HTTP 响应返回也能找到订单
+ if (!submitted) {
+ await repo.upsertRefundRecord({
+ outRefundNo: activeNo,
+ outTradeNo: orderId,
+ orderId,
+ refundId: '',
+ refundCents,
+ totalCents,
+ status: 'PROCESSING',
+ reason,
+ });
+ }
+ let hinted = submitted ? String(active.status || '') : '';
+ let refundId = submitted ? active.refund_id : '';
+ if (!submitted) {
+ const resp = await createRefund(cfg, {
+ outTradeNo: orderId,
+ outRefundNo: activeNo,
+ refundCents,
+ totalCents,
+ reason,
+ notifyUrl: cfg.refundNotifyUrl || undefined,
+ });
+ hinted = String((resp && resp.status) || 'PROCESSING');
+ refundId = resp && resp.refund_id;
+ }
+ const status = await resolveWechatRefundStatus(cfg, activeNo, hinted);
await repo.upsertRefundRecord({
- outRefundNo,
+ outRefundNo: activeNo,
outTradeNo: orderId,
orderId,
- refundId: resp && resp.refund_id,
+ refundId,
refundCents,
totalCents,
- status: String((resp && resp.status) || 'PROCESSING'),
+ status,
reason,
});
- return { ok: true, status: String((resp && resp.status) || 'PROCESSING'), refundId: resp && resp.refund_id };
+ return wechatRefundResult(status, activeNo, refundId);
} catch (e: any) {
logServerError('wechatRefund', e);
+ try {
+ const cfg: any = await resolveWechatPayRuntimeConfig();
+ const status = await resolveWechatRefundStatus(cfg, outRefundNo);
+ if (status === 'SUCCESS' || status === 'PROCESSING' || status === 'CLOSED' || status === 'ABNORMAL') {
+ await repo.upsertRefundRecord({
+ outRefundNo,
+ outTradeNo: orderId,
+ orderId,
+ refundCents,
+ totalCents,
+ status,
+ reason,
+ });
+ return wechatRefundResult(status, outRefundNo);
+ }
+ } catch (queryErr) {
+ logServerError('wechatRefund.recover', queryErr);
+ }
return { ok: false, error: (e && e.message) || String(e) };
}
});
@@ -3635,16 +3701,21 @@ app.post('/api/pay/wechat/refund-notify', async (req: Request, res: Response) =>
const refundStatus = plain && (plain.refund_status || plain.status);
if (outRefundNo && refundStatus) {
const existing = await repo.getRefundByOutRefundNo(String(outRefundNo));
- await repo.upsertRefundRecord({
- outRefundNo: String(outRefundNo),
- outTradeNo: String((plain && plain.out_trade_no) || (existing && existing.out_trade_no) || ''),
- orderId: String((existing && existing.order_id) || ''),
- refundId: String((plain && plain.refund_id) || (existing && existing.refund_id) || ''),
- refundCents: Number((existing && existing.refund_cents) || 0),
- totalCents: Number((existing && existing.total_cents) || 0),
- status: String(refundStatus),
- reason: String((existing && existing.reason) || ''),
- });
+ const normalized = String(refundStatus).toUpperCase();
+ if (normalized === 'SUCCESS') {
+ await repo.completeAcceptedWechatRefund(String(outRefundNo));
+ } else {
+ await repo.upsertRefundRecord({
+ outRefundNo: String(outRefundNo),
+ outTradeNo: String((plain && plain.out_trade_no) || (existing && existing.out_trade_no) || ''),
+ orderId: String((existing && existing.order_id) || ''),
+ refundId: String((plain && plain.refund_id) || (existing && existing.refund_id) || ''),
+ refundCents: Number((existing && existing.refund_cents) || 0),
+ totalCents: Number((existing && existing.total_cents) || 0),
+ status: normalized,
+ reason: String((existing && existing.reason) || ''),
+ });
+ }
}
}
res.json({ code: 'SUCCESS', message: '成功' });
@@ -3709,6 +3780,9 @@ app.post('/api/orders/:id/complete', async (req: Request, res: Response) => {
if (!role.isAdmin && !role.isBuyer && !role.isCompanion) {
return res.status(403).json({ code: 40300, message: '仅交易双方或平台管理员可完成该订单' });
}
+ if (!role.isAdmin && !role.isBuyer) {
+ return res.status(403).json({ code: 40300, message: '确认验收仅买家本人或平台管理员可操作,大神请先申请完成服务' });
+ }
const order = await repo.updateOrderStatus(orderId, '已完成');
pushUserNotification(Number(own.buyerId || 0), 'ORDER_STATUS', '订单已完成', `订单 ${orderId} 已完成,感谢使用,欢迎评价。`, '/pages/order/list');
const companionIds: number[] = Array.isArray(own?.companionIds) ? own.companionIds : [];
@@ -3764,12 +3838,11 @@ app.post('/api/orders/:id/refund', async (req: Request, res: Response) => {
});
// 管理员后台直接退款 (全额退款 / 部分退款,原路原渠道退回)
-app.post('/api/orders/:id/admin-refund', async (req: Request, res: Response) => {
+app.post('/api/orders/:id/admin-refund', requireAdmin, async (req: Request, res: Response) => {
try {
const orderId = String(req.params.id);
const { refundType, refundAmount, reason } = req.body || {};
- const headerRole = req.headers['x-user-role'];
- if (headerRole === 'user' || headerRole === 'expert' || headerRole === 'PLAYER' || headerRole === 'EXPERT') {
+ if (!isVerifiedAdminRequest(req)) {
return res.status(403).json({ code: 40300, message: '权限不足:仅平台管理员可执行直接退款' });
}
const type = refundType === 'partial' ? 'partial' : 'full';
@@ -3885,13 +3958,11 @@ app.get('/api/arbitrations', async (_req: Request, res: Response) => {
}
});
-app.post('/api/arbitrations/:id/handle', async (req: Request, res: Response) => {
+app.post('/api/arbitrations/:id/handle', requireAdmin, async (req: Request, res: Response) => {
try {
const arbId = String(req.params.id);
- const { decision, refundAmount, operatorRole } = req.body; // 'refund_full' | 'refund_partial' | 'reject' | 'deduct_credit'
- const headerRole = req.headers['x-user-role'];
- const callerRole = operatorRole || headerRole || 'admin';
- if (callerRole === 'user' || callerRole === 'expert' || callerRole === 'PLAYER' || callerRole === 'EXPERT') {
+ const { decision, refundAmount } = req.body || {}; // 'refund_full' | 'refund_partial' | 'reject' | 'deduct_credit'
+ if (!isVerifiedAdminRequest(req)) {
return res.status(403).json({ code: 40300, message: '权限不足:买家与大神不可越权执行管理员仲裁' });
}
const result = await repo.handleArbitration(arbId, decision, refundAmount !== undefined ? Number(refundAmount) : undefined);
diff --git a/server/tests/checkin-refund-regression.spec.ts b/server/tests/checkin-refund-regression.spec.ts
new file mode 100644
index 0000000..899f1bb
--- /dev/null
+++ b/server/tests/checkin-refund-regression.spec.ts
@@ -0,0 +1,32 @@
+jest.mock('../src/db/mysql', () => ({ pool: { getConnection: jest.fn(), query: jest.fn() } }));
+jest.mock('../src/core/pay/refund-bridge', () => ({ tryRefundToWeChat: jest.fn() }));
+
+import { pool } from '../src/db/mysql';
+import { tryRefundToWeChat } from '../src/core/pay/refund-bridge';
+import { MysqlRepository } from '../src/db/repository';
+
+describe('核销与退款回归', () => {
+ beforeEach(() => jest.resetAllMocks());
+
+ it('同码同时匹配授权活动和订单时拒绝核销', async () => {
+ const conn = {
+ beginTransaction: jest.fn(), commit: jest.fn(), rollback: jest.fn(), release: jest.fn(),
+ query: jest.fn().mockResolvedValueOnce([[{ id: 'ticket' }]]).mockResolvedValueOnce([[{ id: 'order' }]]),
+ };
+ (pool.getConnection as jest.Mock).mockResolvedValue(conn);
+ await expect(new MysqlRepository().universalVerifyCheckin('1234', 1)).rejects.toMatchObject({ status: 409 });
+ expect(conn.rollback).toHaveBeenCalled();
+ expect(conn.commit).not.toHaveBeenCalled();
+ });
+
+ it.each([true, false])('微信明确未提交时仅释放新建占额(新建:%s)', async (newlyCreated) => {
+ const repository: any = new MysqlRepository();
+ repository.orderPaidViaWechat = jest.fn().mockResolvedValue({ wechat: true, totalCents: 1000 });
+ const release = jest.fn();
+ repository.occupyRefundSlot = jest.fn().mockResolvedValue({ release, newlyCreated });
+ (tryRefundToWeChat as jest.Mock).mockResolvedValue({ ok: false, skipped: true, error: '未配置' });
+ await expect(repository.refundOrderPayment({}, { id: 'order', amount: 10 }, 1000, '', '', 'TEST')).rejects.toThrow('未配置');
+ expect(pool.query).toHaveBeenCalledTimes(newlyCreated ? 1 : 0);
+ expect(release).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/server/tests/clawback-math.spec.ts b/server/tests/clawback-math.spec.ts
new file mode 100644
index 0000000..d506f1f
--- /dev/null
+++ b/server/tests/clawback-math.spec.ts
@@ -0,0 +1,43 @@
+import { buildOutRefundNo, canReserveRefund, clawbackDelta, payoutClawbackKind } from '../src/core/finance/clawback';
+
+describe('退款回冲计算', () => {
+ it('整单结算后按仍留在平台的金额扣回,两次退完扣满', () => {
+ const first = clawbackDelta(90, 0, 100, 0, 40);
+ expect(first).toBe(36);
+ const second = clawbackDelta(90, first, 100, 40, 60);
+ expect(second).toBe(54);
+ expect(first + second).toBe(90);
+ });
+
+ it('剩余金额结算后再退,按剩余额扣满,不按原价打折', () => {
+ expect(clawbackDelta(54, 0, 100, 40, 60)).toBe(54);
+ expect(clawbackDelta(54, 0, 100, 40, 20)).toBe(18);
+ expect(clawbackDelta(54, 18, 100, 60, 40)).toBe(36);
+ });
+
+ it('带比例后缀的分销流水也要回冲', () => {
+ expect(payoutClawbackKind('一级分销佣金 (5%)')).toBe('referral1');
+ expect(payoutClawbackKind('二级分销佣金 (2%)')).toBe('referral2');
+ expect(payoutClawbackKind('一级分销佣金')).toBe('referral1');
+ expect(payoutClawbackKind('大神完单收益结算')).toBe('expert');
+ expect(payoutClawbackKind('部分退款剩余结算')).toBe('expert');
+ expect(payoutClawbackKind('活动核销费用清算')).toBeNull();
+ });
+
+ it('处理中的退款占用可退额度', () => {
+ expect(canReserveRefund(10000, 0, 4000, 6000)).toBe(true);
+ expect(canReserveRefund(10000, 0, 4000, 6001)).toBe(false);
+ expect(canReserveRefund(10000, 6000, 4000, 1000)).toBe(false);
+ expect(canReserveRefund(10000, 0, 0, 10000)).toBe(true);
+ expect(canReserveRefund(10000, 0, 0, 0)).toBe(false);
+ });
+
+ it('不同退款进度使用不同微信退款单号,同一笔重试单号不变', () => {
+ const first = buildOutRefundNo('ADM_PRFND', 'ord_1', 0, 4000);
+ const retry = buildOutRefundNo('ADM_PRFND', 'ord_1', 0, 4000);
+ const next = buildOutRefundNo('ADM_PRFND', 'ord_1', 4000, 6000);
+ expect(first).toBe(retry);
+ expect(next).not.toBe(first);
+ expect(first).toMatch(/^[A-Za-z0-9_]{6,64}$/);
+ });
+});
diff --git a/server/tests/funds-closed-loop.spec.ts b/server/tests/funds-closed-loop.spec.ts
new file mode 100644
index 0000000..72e1eb3
--- /dev/null
+++ b/server/tests/funds-closed-loop.spec.ts
@@ -0,0 +1,140 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * 资金闭环闸门:结算入口、退款回冲、组局同事务、分销封顶、支付后状态。
+ */
+describe('资金闭环闸门', () => {
+ const root = path.resolve(__dirname, '../../');
+ const read = (rel: string) => fs.readFileSync(path.join(root, rel), 'utf-8');
+ const repo = read('server/src/db/repository.ts');
+ const index = read('server/src/index.ts');
+ const list = read('pwuniapp/pages/order/list.vue');
+
+ const sliceFn = (code: string, name: string, len = 12000) => {
+ const start = code.indexOf(name);
+ expect(start).toBeGreaterThan(-1);
+ return code.slice(start, start + len);
+ };
+
+ it('完单结算只从待确认入账,退款回冲已入账佣金', () => {
+ const settle = sliceFn(repo, 'async completeOrderWithSettlement(');
+ expect(settle).toContain("String(order.status) !== '待确认'");
+ expect(settle).toContain('请先由大神申请完成并进入待确认');
+ expect(repo).toContain('async clawbackOrderSettlements(');
+ expect(repo).toContain("type = '结算回冲'");
+ });
+
+ it('退款按剩余可退,部分结算走平台抽成配置', () => {
+ const refund = sliceFn(repo, 'async adminRefundOrder(', 8000);
+ expect(refund).toContain('totalOrderAmt - alreadyRefunded');
+ expect(refund).toContain('loadPayoutSplit');
+ expect(refund).not.toContain('* 0.9');
+ const arb = sliceFn(repo, 'async handleArbitration(', 12000);
+ expect(arb).toContain('loadPayoutSplit');
+ expect(arb).toContain('clawbackOrderSettlements');
+ expect(arb).not.toContain('* 0.9');
+ });
+
+ it('组局核销、退席、解散同事务,收入记佣金且不可重复退', () => {
+ const verify = sliceFn(repo, 'async verifyCheckin(');
+ expect(verify).toContain('beginTransaction');
+ expect(verify).toContain('this.settleActivityCheckinAndReferral(');
+ const settle = sliceFn(repo, 'async settleActivityCheckinAndReferral(');
+ expect(settle).toContain('UPDATE users SET commission');
+ expect(repo).toContain('活动已解散,无法报名');
+ expect(repo).toContain('活动已解散,不可重复退款');
+ expect(repo).toContain("'活动核销回冲'");
+ });
+
+ it('分销从平台抽成列支,一二级比例之和不得超过抽成', () => {
+ expect(repo).toContain('splitFundedPayout');
+ expect(repo).toContain('分销从平台抽成中列支');
+ const cfg = sliceFn(repo, 'async updateFinanceConfig(');
+ expect(cfg).toContain('一级与二级分销比例之和不能超过平台抽成比例');
+ });
+
+ it('支付成功按是否指定大神写入待接单或履约中,超时与未支付取消补齐券和流水', () => {
+ const pay = sliceFn(repo, 'async applyPaymentSuccess(');
+ expect(pay).toContain("THEN '待接单'");
+ expect(pay).toContain("THEN '履约中'");
+ const timeout = sliceFn(repo, 'async processOrderTimeouts(');
+ expect(timeout).toContain('reverseUnpaidWechatLedger');
+ expect(timeout).toContain("status = '履约中'");
+ expect(timeout).toContain('claimed_by IS NULL OR claimed_by = 0');
+ expect(index).toContain('repo.adminCancelOrder(orderId)');
+ const route = index.indexOf("app.post('/api/orders/:id/pay'");
+ const sandbox = index.slice(route, route + 4200);
+ expect(sandbox).toContain("const paidStatus = isMarketplace ? '待接单' : '履约中'");
+ expect(sandbox).toContain("const allowedSandboxStatuses = ['履约中', '待接单']");
+ });
+
+ it('后台直接退款和仲裁只认管理员令牌', () => {
+ const refundRoute = index.indexOf("app.post('/api/orders/:id/admin-refund'");
+ const refundBlock = index.slice(refundRoute, refundRoute + 700);
+ expect(refundBlock).toContain('requireAdmin');
+ expect(refundBlock).toContain('isVerifiedAdminRequest(req)');
+ expect(refundBlock).not.toContain("req.headers['x-user-role']");
+ const arbRoute = index.indexOf("app.post('/api/arbitrations/:id/handle'");
+ const arbBlock = index.slice(arbRoute, arbRoute + 500);
+ expect(arbBlock).toContain('requireAdmin');
+ expect(arbBlock).toContain('isVerifiedAdminRequest(req)');
+ expect(arbBlock).not.toContain('operatorRole');
+ });
+
+ it('通用核销锁定具体票据并校验操作人', () => {
+ const verify = sliceFn(repo, 'async universalVerifyCheckin(');
+ expect(verify).toContain('a.creator_id = ?');
+ expect(verify).toContain('WHERE p.id = ? AND p.verify_code = ?');
+ expect(verify).toContain('FOR UPDATE');
+ expect(verify).toContain('无权核销该门票(非活动发起人或承接大神)');
+ expect(verify).toContain('核销码对应多张未核销门票,无法确定目标');
+ expect(verify).toContain("status IN ('履约中', '服务中')");
+ expect(verify).not.toContain('ORDER BY (a.creator_id = ?) DESC, p.created_at DESC\n LIMIT 1');
+ });
+
+ it('已结算订单不会把退款状态改回已完成', () => {
+ const settle = sliceFn(repo, 'async completeOrderWithSettlement(');
+ expect(settle).toContain('已阻止覆盖退款状态');
+ const settledAt = settle.indexOf('if (alreadySettled)');
+ const nextGate = settle.indexOf("String(order.status) !== '待确认'", settledAt);
+ const branch = settle.slice(settledAt, nextGate);
+ expect(branch).toContain("AND status = '待确认'");
+ expect(branch).not.toContain('WHERE id = ?", [order.id]');
+ });
+
+ it('退款记录先于微信请求落库,处理中占用可退额度', () => {
+ const fn = index.indexOf('setWeChatRefundFn(async');
+ const block = index.slice(fn, fn + 2800);
+ const saveAt = block.indexOf('先写入退款记录');
+ const createAt = block.indexOf('createRefund(');
+ expect(saveAt).toBeGreaterThan(-1);
+ expect(createAt).toBeGreaterThan(saveAt);
+ const pay = sliceFn(repo, 'private async occupyRefundSlot(');
+ expect(pay).toContain('GET_LOCK');
+ expect(pay).toContain('canReserveRefund');
+ expect(pay).toContain('已有退款正在处理或超出可退金额');
+ const done = sliceFn(repo, 'async completeAcceptedWechatRefund(');
+ expect(done).toContain('退款记录尚未落库,拒绝确认该回调');
+ expect(done).toContain('部分退款剩余结算');
+ const settle = sliceFn(repo, 'async completeOrderWithSettlement(');
+ expect(settle).toContain('退款处理中,暂不可结算');
+ });
+
+ it('微信退款只有 SUCCESS 才结案,PROCESSING 等回调补记', () => {
+ expect(index).toContain('pending: true');
+ expect(index).toContain('completeAcceptedWechatRefund');
+ const pay = sliceFn(repo, 'private async refundOrderPayment(');
+ expect(pay).toContain("wxStatus === 'SUCCESS'");
+ expect(pay).toContain('r.pending');
+ expect(pay).toContain('到账确认前不会把订单标成已退款');
+ });
+
+ it('小程序确认验收只在待确认出现,列表支付不再自带履约中', () => {
+ expect(list).toContain("order.rawStatus === '待确认'");
+ const payStart = list.indexOf('const payOrder = async');
+ const pay = list.slice(payStart, payStart + 1400);
+ expect(pay).not.toContain("targetStatus: '履约中'");
+ expect(index).toContain('确认验收仅买家本人或平台管理员可操作,大神请先申请完成服务');
+ });
+});
diff --git a/server/tests/ownership-hardening.spec.ts b/server/tests/ownership-hardening.spec.ts
index 1b81e77..75f1113 100644
--- a/server/tests/ownership-hardening.spec.ts
+++ b/server/tests/ownership-hardening.spec.ts
@@ -57,11 +57,9 @@ describe('第七批安全加固闸门 (评价回复 / 服务上下架 / 通用
describe('3. 通用核销归属 (生产闸门)', () => {
it('生产环境必须校验核销人:活动=发起人,订单=承接大神', () => {
const block = routeBlock("app.post('/api/verify/universal'");
- expect(block).toContain('SECURE_MODE && !isVerifiedAdminRequest(req)');
- expect(block).toContain("info.type === 'ACTIVITY'");
- expect(block).toContain('Number(info.creatorId) === operator');
- expect(block).toContain('own!.companionIds.includes(operator)');
- expect(block).toContain('无权核销该门票');
+ expect(block).toContain('resolveSecureUserId');
+ expect(block).toContain('repo.universalVerifyCheckin(String(verifyCode), operator, isVerifiedAdminRequest(req))');
+ expect(block).not.toContain('repo.queryCheckinCodeInfo');
});
});