From c905b3f9306c8acc9e024a5655291c754bc6f453 Mon Sep 17 00:00:00 2001 From: jacy <18049821889@163.com> Date: Wed, 2 Sep 2026 09:46:41 +0800 Subject: [PATCH] =?UTF-8?q?V4.0.9=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BAH5=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin-web/src/pages/PartnerBillsPage.tsx | 50 ++++--- apps/h5-partner/src/PartnerAppRoutes.tsx | 4 + .../src/layouts/SubAccountLayout.tsx | 2 + apps/h5-partner/src/lib/partnerAccess.ts | 4 +- apps/h5-partner/src/lib/settlement.ts | 16 ++ apps/h5-partner/src/pages/BankAccountPage.tsx | 141 ++++++++++++++++++ apps/h5-partner/src/pages/BillsPage.tsx | 6 +- apps/h5-partner/src/pages/CenterPage.tsx | 32 +++- apps/h5-partner/src/pages/HomePage.tsx | 29 ++-- apps/h5-partner/src/pages/SettlementPage.tsx | 71 +++------ apps/h5-partner/src/pages/StaffCreatePage.tsx | 2 +- apps/h5-partner/src/pages/UsersManagePage.tsx | 73 +++++---- apps/mini-user/src/lib/promo.ts | 19 +++ deploy/sync-prod-db-to-local.sh | 44 +++++- docs/杜康好客-v3编码手册.md | 10 +- docs/杜康好客-v4-PRD.md | 22 ++- docs/杜康好客-v4-现状对照.md | 10 +- docs/杜康好客-v4.0.9-开发文档.md | 70 +++++++++ packages/domain/src/shanghai-date.test.ts | 55 +++++++ packages/domain/src/shanghai-date.ts | 55 +++++++ packages/shared-types/src/partner-assoc.ts | 16 +- packages/shared-types/src/partner.ts | 12 ++ packages/shared-types/src/settlement.ts | 13 ++ scripts/smoke-v3.mjs | 9 +- .../migrate-partner-assoc-scan-v409.sql | 4 + server/dukang-api/prisma/schema.prisma | 1 + .../src/jobs/settlement.scheduler.ts | 24 +-- .../src/modules/iam/partner-staff.service.ts | 2 +- .../settlement/settlement.controller.ts | 71 ++++++++- .../modules/settlement/settlement.service.ts | 138 ++++++++++++++--- .../modules/store/partner-assoc.controller.ts | 33 +++- .../modules/store/partner-assoc.service.ts | 29 +++- .../src/modules/store/store.module.ts | 2 + 33 files changed, 893 insertions(+), 176 deletions(-) create mode 100644 apps/h5-partner/src/lib/settlement.ts create mode 100644 apps/h5-partner/src/pages/BankAccountPage.tsx create mode 100644 docs/杜康好客-v4.0.9-开发文档.md create mode 100644 server/dukang-api/prisma/migrate-partner-assoc-scan-v409.sql diff --git a/apps/admin-web/src/pages/PartnerBillsPage.tsx b/apps/admin-web/src/pages/PartnerBillsPage.tsx index 9d7ef7e..b65d6f1 100644 --- a/apps/admin-web/src/pages/PartnerBillsPage.tsx +++ b/apps/admin-web/src/pages/PartnerBillsPage.tsx @@ -103,6 +103,11 @@ function partnerDashLabel(p?: { return company || person || (p.phone || '').trim() || '—'; } +function weekMonday(d: Dayjs) { + const wd = d.day(); + return d.subtract(wd === 0 ? 6 : wd - 1, 'day').startOf('day'); +} + export default function PartnerBillsPage() { const [form] = Form.useForm(); const [filters, setFilters] = useState>({}); @@ -113,8 +118,7 @@ export default function PartnerBillsPage() { const qs = new URLSearchParams(); if (filters.status) qs.set('status', filters.status); if (filters.partnerId) qs.set('partnerId', filters.partnerId); - if (filters.year) qs.set('year', filters.year); - if (filters.month) qs.set('month', filters.month); + if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd); return qs; }, [filters], @@ -136,19 +140,18 @@ export default function PartnerBillsPage() { .catch(() => {}); }, []); - async function generateBill(values: { partnerId?: string; month: Dayjs }) { - const year = values.month.year(); - const month = values.month.month() + 1; + async function generateBill(values: { partnerId?: string; week: Dayjs }) { + const weekStartYmd = weekMonday(values.week).format('YYYY-MM-DD'); if (!values.partnerId) { const result = await request<{ success: number; failed: number; total: number }>( '/admin/partner-bills/generate-all', - { method: 'POST', body: JSON.stringify({ year, month }) }, + { method: 'POST', body: JSON.stringify({ weekStartYmd }) }, ); message.success(`已生成 ${result.success}/${result.total} 份账单${result.failed ? `，失败 ${result.failed}` : ''}`); } else { await request('/admin/partner-bills/generate', { method: 'POST', - body: JSON.stringify({ partnerId: values.partnerId, year, month }), + body: JSON.stringify({ partnerId: values.partnerId, weekStartYmd }), }); message.success('账单已生成（待审核）'); } @@ -259,10 +262,9 @@ export default function PartnerBillsPage() { const qs = new URLSearchParams(); if (filters.status) qs.set('status', filters.status); if (filters.partnerId) qs.set('partnerId', filters.partnerId); - if (filters.year) qs.set('year', filters.year); - if (filters.month) qs.set('month', filters.month); + if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd); const result = await request<{ csv: string; count: number }>(`/admin/partner-bills/export?${qs}`); - const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all'; + const suffix = filters.weekStartYmd || 'all'; downloadExcelCsv(result.csv, `合伙人账单_${suffix}.csv`); message.success(`已导出 ${result.count} 条`); } finally { @@ -274,7 +276,9 @@ export default function PartnerBillsPage() { const partnerName = (r: Row) => partnerDashLabel(r.partnerAccount ?? r.partner); const partnerBank = (r: Row) => r.partnerAccount ?? r.partner; const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id)); - const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED'); + const canSend = selectedRows.filter( + (r) => (r.status === 'PENDING_REVIEW' || r.status === 'REJECTED') && Number(r.totalAmount) > 0, + ); const canPay = selectedRows.filter((r) => r.status === 'UNPAID'); const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0); @@ -313,8 +317,9 @@ export default function PartnerBillsPage() { { title: '合计应付', dataIndex: 'totalAmount', - width: 110, - render: (v) => `¥${Number(v).toFixed(2)}`, + width: 130, + render: (v) => + Number(v) <= 0 ? '¥0.00（不同步）' : `¥${Number(v).toFixed(2)}`, }, { title: '收款户名', @@ -350,7 +355,7 @@ export default function PartnerBillsPage() { - {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && ( + {(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && Number(row.totalAmount) > 0 && ( @@ -383,7 +388,7 @@ export default function PartnerBillsPage() { {summary && ( @@ -401,12 +406,11 @@ export default function PartnerBillsPage() { form={form} layout="inline" style={{ marginBottom: 16 }} - onFinish={(v: { partnerId?: string; status?: string; month?: Dayjs }) => { + onFinish={(v: { partnerId?: string; status?: string; week?: Dayjs }) => { setFilters({ partnerId: v.partnerId || '', status: v.status || '', - year: v.month ? String(v.month.year()) : '', - month: v.month ? String(v.month.month() + 1) : '', + weekStartYmd: v.week ? weekMonday(v.week).format('YYYY-MM-DD') : '', }); setPage(1); }} @@ -424,8 +428,8 @@ export default function PartnerBillsPage() { }))} /> - - + + } /> } /> } /> + } /> } /> } /> } /> @@ -71,6 +73,7 @@ function SubAccountRoutes() { }> } /> + } /> {isWarehouse ? ( } /> ) : ( @@ -86,6 +89,7 @@ function SubAccountRoutes() { )} } /> + } /> {isWarehouse && } />} } /> diff --git a/apps/h5-partner/src/layouts/SubAccountLayout.tsx b/apps/h5-partner/src/layouts/SubAccountLayout.tsx index 69a0f9e..f096796 100644 --- a/apps/h5-partner/src/layouts/SubAccountLayout.tsx +++ b/apps/h5-partner/src/layouts/SubAccountLayout.tsx @@ -3,12 +3,14 @@ import type { PartnerNavKind } from '../lib/partnerAccess'; const STORE_STAFF_TABS = [ { to: '/', end: true, icon: 'dashboard', label: '首页' }, + { to: '/users', icon: 'group', label: '用户管理' }, { to: '/stores', icon: 'store', label: '门店管理' }, { to: '/me', icon: 'person', label: '个人中心' }, ] as const; const WAREHOUSE_STAFF_TABS = [ { to: '/', end: true, icon: 'dashboard', label: '首页' }, + { to: '/users', icon: 'group', label: '用户管理' }, { to: '/orders', icon: 'receipt_long', label: '订单管理' }, { to: '/me', icon: 'person', label: '个人中心' }, ] as const; diff --git a/apps/h5-partner/src/lib/partnerAccess.ts b/apps/h5-partner/src/lib/partnerAccess.ts index 5b29587..84146eb 100644 --- a/apps/h5-partner/src/lib/partnerAccess.ts +++ b/apps/h5-partner/src/lib/partnerAccess.ts @@ -94,8 +94,8 @@ export function partnerHomePath(account: PartnerMe | null | undefined): string { return '/'; } -const STORE_STAFF_PREFIXES = ['/', '/stores', '/me', '/leaderboard', '/login']; -const WAREHOUSE_STAFF_PREFIXES = ['/', '/orders', '/me', '/leaderboard', '/login']; +const STORE_STAFF_PREFIXES = ['/', '/stores', '/users', '/me', '/leaderboard', '/login']; +const WAREHOUSE_STAFF_PREFIXES = ['/', '/orders', '/users', '/me', '/leaderboard', '/login']; export function isSubAccountPath(pathname: string, navKind: PartnerNavKind = 'store_staff'): boolean { if (pathname === '/login') return true; diff --git a/apps/h5-partner/src/lib/settlement.ts b/apps/h5-partner/src/lib/settlement.ts new file mode 100644 index 0000000..256b506 --- /dev/null +++ b/apps/h5-partner/src/lib/settlement.ts @@ -0,0 +1,16 @@ +import type { PartnerSettlementPreviewDto } from '@dukang/shared-types'; + +export function formatBillPeriod(start?: string | null, end?: string | null) { + const s = String(start || '').slice(0, 10); + const e = String(end || '').slice(0, 10); + if (!s) return '—'; + if (!e || e === s) return s; + return `${s} ~ ${e}`; +} + +export function formatIssueLabel(preview: Pick | null) { + if (!preview?.nextIssueAt) return preview?.cycleLabel || '每周一 08:00 出账'; + const ymd = new Date(preview.nextIssueAt).toLocaleDateString('sv-SE', { timeZone: 'Asia/Shanghai' }); + if (!ymd || ymd === 'Invalid Date') return preview.cycleLabel || '每周一 08:00 出账'; + return `${ymd} 08:00 出账`; +} diff --git a/apps/h5-partner/src/pages/BankAccountPage.tsx b/apps/h5-partner/src/pages/BankAccountPage.tsx new file mode 100644 index 0000000..8d7f7ec --- /dev/null +++ b/apps/h5-partner/src/pages/BankAccountPage.tsx @@ -0,0 +1,141 @@ +import { useEffect, useState } from 'react'; +import { useNavigate } from 'react-router-dom'; +import PageHeader from '@dukang/shared-ui/PageHeader'; +import type { PartnerMe, UpdatePartnerBankRequest } from '@dukang/shared-types'; +import { request } from '../lib/api'; +import { usePartnerSession } from '../contexts/PartnerSessionContext'; +import { toastError, toastSuccess } from '../lib/toast'; + +type FieldErrors = { + bankAccountName?: string; + bankAccountNo?: string; + bankBranch?: string; +}; + +export default function BankAccountPage() { + const navigate = useNavigate(); + const { account, refresh } = usePartnerSession(); + const [bankAccountName, setBankAccountName] = useState(account?.bankAccount?.bankAccountName ?? ''); + const [bankAccountNo, setBankAccountNo] = useState(account?.bankAccount?.bankAccountNo ?? ''); + const [bankBranch, setBankBranch] = useState(account?.bankAccount?.bankBranch ?? ''); + const [submitting, setSubmitting] = useState(false); + const [fieldErrors, setFieldErrors] = useState({}); + + useEffect(() => { + document.title = '收款账户'; + }, []); + + useEffect(() => { + setBankAccountName(account?.bankAccount?.bankAccountName ?? ''); + setBankAccountNo(account?.bankAccount?.bankAccountNo ?? ''); + setBankBranch(account?.bankAccount?.bankBranch ?? ''); + }, [account?.bankAccount]); + + async function submit() { + const name = bankAccountName.trim(); + const no = bankAccountNo.replace(/\s+/g, ''); + const branch = bankBranch.trim(); + const next: FieldErrors = {}; + if (!name) next.bankAccountName = '请填写收款人'; + if (!/^\d{8,32}$/.test(no)) next.bankAccountNo = '请填写 8～32 位数字账号'; + if (!branch) next.bankBranch = '请填写开户行名称'; + setFieldErrors(next); + if (Object.keys(next).length) return; + + setSubmitting(true); + try { + const body: UpdatePartnerBankRequest = { + bankAccountName: name, + bankAccountNo: no, + bankBranch: branch, + }; + await request('PARTNER_H5', '/partner/me/bank', { + method: 'PUT', + body: JSON.stringify(body), + }); + await refresh(); + toastSuccess('收款账户已保存'); + navigate('/center'); + } catch (e) { + toastError(e instanceof Error ? e.message : '保存失败'); + } finally { + setSubmitting(false); + } + } + + return ( +
+ navigate('/center')} /> + +
+
+
+

银行账号

+
+

+ 用于总部打款。请填写与合同一致的对公或对私账户。 +

+ +
+ +
+ person + setBankAccountName(e.target.value)} + /> +
+ {fieldErrors.bankAccountName && ( +

{fieldErrors.bankAccountName}

+ )} +
+ +
+ +
+ credit_card + setBankAccountNo(e.target.value.replace(/[^\d]/g, ''))} + /> +
+ {fieldErrors.bankAccountNo && ( +

{fieldErrors.bankAccountNo}

+ )} +
+ +
+ +
+ account_balance + setBankBranch(e.target.value)} + /> +
+ {fieldErrors.bankBranch && ( +

{fieldErrors.bankBranch}

+ )} +
+
+ +
+ +
+
+ ); +} diff --git a/apps/h5-partner/src/pages/BillsPage.tsx b/apps/h5-partner/src/pages/BillsPage.tsx index f58d89b..e6bced4 100644 --- a/apps/h5-partner/src/pages/BillsPage.tsx +++ b/apps/h5-partner/src/pages/BillsPage.tsx @@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader'; import PullToRefresh from '@dukang/shared-ui/PullToRefresh'; import type { PartnerBillDetailDto, PartnerBillDto, PartnerBillItemDto } from '@dukang/shared-types'; import { isLoggedIn, request } from '../lib/api'; +import { formatBillPeriod } from '../lib/settlement'; import { toastError, toastSuccess } from '../lib/toast'; import { usePartnerPageView } from '../lib/usePageView'; @@ -188,7 +189,8 @@ export default function BillsPage() {

SETTLEMENT PERIOD

-

{String(bill.billNo || '月度结算账单')}

+

{String(bill.billNo || '周结算账单')}

+

{formatBillPeriod(bill.periodStart, bill.periodEnd)}

{billStatusLabel(status)} @@ -271,7 +273,7 @@ export default function BillsPage() {

{b.billNo}

-

{billStatusLabel(b.status)}

+

{formatBillPeriod(b.periodStart, b.periodEnd)} · {billStatusLabel(b.status)}

{b.status === 'REJECTED' && b.rejectReason ? (

驳回：{b.rejectReason}

) : null} diff --git a/apps/h5-partner/src/pages/CenterPage.tsx b/apps/h5-partner/src/pages/CenterPage.tsx index a2067ae..ad32a59 100644 --- a/apps/h5-partner/src/pages/CenterPage.tsx +++ b/apps/h5-partner/src/pages/CenterPage.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { Link } from 'react-router-dom'; -import type { PartnerBillDto } from '@dukang/shared-types'; +import type { PartnerBillDto, PartnerSettlementPreviewDto } from '@dukang/shared-types'; import { isWxAuthorizeEnabled } from '@dukang/shared-types'; import PullToRefresh from '@dukang/shared-ui/PullToRefresh'; import { request } from '../lib/api'; @@ -8,6 +8,7 @@ import { usePartnerSession } from '../contexts/PartnerSessionContext'; import { contactSupport } from '../lib/contact'; import { isPrimaryAccount } from '../lib/partnerAccess'; import { listPartnerStaff } from '../lib/staff'; +import { formatBillPeriod, formatIssueLabel } from '../lib/settlement'; import { toastError, toastSuccess } from '../lib/toast'; import { authorizePartnerWechat, @@ -31,6 +32,7 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag const isPrimary = variant === 'primary' && isPrimaryAccount(account); const [authorizing, setAuthorizing] = useState(false); const [bills, setBills] = useState([]); + const [preview, setPreview] = useState(null); const [staffCount, setStaffCount] = useState(0); useEffect(() => { @@ -44,6 +46,9 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag request('PARTNER_H5', '/partner/settlement/bills') .then(setBills) .catch(() => setBills([])), + request('PARTNER_H5', '/partner/settlement/preview') + .then(setPreview) + .catch(() => setPreview(null)), listPartnerStaff() .then((list) => setStaffCount(list.length)) .catch(() => setStaffCount(0)), @@ -188,6 +193,15 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag

账户余额 (元)

{fmtMoney(finance.balance)}

+
+

预付款

+

¥ {fmtMoney(preview?.prepaymentAmount ?? 0)}

+

+ {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} +
+ {formatIssueLabel(preview)} +

+

待结算

¥ {fmtMoney(finance.pendingTotal)}

@@ -219,6 +233,22 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag chevron_right
+ +
+
+ account_balance +
+ 收款账户 +
+
+ {account?.bankAccount?.bankAccountNo ? ( + {account.bankAccount.bankAccountNo.slice(-4)} + ) : ( + 未填写 + )} + chevron_right +
+
diff --git a/apps/h5-partner/src/pages/HomePage.tsx b/apps/h5-partner/src/pages/HomePage.tsx index ccf35bd..6c4bf2b 100644 --- a/apps/h5-partner/src/pages/HomePage.tsx +++ b/apps/h5-partner/src/pages/HomePage.tsx @@ -1,10 +1,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { Link, useNavigate } from 'react-router-dom'; -import type { PartnerAssocStats, PartnerLeaderboardEntry } from '@dukang/shared-types'; +import type { PartnerAssocStats, PartnerLeaderboardEntry, PartnerSettlementPreviewDto } from '@dukang/shared-types'; import PullToRefresh from '@dukang/shared-ui/PullToRefresh'; import { usePartnerPageView } from '../lib/usePageView'; import { isLoggedIn, request } from '../lib/api'; import { fetchPartnerLeaderboard } from '../lib/leaderboard'; +import { formatBillPeriod, formatIssueLabel } from '../lib/settlement'; import { canAccessPartnerDashboard, canAccessPartnerOrders, @@ -154,6 +155,7 @@ export default function HomePage() { const [orders, setOrders] = useState>>([]); const [leaderboardEntries, setLeaderboardEntries] = useState([]); const [assocStats, setAssocStats] = useState(null); + const [preview, setPreview] = useState(null); useEffect(() => { document.title = '工作台'; @@ -203,9 +205,13 @@ export default function HomePage() { request('PARTNER_H5', '/partner/assoc/stats', { silent: true }) .then(setAssocStats) .catch(() => setAssocStats(null)), + request('PARTNER_H5', '/partner/settlement/preview', { silent: true }) + .then(setPreview) + .catch(() => setPreview(null)), ); } else { setAssocStats(null); + setPreview(null); } tasks.push( @@ -245,27 +251,20 @@ export default function HomePage() { ? Math.round(((monthNew - lastMonthNew) / lastMonthNew) * 100) : (monthNew > 0 ? 100 : 0); - const orderCount = Number(dash?.orderCount || orderStats.todayCount || 0); - const revenue = orderCount * 128.45; - const profit = revenue * 0.25; - return (
{isPrimary && ( <>
-

- 实时营业额 (CNY) - info +

预付款金额 (CNY)

+
{fmtMoney(preview?.prepaymentAmount ?? 0)}
+

+ 账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)} +

+

+ 本周酒单与核销预估佣金，实际以账单为准

-
{fmtMoney(revenue)}
-
-
-

预计利润

-

¥ {fmtMoney(profit)}

-
-
diff --git a/apps/h5-partner/src/pages/SettlementPage.tsx b/apps/h5-partner/src/pages/SettlementPage.tsx index 60daead..3736726 100644 --- a/apps/h5-partner/src/pages/SettlementPage.tsx +++ b/apps/h5-partner/src/pages/SettlementPage.tsx @@ -2,8 +2,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import PageHeader from '@dukang/shared-ui/PageHeader'; import PullToRefresh from '@dukang/shared-ui/PullToRefresh'; -import type { PartnerBillDto } from '@dukang/shared-types'; +import type { PartnerBillDto, PartnerSettlementPreviewDto } from '@dukang/shared-types'; import { isLoggedIn, request } from '../lib/api'; +import { formatBillPeriod, formatIssueLabel } from '../lib/settlement'; type StatusFilter = 'all' | 'pending' | 'settled' | 'reviewing' | 'rejected'; @@ -31,25 +32,23 @@ function billStatusClass(status: string) { } } -function billPeriodLabel(periodStart: string) { - const d = new Date(periodStart); - if (Number.isNaN(d.getTime())) return '—'; - return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`; -} - -function billMonthLabel(year: number, month: number) { - return `${year}年${month}月`; +function billPeriodLabel(bill: PartnerBillDto) { + return formatBillPeriod(bill.periodStart, bill.periodEnd); } export default function SettlementPage() { const navigate = useNavigate(); const [bills, setBills] = useState([]); - const now = new Date(); - const [month, setMonth] = useState({ year: now.getFullYear(), month: now.getMonth() + 1 }); + const [preview, setPreview] = useState(null); const [statusFilter, setStatusFilter] = useState('all'); const loadBills = useCallback(() => { - return request('PARTNER_H5', '/partner/settlement/bills').then(setBills); + return Promise.all([ + request('PARTNER_H5', '/partner/settlement/bills').then(setBills), + request('PARTNER_H5', '/partner/settlement/preview') + .then(setPreview) + .catch(() => setPreview(null)), + ]).then(() => undefined); }, []); useEffect(() => { @@ -60,22 +59,14 @@ export default function SettlementPage() { const summary = useMemo(() => { const pending = bills.filter((b) => b.status === 'AWAITING_CONFIRM'); const settled = bills.filter((b) => b.status === 'PAID'); - const currentMonth = bills.filter((b) => { - const d = new Date(b.periodStart); - return d.getFullYear() === now.getFullYear() && d.getMonth() === now.getMonth(); - }); return { pendingTotal: pending.reduce((s, b) => s + Number(b.totalAmount || 0), 0), settledTotal: settled.reduce((s, b) => s + Number(b.totalAmount || 0), 0), - monthEstimate: currentMonth.reduce((s, b) => s + Number(b.totalAmount || 0), 0), }; - }, [bills, now]); + }, [bills]); const filteredBills = useMemo(() => { return bills.filter((b) => { - const d = new Date(b.periodStart); - const matchMonth = d.getFullYear() === month.year && d.getMonth() + 1 === month.month; - if (!matchMonth) return false; if (statusFilter === 'all') return true; if (statusFilter === 'pending') return b.status === 'AWAITING_CONFIRM'; if (statusFilter === 'settled') return b.status === 'PAID'; @@ -83,16 +74,7 @@ export default function SettlementPage() { if (statusFilter === 'rejected') return b.status === 'REJECTED'; return true; }); - }, [bills, month, statusFilter]); - - const monthOptions = useMemo(() => { - const opts: Array<{ year: number; month: number }> = []; - for (let i = 0; i < 6; i++) { - const d = new Date(now.getFullYear(), now.getMonth() - i, 1); - opts.push({ year: d.getFullYear(), month: d.getMonth() + 1 }); - } - return opts; - }, [now]); + }, [bills, statusFilter]); function openBill(bill: PartnerBillDto) { navigate(bill.id ? `/center/bills?id=${bill.id}` : '/center/bills'); @@ -127,33 +109,18 @@ export default function SettlementPage() {
-

本月预估收益

+

本周预付款

- ¥{fmtMoney(summary.monthEstimate)} + ¥{fmtMoney(preview?.prepaymentAmount ?? 0)}

- - +

+ 账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)} +

@@ -193,7 +160,7 @@ export default function SettlementPage() {

event - {billPeriodLabel(bill.periodStart)} + {billPeriodLabel(bill)} 订单分佣 ¥{fmtMoney(Number(bill.orderCommission || 0))}

diff --git a/apps/h5-partner/src/pages/StaffCreatePage.tsx b/apps/h5-partner/src/pages/StaffCreatePage.tsx index bb5ef2c..223df87 100644 --- a/apps/h5-partner/src/pages/StaffCreatePage.tsx +++ b/apps/h5-partner/src/pages/StaffCreatePage.tsx @@ -205,7 +205,7 @@ export default function StaffCreatePage() { info

- 子账号创建后默认禁用，需在子账号列表中手动启用后方可登录。 + 子账号创建后默认可登录，可在子账号列表中禁用。

diff --git a/apps/h5-partner/src/pages/UsersManagePage.tsx b/apps/h5-partner/src/pages/UsersManagePage.tsx index aeedf07..fd28f60 100644 --- a/apps/h5-partner/src/pages/UsersManagePage.tsx +++ b/apps/h5-partner/src/pages/UsersManagePage.tsx @@ -16,6 +16,8 @@ import { toastError, toastSuccess } from '../lib/toast'; import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image'; import { isWechatEnv } from '../lib/weixin'; import { usePartnerPageView } from '../lib/usePageView'; +import { usePartnerSession } from '../contexts/PartnerSessionContext'; +import { isSubAccount } from '../lib/partnerAccess'; type ListRes = { items: PartnerAssocUserItem[]; total: number }; @@ -38,6 +40,8 @@ function fmtTime(iso?: string | null) { export default function UsersManagePage() { usePartnerPageView('partner_users_manage_view'); + const { account } = usePartnerSession(); + const hidePoster = isSubAccount(account); const navigate = useNavigate(); const [searchParams] = useSearchParams(); const [summary, setSummary] = useState(null); @@ -63,7 +67,7 @@ export default function UsersManagePage() { }, [previewUrl]); useEffect(() => { - const posterId = summary?.activityPosterId; + const posterId = hidePoster ? null : summary?.activityPosterId; if (!posterId) { setHeroUrl(null); setHeroLoading(false); @@ -88,7 +92,7 @@ export default function UsersManagePage() { cancelled = true; if (acc.url) URL.revokeObjectURL(acc.url); }; - }, [summary?.activityPosterId]); + }, [hidePoster, summary?.activityPosterId]); const loadSummary = useCallback(async () => { const data = await request('PARTNER_H5', '/partner/assoc'); @@ -130,7 +134,7 @@ export default function UsersManagePage() { }, [searchParams, navigate]); async function downloadMainImage() { - const posterId = summary?.activityPosterId; + const posterId = hidePoster ? null : summary?.activityPosterId; try { if (isWechatEnv() && !posterId && isHttpImageUrl(summary?.qrcodeUrl)) { await previewSaveableImage(summary.qrcodeUrl); @@ -190,14 +194,14 @@ export default function UsersManagePage() {

用户扫码后首次锁定，后续购酒计入关联订单

- {summary?.activityPosterId && (previewUrl || heroUrl) ? ( + {summary?.activityPosterId && !hidePoster && (previewUrl || heroUrl) ? ( 活动图 - ) : summary?.activityPosterId && heroLoading ? ( + ) : summary?.activityPosterId && !hidePoster && heroLoading ? (

正在生成活动图…

) : previewUrl || summary?.qrcodeUrl ? ( {loading ? '加载中…' : '关联码尚未生成'}

)} -

- 已关联 {summary?.userCount ?? total} 人 -

+ {(() => { + const scanCount = summary?.scanCount ?? 0; + const userCount = summary?.userCount ?? total; + if (scanCount <= 0 && userCount <= 0) return null; + return ( +

+ 已扫码 {scanCount} 人 · 已关联 {userCount} 人 +

+ ); + })()} {isWechatEnv() && (previewUrl || summary?.qrcodeUrl) ? (

- 微信内请点「{summary?.activityPosterId ? '下载活动图' : '下载二维码'}」后长按保存 + 微信内请点「{summary?.activityPosterId && !hidePoster ? '下载活动图' : '下载二维码'}」后长按保存

) : null} + {!hidePoster && (
@@ -233,6 +245,7 @@ export default function UsersManagePage() { chevron_right
+ )}

已关联用户

@@ -264,32 +277,40 @@ export default function UsersManagePage() { {!loading && items.length === 0 &&
暂无关联用户
} {items.map((u) => (
-
-
-

{formatUserLabel(u)}

-

{u.phone || '未绑定手机'}

-

注册 {fmtTime(u.createdAt)}

-
+
+

{formatUserLabel(u)}

- +

注册 {fmtTime(u.createdAt)}

+ +
))}
diff --git a/apps/mini-user/src/lib/promo.ts b/apps/mini-user/src/lib/promo.ts index 0df43ef..2de4ece 100644 --- a/apps/mini-user/src/lib/promo.ts +++ b/apps/mini-user/src/lib/promo.ts @@ -162,6 +162,11 @@ export async function capturePromoSceneAndTouchScan(): Promise { const assocScene = extractAssocSceneFromEnterOptions(opts); if (assocScene) { setStoredAssocScene(assocScene); + const touchKey = `assoc|${assocScene}|${opts?.path || ''}|${JSON.stringify(opts?.query || {})}|${String(opts?.scene ?? '')}`; + if (touchKey !== lastScanTouchKey) { + lastScanTouchKey = touchKey; + await touchAssoc({ scene: assocScene, countScan: true }); + } await bindStoredAssocIfLoggedIn(); return; } @@ -179,6 +184,20 @@ export async function capturePromoSceneAndTouchScan(): Promise { // 无新 scene 时不重复扫码计数 } +async function touchAssoc(input: { scene: string; countScan: boolean }): Promise { + try { + await request('/user/partner-assoc/touch', { + method: 'POST', + data: { + scene: input.scene, + countScan: input.countScan, + }, + }); + } catch { + /* 静默失败，不阻断浏览 */ + } +} + /** 登录成功后：用已缓存的活动 ID 做归因（不重复加扫码次数） */ export async function touchStoredPromoAfterLogin(): Promise { await bindStoredAssocIfLoggedIn(); diff --git a/deploy/sync-prod-db-to-local.sh b/deploy/sync-prod-db-to-local.sh index a542de9..429cb8b 100644 --- a/deploy/sync-prod-db-to-local.sh +++ b/deploy/sync-prod-db-to-local.sh @@ -6,6 +6,15 @@ # 本地开发机一般不在白名单，因此借道生产服务器 dukang-server 建立隧道。 # 2. 在本地 dukang-v1-mysql 容器内用 mysqldump 连接隧道端口，导出线上库。 # 3. 通过管道直接导入本地库（默认 dukang_haoke，即应用本地库名）。 +# 4. 下列表不同步，保留本地数据（环境配置 / 密钥 / 大表日志等）： +# · 系统设置：system_config, common_wx_app_config +# · 企微机器人：wecom_bot, wecom_message_push, wecom_push_template, +# llm_api_config, knowledge_base, knowledge_document +# · OSS 资源库：common_resource +# · 日志：log_third_party, log_promo_event, log_user_analytics, +# log_store_analytics, log_partner_analytics, log_wecom_bot +# · 白名单：common_test_whitelist_phone, common_product_visibility_phone, +# store_visibility_phone # # 前置条件： # - deploy.env 中 DEPLOY_HOST / DEPLOY_USER / DEPLOY_PORT 已配置且可无密码 SSH @@ -35,13 +44,35 @@ DO_BACKUP=1 ASSUME_YES=0 DRY_RUN=0 +# 同步时保留本地数据的表（见文件头说明） +SYNC_EXCLUDE_TABLES=( + system_config + common_wx_app_config + wecom_bot + wecom_message_push + wecom_push_template + llm_api_config + knowledge_base + knowledge_document + common_resource + log_third_party + log_promo_event + log_user_analytics + log_store_analytics + log_partner_analytics + log_wecom_bot + common_test_whitelist_phone + common_product_visibility_phone + store_visibility_phone +) + # ---------------- 解析参数 ---------------- for arg in "$@"; do case "$arg" in --yes|-y) ASSUME_YES=1 ;; --no-backup) DO_BACKUP=0 ;; --dry-run) DRY_RUN=1 ;; - --help|-h) sed -n '3,30p' "$0"; exit 0 ;; + --help|-h) sed -n '3,39p' "$0"; exit 0 ;; --tunnel-port=*) TUNNEL_PORT="${arg#*=}" ;; --local-db=*) LOCAL_DB="${arg#*=}" ;; --container=*) LOCAL_CONTAINER="${arg#*=}" ;; @@ -103,6 +134,8 @@ echo " 源(线上): $REMOTE_USER@$REMOTE_HOST:$REMOTE_PORT/$REMOTE_DB" echo " 目标(本地): root@$LOCAL_CONTAINER:$LOCAL_DB (对外端口 6016)" echo " 隧道: $TARGET -L $TUNNEL_PORT:$REMOTE_HOST:$REMOTE_PORT" echo " 本地备份: $([[ $DO_BACKUP -eq 1 ]] && echo 是 || echo 否)" +echo " 保留本地（不同步）: ${#SYNC_EXCLUDE_TABLES[@]} 张表" +printf ' - %s\n' "${SYNC_EXCLUDE_TABLES[@]}" if [[ $DRY_RUN -eq 1 ]]; then echo "(dry-run) 已结束，未做任何修改。" exit 0 @@ -148,13 +181,20 @@ if [[ $ready -ne 1 ]]; then fi # ---------------- 同步（线上 -> 本地，管道直导） ---------------- +IGNORE_TABLE_ARGS=() +for tbl in "${SYNC_EXCLUDE_TABLES[@]}"; do + IGNORE_TABLE_ARGS+=(--ignore-table="${REMOTE_DB}.${tbl}") +done + echo "==> 开始同步（管道直导，不落临时文件）" echo " 提示：同步前建议本地 Prisma 已追平线上 schema（pnpm db:push 或迁移），否则可能因表结构差异报错。" +echo " 提示：${#SYNC_EXCLUDE_TABLES[@]} 张环境/配置表保留本地数据，不会被线上覆盖。" set +e docker exec -i -e "MYSQL_PWD=$REMOTE_PASS" "$LOCAL_CONTAINER" \ mysqldump -h "$HOST_ALIAS" -P "$TUNNEL_PORT" -u "$REMOTE_USER" \ --lock-tables=0 --add-drop-table --skip-triggers --no-create-db \ --skip-routines --skip-events --column-statistics=0 --no-tablespaces --set-gtid-purged=OFF \ + "${IGNORE_TABLE_ARGS[@]}" \ "$REMOTE_DB" \ | docker exec -i "$LOCAL_CONTAINER" mysql -uroot -p"$LOCAL_ROOT_PASSWORD" "$LOCAL_DB" RC=${PIPESTATUS[0]} @@ -168,4 +208,4 @@ if [[ $RC -ne 0 ]]; then [[ $DO_BACKUP -eq 1 ]] && echo "请用备份恢复: $BK" >&2 exit 1 fi -echo "==> 同步完成 ✅ 本地 $LOCAL_DB 现已是线上 $REMOTE_DB 的副本。" +echo "==> 同步完成 ✅ 本地 $LOCAL_DB 已同步线上业务数据（${#SYNC_EXCLUDE_TABLES[@]} 张配置/日志表保留本地）。" diff --git a/docs/杜康好客-v3编码手册.md b/docs/杜康好客-v3编码手册.md index 045d614..eda31df 100644 --- a/docs/杜康好客-v3编码手册.md +++ b/docs/杜康好客-v3编码手册.md @@ -1,7 +1,7 @@ # 杜康好客 · V3 编码手册（交付业务版） > **事实源**：[`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) · **审计**：[`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md) -> **佣金归属 / 关联码 / 合伙人账单明细（v4.0.1）· 活动图（v4.0.2）**：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。 +> **佣金归属 / 关联码 / 合伙人账单明细（v4.0.1）· 活动图（v4.0.2）· 周结算与预付款（v4.0.9）**：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)，冲突时 **V4 > V3**。 > V2/preV1 **非需求依据**。总部交付 = **`apps/admin-web`**（非 H5）。 ## 1. 交付目标（六条） @@ -56,16 +56,18 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd **HQ 门店账单打款凭证**：确认打款 / 提现通过可填 `paymentRef`，并可上传照片（`paymentProofUrls`，OSS `PAYMENT_PROOF`，最多 9 张）。详情与 T+1 导出展示。 -**活动图（v4.0.2 / v4.0.7）**：规则见 v4-PRD §6。表 `activity_poster`；HQ `GET/POST/PUT/DELETE /admin/activity-posters`（权限 `activity_posters`）；合伙人 `GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection`（写入 `partner_account.activity_poster_id`）· `GET /partner/activity-posters/:id/image`（合成本人关联码）。`GET /partner/assoc` 返回 `activityPosterId`。码栏百分比相对图宽。子账号无入口。v4.0.7：HQ `GET /admin/activity-posters/:id/image?partnerId=` 单张合成 PNG；`POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }` 流式 zip（仅勾选，测试号/无码 skip）。城市合伙人快链 `/activity-posters?partnerId=`。不预生成缓存图、不批量调微信补码。 +**活动图（v4.0.2 / v4.0.7）**：规则见 v4-PRD §6。表 `activity_poster`；HQ `GET/POST/PUT/DELETE /admin/activity-posters`（权限 `activity_posters`）；合伙人 `GET /partner/activity-posters` · `GET/PUT /partner/activity-posters/selection`（写入 `partner_account.activity_poster_id`）· `GET /partner/activity-posters/:id/image`（合成本人关联码）。`GET /partner/assoc` 返回 `activityPosterId`（**子账号强制为空**）。码栏百分比相对图宽。子账号可进用户管理、下载纯关联码，无活动图入口。v4.0.7：HQ `GET /admin/activity-posters/:id/image?partnerId=` 单张合成 PNG；`POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }` 流式 zip（仅勾选，测试号/无码 skip）。城市合伙人快链 `/activity-posters?partnerId=`。不预生成缓存图、不批量调微信补码。 -**合伙人关联与订单佣金（v4.0.1）**：规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定；`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入（禁止区县解析）。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`（勿写 `hq_remark`）。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`（关联用户 / 当前关联用户已付购酒单，本日/本月）· `GET /partner/assoc/users?keyword&sort`（合伙人侧返回 `partnerRemark`，不返回 `hqRemark`）· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword`、`assocPartnerAccountId`（`none` / `any` / 主账号 ID）· `GET /admin/orders` 支持 `assocPartnerAccountId`（筛本单快照，`none`=无快照）· `PUT /admin/users/:id/assoc`（权限 `users_partner_assoc`）改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`。 +**合伙人关联与订单佣金（v4.0.1 / v4.0.9）**：规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定；`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入（禁止区县解析）。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`（勿写 `hq_remark`）。`POST /user/partner-assoc/bind` · `POST /user/partner-assoc/touch`（未登录可计已扫码）· `GET /partner/assoc`（`scanCount` + `userCount`；子账号无 `activityPosterId`）· `GET /partner/assoc/stats`（关联用户 / 当前关联用户已付购酒单，本日/本月）· `GET /partner/assoc/users?keyword&sort`（合伙人侧返回 `partnerRemark`，不返回 `hqRemark`；主账号与子账号均可）· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword`、`assocPartnerAccountId`（`none` / `any` / 主账号 ID）· `GET /admin/orders` 支持 `assocPartnerAccountId`（筛本单快照，`none`=无快照）· `PUT /admin/users/:id/assoc`（权限 `users_partner_assoc`）改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`。子账号创建默认 `ACTIVE`。主账号 `PUT /partner/me/bank` 填收款账户。 + +**合伙人周结算（v4.0.9）**：每周一 08:00 生成上一自然周账单。`GET /partner/settlement/cycle` 账期与出账日；`GET /partner/settlement/preview` 本周一至今预付款预估。零元账单 HQ 可见待审核、不可发送、合伙人端不可见。历史月账不回刷。 ## 5. 验收用例（必过） **主链路 15 项**：登录、4 SKU、起购、支付+权益、双通道核销、payout、关店不可见、拓店审核、配送完成、退款、T+1/T+30… **后台 8 项**：商品/门店/订单/权益/核销/工单/日志/财务。 **开发计划任务**：状态 `TODO` 待开发 / `IN_PROGRESS` 开发中 / `DEVELOPED` 已开发 / `RELEASED` 已上线 / `STOPPED` 已停止；版本状态含 `STOPPED` 已停止，关联任务随版本同步（仅当全部关联版本已停止时任务才为已停止）。任务列表「来源工单」链到 `/tickets/support?id=`。 -**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；合伙人/物流账期按北京自然月）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。酒厂应付为 0 仍出账（展示无需打款）。 +**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；物流账期按北京自然月；合伙人周账按北京自然周，周一 08:00 出上周）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。酒厂应付为 0 仍出账（展示无需打款）。合伙人零元账单不同步给合伙人端。 ## 6. 技术债（摘要） diff --git a/docs/杜康好客-v4-PRD.md b/docs/杜康好客-v4-PRD.md index e72139a..d9e5a46 100644 --- a/docs/杜康好客-v4-PRD.md +++ b/docs/杜康好客-v4-PRD.md @@ -1,8 +1,8 @@ # 杜康好客 · V4 PRD -> **v4.0**（2026-08-29）· 关联码与分佣事实源；**v4.0.6** 酒厂对账；**v4.0.7** HQ 活动图快链与勾选导出 -> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图、酒厂对账）。 -> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.md) · [`v4.0.6 开发文档`](./杜康好客-v4.0.6-开发文档.md) · [`v4.0.7 开发文档`](./杜康好客-v4.0.7-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md) +> **v4.0**（2026-08-29）· 关联码与分佣事实源；**v4.0.6** 酒厂对账；**v4.0.7** HQ 活动图快链与勾选导出；**v4.0.9** 合伙人 H5 周结算与用户管理 +> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图、酒厂对账、合伙人周结算）。 +> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.md) · [`v4.0.6 开发文档`](./杜康好客-v4.0.6-开发文档.md) · [`v4.0.7 开发文档`](./杜康好客-v4.0.7-开发文档.md) · [`v4.0.9 开发文档`](./杜康好客-v4.0.9-开发文档.md) · 审计：[`v4-现状对照`](./杜康好客-v4-现状对照.md) ## 0. 版本 @@ -12,6 +12,7 @@ | 4.0.2 | 08-30 | HQ 活动图模板（底图 + 方形码栏 + 文案）；合伙人下载合成关联码；所选图写入库并作为用户管理主图 | [`v4.0.2`](./杜康好客-v4.0.2-开发文档.md) | | 4.0.6 | 08-31 | 酒厂 T+3=每 3 天出一期；全部已完成已付订单（含现场提货）；应付为 0 仍出账；核对补生成 | [`v4.0.6`](./杜康好客-v4.0.6-开发文档.md) | | 4.0.7 | 09-01 | HQ 城市合伙人活动图快链；指定一张活动图为单个或勾选主合伙人合成下载（PNG / zip） | [`v4.0.7`](./杜康好客-v4.0.7-开发文档.md) | +| 4.0.9 | 09-02 | 子账号默认启用；关联码已扫码计数；零元账单不同步；主账号自填银行账号；周账周一 08:00 出账；预付款预估；子账号用户管理（无活动图） | [`v4.0.9`](./杜康好客-v4.0.9-开发文档.md) | ## 1. 锚点（沿用 V3，佣金归属改写） @@ -30,7 +31,11 @@ - 合伙人 H5 可展示并**下载** PNG；微信内下载失败则预览 + 长按保存。 - 主合伙人备注写独立表 `partner_user_note`（`partner_account_id` + `user_id` 唯一），与 HQ `user_user.hq_remark` 隔离；换绑后不跟随、不泄漏给下一个合伙人。合伙人 H5 **不返回** `hqRemark`。 - 主账号首页两张卡：「关联用户」（按 `assocBoundAt` 拆本日/本月）、「关联用户订单」（已付购酒单且用户**当前**关联本合伙人，按 `paidAt` 拆本日/本月）。文案不用「佣金订单」——与账单快照 `partner_account_id_at_pay` 可能不完全重合。子账号不展示。 -- 主账号底部 Tab：首页 / **用户管理** / 门店管理 / 合伙人中心。用户管理页 = 关联码 + 已关联用户列表（搜索昵称/手机/编号/本合伙人备注；排序关联时间/注册时间/订单数）。点订单数看该用户已付购酒单。子账号无此 Tab。 +- 主账号底部 Tab：首页 / **用户管理** / 门店管理 / 合伙人中心。用户管理页 = 关联码 + 已关联用户列表（搜索昵称/手机/编号/本合伙人备注；排序关联时间/注册时间/订单数）。点订单数看该用户已付购酒单。 +- **子账号**也可进入用户管理：可看关联码、下载二维码、看已关联用户；**不能**看活动图入口与合成主图（只出纯关联码）。 +- 用户管理页二维码下方展示「已扫码」与「已关联」人数；为 0 的段不显示。已扫码 = C 端带 `pa_` scene 进入时累加（未登录也计），与已关联人数独立。 +- 主账号新建子账号默认 **ACTIVE**（可立即登录），列表中可再禁用。 +- 主账号可在合伙人中心填写收款账户：收款人、银行账号、开户行名称（写入主账号 `bank_account_*`）。 - HQ：用户列表综合搜索 + 关联合伙人筛选（`none` 未关联 / `any` 已关联全部 / 指定主合伙人），筛选默认展开；订单列表按本单佣金快照筛关联合伙人；开城城市合伙人提供「关联用户」快链与「全部关联用户」快链，进入用户列表并带上筛选。 ## 3. 订单佣金 @@ -55,7 +60,7 @@ ## 5. 合伙人账单 -月账（T+30）表头：`orderCommission` + `redeemCommission` = `totalAmount`。 +**周账**：每周一北京时间 **08:00** 出具上一完整自然周（周一 00:00 ～ 周日 23:59:59.999）账单。表头：`orderCommission` + `redeemCommission` = `totalAmount`。 明细两段： @@ -66,12 +71,17 @@ HQ 财务详情与合伙人确认页均展示两段列表。不再「无快照则全城已付单 × 当前费率」。 +- **零元账单**：佣金合计为 0 时 HQ 仍可生成并留在待审核，**不得发送**给合伙人；合伙人端列表/详情不可见。 +- 合伙人 H5 展示当前账期（本周一～本周日）与下次出账时间（下周一 08:00，若尚未过本周一 08:00 则为当日 08:00）。 +- **预付款**：当前未出账周期（本周一 00:00 至今）酒单 + 核销按佣金比例算出的预估合计。展示在首页与合伙人中心。与实际打款无关，实际以账单为准。 +- 上线前已生成的月账保留，不回刷。 + ## 6. 活动图 - 一套活动图 = 底图 + 方形码栏（相对坐标）+ 标题 + 推广文案 + 排序 + 上架状态。文案由 HQ 手填，不自动生成。 - 码栏用相对百分比存储，与底图像素无关：`qrXPct` / `qrYPct` 为左上角，`qrSizePct` 为边长（相对**图宽**，保证正方形）。HQ 上传后在预览图上拖拽定位、拉角改尺寸。 - 合入的码固定为 **主合伙人关联码**（v4.0.1，`getwxacodeunlimit`，scene=`pa_{partnerId}`）。不复用推广码。 -- 合伙人 H5（仅主账号）可浏览已上架活动图、一键复制文案、下载合成图。下载时服务端把本人关联码 PNG 贴进码栏后返回整图。 +- 合伙人 H5（**仅主账号**）可浏览已上架活动图、一键复制文案、下载合成图。下载时服务端把本人关联码 PNG 贴进码栏后返回整图。子账号用户管理页只用纯关联码，不可进活动图。 - 列表第一项「无」= 只用关联码。单选立即写入 `partner_account.activity_poster_id`（空=无）；用户管理主图按该选择展示，下次登录仍有效。下架/删除后回退为关联码。 - 微信内下载失败则预览 + 长按保存（与关联码下载一致）。 - 合伙人只看 `ACTIVE`；下架后列表不再出现。无关联码则不可下载并明确报错。 diff --git a/docs/杜康好客-v4-现状对照.md b/docs/杜康好客-v4-现状对照.md index f84e898..16c69a0 100644 --- a/docs/杜康好客-v4-现状对照.md +++ b/docs/杜康好客-v4-现状对照.md @@ -3,14 +3,14 @@ > 基准：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) > V3 进度仍见 [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)，不混表。 -## 0. 总览（2026-09-01） +## 0. 总览（2026-09-02） | 维度 | 结论 | |------|------| -| 版本线 | **v4.0.7** HQ 活动图快链与勾选导出 | +| 版本线 | **v4.0.9** 合伙人 H5 周结算、预付款、子账号用户管理 | | 订单佣金 | 区县归属已删除；只认关联 / 代下单选择 | -| 账单 | 酒订单 / 核销订单分列；酒厂含现场提货，零应付仍出账（无需打款） | -| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；HQ 可指定一张图为勾选主合伙人合成下载 | +| 账单 | 酒订单 / 核销订单分列；合伙人改为周账（周一 08:00）；零元不同步合伙人；酒厂含现场提货，零应付仍出账（无需打款） | +| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；HQ 可指定一张图为勾选主合伙人合成下载；子账号不可看活动图 | ## 1. 版本交付 @@ -20,6 +20,7 @@ | 4.0.2 | [`活动图模板与关联码合成`](./杜康好客-v4.0.2-开发文档.md) | ✅ 已实现 | | 4.0.6 | [`酒厂对账核对`](./杜康好客-v4.0.6-开发文档.md) | ✅ 已实现 | | 4.0.7 | [`活动图快链与勾选导出`](./杜康好客-v4.0.7-开发文档.md) | ✅ 已实现 | +| 4.0.9 | [`合伙人 H5 周结算与用户管理`](./杜康好客-v4.0.9-开发文档.md) | ✅ 已实现 | | 日期 | 说明 | |------|------| @@ -29,3 +30,4 @@ | 2026-08-30 | v4.0.2：HQ 活动图（底图 + 拖拽码栏 + 文案）；合伙人复制文案、下载合成关联码；选择写入库，用户管理主图下次登录仍显示 | | 2026-08-31 | v4.0.6：酒厂 T+3=每 3 天出一期（非每日）；含现场提货；零应付仍出账；核对补生成 | | 2026-09-01 | v4.0.7：HQ 城市合伙人活动图快链；单张/勾选导出合成图（PNG / zip） | +| 2026-09-02 | v4.0.9：子账号默认启用；关联码已扫码；零元账单不同步；银行账号自填；周账周一 08:00；预付款预估；子账号用户管理无活动图 | diff --git a/docs/杜康好客-v4.0.9-开发文档.md b/docs/杜康好客-v4.0.9-开发文档.md new file mode 100644 index 0000000..a64f22e --- /dev/null +++ b/docs/杜康好客-v4.0.9-开发文档.md @@ -0,0 +1,70 @@ +# 杜康好客 · v4.0.9 开发文档 + +> **2026-09-02** · iam / store / settlement / h5-partner / mini-user / admin-web +> **主题**：合伙人 H5 子账号默认启用、关联码已扫码、零元账单过滤、银行账号自填、周结算、预付款预估、子账号用户管理（无活动图） + +需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §2 / §5 / §6 + +--- + +## 1. 版本目标 + +| # | 任务 | 类型 | 交付 | +|---|------|------|------| +| 1 | 子账号默认开启 | 需求 | 创建后 `ACTIVE`，可立即登录 | +| 2 | 已扫码数量 | 需求 | 关联码下展示已扫码 / 已关联；0 不显示 | +| 3 | 零元账单 | 需求 | HQ 可生成待审核；不可发送；合伙人端不可见 | +| 4 | 银行账号 | 需求 | 主账号合伙人中心填写收款人 / 账号 / 开户行 | +| 5 | 周结算 | 需求 | 周一 08:00 出上周账；H5 展示账期与出账日 | +| 6 | 预付款 | 需求 | 本周一至今酒单+核销×费率；首页与中心展示 | +| 7 | 子账号用户管理 | 需求 | 可看用户管理、下载二维码；不可看活动图 | + +**不做**：子账号自己的码；回刷历史月账；预付款计入待结算；零元账单删除。 + +--- + +## 2. 规则 + +- 已扫码：C 端带 `pa_{partnerId}` 进入即 +1（未登录也计）；同一进入会话只计一次。已关联仍为 first-lock 用户数。 +- 周账窗口：北京自然周 `[周一 00:00, 下周一 00:00)`。出账 cron：`0 8 * * 1` Asia/Shanghai，生成**上一完整周**。 +- 预付款窗口：本周一 00:00 ～ now。酒单用支付快照费率；核销用主账号当前核销费率。文案标明预估、以账单为准。 +- 零元：`totalAmount <= 0` 保持 `PENDING_REVIEW`，`send` 拒绝；合伙人 `list/get` 过滤。 +- 子账号 `GET /partner/assoc` 强制 `activityPosterId = null`。活动图 API 仍仅主账号。 + +--- + +## 3. 变更面 + +- Prisma：`partner_account.assoc_scan_count` +- C 端：`POST /user/partner-assoc/touch`；mini-user 捕获 `pa_` 时调用 +- 结算：周生成 / cycle / preview；零元 send 拦截 +- 主账号：`PUT /partner/me/bank`；`GET /partner/me` 返回银行字段 +- 合伙人 H5：用户管理统计、首页/中心预付款与账期、收款账户页、子账号 Tab +- HQ：合伙人账单生成/筛选改为周 + +--- + +## 4. API + +| Method | Path | 说明 | +|--------|------|------| +| POST | `/user/partner-assoc/touch` | `{ scene, countScan? }` 未登录可调 | +| GET | `/partner/assoc` | + `scanCount`；子账号无 `activityPosterId` | +| GET | `/partner/settlement/cycle` | 本周账期 + 下次出账时间 | +| GET | `/partner/settlement/preview` | 预付款预估 + 账期 | +| GET | `/partner/settlement/bills` | 过滤 `totalAmount <= 0` | +| PUT | `/partner/me/bank` | 主账号银行三字段 | +| POST | `/admin/partner-bills/generate` | `{ partnerId, weekStartYmd }` | +| POST | `/admin/partner-bills/generate-all` | `{ weekStartYmd }` | + +--- + +## 5. 验收 + +- [ ] 新建子账号创建后状态为 ACTIVE，可直接登录 +- [ ] C 端扫码进入（未登录）已扫码 +1；登录绑定后已关联 +1；用户管理页正确展示，0 不显示 +- [ ] 零元账单 HQ 可见 PENDING_REVIEW；发送被拒；合伙人 bills 列表/详情不可见 +- [ ] 主账号可填写/编辑银行三字段；HQ 同步可见 +- [ ] 首页/中心展示本周账期、下周一 08:00 出账、预付款预估（与手工核算抽样一致） +- [ ] 每周一 08:00 自动生成上周账单（非月账） +- [ ] 子账号 Tab 有用户管理；可下载二维码；无活动图入口/主图；主账号功能不变 diff --git a/packages/domain/src/shanghai-date.test.ts b/packages/domain/src/shanghai-date.test.ts index 01a3add..20b12e3 100644 --- a/packages/domain/src/shanghai-date.test.ts +++ b/packages/domain/src/shanghai-date.test.ts @@ -3,12 +3,16 @@ import { addShanghaiDays, isWineryIssueDay, listWineryIssueDays, + nextPartnerBillIssueAt, previousShanghaiMonth, + previousShanghaiWeek, + shanghaiBillPeriodYmds, shanghaiLaggedIssueWindow, shanghaiMonthLastInstant, shanghaiMonthRange, shanghaiPeriodYmds, shanghaiT1DayWindow, + shanghaiWeekRange, shanghaiWineryPeriodWindow, shanghaiYmd, startOfShanghaiDay, @@ -145,3 +149,54 @@ describe('previousShanghaiMonth', () => { }); }); }); + +describe('shanghaiWeekRange', () => { + it('周三落入当周周一至下周一', () => { + const { start, endExclusive } = shanghaiWeekRange(new Date('2026-09-02T04:00:00+08:00')); + expect(shanghaiYmd(start)).toBe('2026-08-31'); + expect(shanghaiYmd(endExclusive)).toBe('2026-09-07'); + }); + + it('周日仍属当周（周一为起点）', () => { + const { start } = shanghaiWeekRange(new Date('2026-09-06T23:00:00+08:00')); + expect(shanghaiYmd(start)).toBe('2026-08-31'); + }); +}); + +describe('previousShanghaiWeek', () => { + it('周一 08:00 取上一完整周', () => { + const prev = previousShanghaiWeek(new Date('2026-09-07T08:00:00+08:00')); + expect(shanghaiYmd(prev.start)).toBe('2026-08-31'); + expect(shanghaiYmd(prev.endExclusive)).toBe('2026-09-07'); + }); +}); + +describe('nextPartnerBillIssueAt', () => { + it('周一 07:59 出账日为当日 08:00', () => { + const at = nextPartnerBillIssueAt(new Date('2026-09-07T07:59:00+08:00')); + expect(at.toISOString()).toBe(new Date('2026-09-07T08:00:00+08:00').toISOString()); + }); + + it('周一 08:00 起指向下周一', () => { + const at = nextPartnerBillIssueAt(new Date('2026-09-07T08:00:00+08:00')); + expect(at.toISOString()).toBe(new Date('2026-09-14T08:00:00+08:00').toISOString()); + }); +}); + +describe('shanghaiBillPeriodYmds', () => { + it('周账展示周一至周日', () => { + const start = new Date('2026-08-31T00:00:00+08:00'); + const end = new Date('2026-09-06T23:59:59.999+08:00'); + expect(shanghaiBillPeriodYmds(start, end)).toEqual({ + periodStart: '2026-08-31', + periodEnd: '2026-09-06', + }); + }); + + it('无止日或跨度大时回退自然月', () => { + expect(shanghaiBillPeriodYmds(new Date('2026-08-01T00:00:00+08:00'))).toEqual({ + periodStart: '2026-08-01', + periodEnd: '2026-08-31', + }); + }); +}); diff --git a/packages/domain/src/shanghai-date.ts b/packages/domain/src/shanghai-date.ts index ba0768c..5f0abb8 100644 --- a/packages/domain/src/shanghai-date.ts +++ b/packages/domain/src/shanghai-date.ts @@ -127,3 +127,58 @@ export function shanghaiPeriodYmds(periodStart: Date): { periodStart: string; pe periodEnd: shanghaiYmd(new Date(endExclusive.getTime() - 1)), }; } + +/** 0=周日 … 6=周六，按北京日历日 */ +export function shanghaiWeekday(d: Date): number { + return new Date(`${shanghaiYmd(d)}T12:00:00+08:00`).getUTCDay(); +} + +/** 北京自然周：周一 00:00 ～ 下周一 00:00（不含） */ +export function shanghaiWeekRange(anchor = new Date()): { start: Date; endExclusive: Date } { + const dayStart = startOfShanghaiDay(anchor); + const wd = shanghaiWeekday(dayStart); + const daysFromMonday = wd === 0 ? 6 : wd - 1; + const start = addShanghaiDays(dayStart, -daysFromMonday); + return { start, endExclusive: addShanghaiDays(start, 7) }; +} + +export function shanghaiWeekLastInstant(anchor = new Date()): Date { + return new Date(shanghaiWeekRange(anchor).endExclusive.getTime() - 1); +} + +export function previousShanghaiWeek(anchor = new Date()): { start: Date; endExclusive: Date } { + return shanghaiWeekRange(addShanghaiDays(shanghaiWeekRange(anchor).start, -1)); +} + +/** 下一个合伙人出账时刻：周一 08:00（若尚未到本周一 08:00 则为当日） */ +export function nextPartnerBillIssueAt(anchor = new Date()): Date { + const { start } = shanghaiWeekRange(anchor); + const thisMonday8 = new Date(start.getTime() + 8 * 60 * 60 * 1000); + if (anchor.getTime() < thisMonday8.getTime()) return thisMonday8; + return new Date(addShanghaiDays(start, 7).getTime() + 8 * 60 * 60 * 1000); +} + +export function shanghaiPeriodYmdsForWeek(periodStart: Date): { periodStart: string; periodEnd: string } { + const { start } = shanghaiWeekRange(periodStart); + return { + periodStart: shanghaiYmd(start), + periodEnd: shanghaiYmd(addShanghaiDays(start, 6)), + }; +} + +/** 周账用真实起止日；跨度超过 8 天则按月展示（兼容历史月账） */ +export function shanghaiBillPeriodYmds( + periodStart: Date, + periodEnd?: Date, +): { periodStart: string; periodEnd: string } { + if (periodEnd) { + const days = shanghaiCalendarDaysBetween(periodStart, periodEnd); + if (days >= 0 && days <= 8) { + return { + periodStart: shanghaiYmd(periodStart), + periodEnd: shanghaiYmd(periodEnd), + }; + } + } + return shanghaiPeriodYmds(periodStart); +} diff --git a/packages/shared-types/src/partner-assoc.ts b/packages/shared-types/src/partner-assoc.ts index 61667ab..3c0a2bf 100644 --- a/packages/shared-types/src/partner-assoc.ts +++ b/packages/shared-types/src/partner-assoc.ts @@ -3,6 +3,18 @@ export type PartnerAssocBindRequest = { partnerId?: string; }; +export type PartnerAssocTouchRequest = { + scene?: string; + partnerId?: string; + countScan?: boolean; +}; + +export type PartnerAssocTouchResult = { + partnerId: string; + scanCounted: boolean; + scanCount: number; +}; + export type PartnerAssocBindResult = { bound: boolean; alreadyBound: boolean; @@ -14,9 +26,11 @@ export type PartnerAssocSummary = { partnerId: string; qrcodeUrl: string | null; userCount: number; + /** 关联码扫码进入次数（未登录也计） */ + scanCount?: number; companyName?: string | null; name: string; - /** 所选活动图；空表示用户管理主图只用关联码 */ + /** 所选活动图；空表示用户管理主图只用关联码；子账号恒为空 */ activityPosterId?: string | null; }; diff --git a/packages/shared-types/src/partner.ts b/packages/shared-types/src/partner.ts index 60a985e..9861dba 100644 --- a/packages/shared-types/src/partner.ts +++ b/packages/shared-types/src/partner.ts @@ -21,12 +21,24 @@ export interface PartnerMe { managedWarehouseId?: string | null; /** 是否已配置仓库管理（无则不展示/不推送酒订单） */ hasWarehouseAccess?: boolean; + /** 仅主账号：收款账户 */ + bankAccount?: { + bankAccountName?: string | null; + bankAccountNo?: string | null; + bankBranch?: string | null; + }; } export interface UpdatePartnerMeRequest { name?: string; } +export interface UpdatePartnerBankRequest { + bankAccountName: string; + bankAccountNo: string; + bankBranch: string; +} + export interface PartnerStaffItem { id: string; name: string; diff --git a/packages/shared-types/src/settlement.ts b/packages/shared-types/src/settlement.ts index 79c5ab6..c3284ed 100644 --- a/packages/shared-types/src/settlement.ts +++ b/packages/shared-types/src/settlement.ts @@ -147,6 +147,19 @@ export interface PartnerBillDto { rejectReason?: string | null; } +export interface PartnerSettlementCycleDto { + periodStart: string; + periodEnd: string; + nextIssueAt: string; + cycleLabel: string; +} + +export interface PartnerSettlementPreviewDto extends PartnerSettlementCycleDto { + prepaymentAmount: number; + orderCommissionEstimate: number; + redeemCommissionEstimate: number; +} + export type PartnerBillItemKind = 'ORDER' | 'REDEEM'; export interface PartnerBillItemDto { diff --git a/scripts/smoke-v3.mjs b/scripts/smoke-v3.mjs index 7ef7775..a02cdcd 100644 --- a/scripts/smoke-v3.mjs +++ b/scripts/smoke-v3.mjs @@ -269,10 +269,17 @@ async function main() { const partnerId = partners.items?.[0]?.id; if (partnerId) { const now = new Date(); + const utc = new Date(now.toLocaleString('en-US', { timeZone: 'Asia/Shanghai' })); + const wd = utc.getDay(); + const daysFromMonday = wd === 0 ? 6 : wd - 1; + utc.setDate(utc.getDate() - daysFromMonday - 7); + const y = utc.getFullYear(); + const m = String(utc.getMonth() + 1).padStart(2, '0'); + const d = String(utc.getDate()).padStart(2, '0'); await req('HQ_WEB', '/admin/partner-bills/generate', { method: 'POST', token: admin.accessToken, - body: JSON.stringify({ partnerId, year: now.getFullYear(), month: now.getMonth() + 1 }), + body: JSON.stringify({ partnerId, weekStartYmd: `${y}-${m}-${d}` }), }); } diff --git a/server/dukang-api/prisma/migrate-partner-assoc-scan-v409.sql b/server/dukang-api/prisma/migrate-partner-assoc-scan-v409.sql new file mode 100644 index 0000000..c18b9ab --- /dev/null +++ b/server/dukang-api/prisma/migrate-partner-assoc-scan-v409.sql @@ -0,0 +1,4 @@ +-- v4.0.9：关联码已扫码计数 + +ALTER TABLE `partner_account` + ADD COLUMN `assoc_scan_count` INT NOT NULL DEFAULT 0 AFTER `assoc_qrcode_resource_id`; diff --git a/server/dukang-api/prisma/schema.prisma b/server/dukang-api/prisma/schema.prisma index 6a92e58..a1b7f11 100644 --- a/server/dukang-api/prisma/schema.prisma +++ b/server/dukang-api/prisma/schema.prisma @@ -1208,6 +1208,7 @@ model PartnerAccount { managedWarehouseId BigInt? @unique @map("managed_warehouse_id") @db.UnsignedBigInt assocQrcodeId String? @unique @map("assoc_qrcode_id") @db.VarChar(64) assocQrcodeResourceId BigInt? @map("assoc_qrcode_resource_id") @db.UnsignedBigInt + assocScanCount Int @default(0) @map("assoc_scan_count") activityPosterId BigInt? @map("activity_poster_id") @db.UnsignedBigInt /// 测试合伙人账号 isTest Boolean @default(false) @map("is_test") diff --git a/server/dukang-api/src/jobs/settlement.scheduler.ts b/server/dukang-api/src/jobs/settlement.scheduler.ts index 90ba336..6ef48b3 100644 --- a/server/dukang-api/src/jobs/settlement.scheduler.ts +++ b/server/dukang-api/src/jobs/settlement.scheduler.ts @@ -7,7 +7,8 @@ import { AlertService } from '../common/alert/alert.service'; /** * 财务对账单定时任务（Asia/Shanghai） * - 每日 08:00：酒厂 T+3 期账单（每 3 天出一期，纳入上期 3 天已完成已付订单）+ 近 45 日出账周期核对补漏 + 门店日账单 - * - 每月 1 日 08:00：合伙人上一自然月账单 + 物流承运商上一自然月对账 + * - 每周一 08:00：合伙人上一自然周账单 + * - 每月 1 日 08:00：物流承运商上一自然月对账 * - 工作日 18:05：门店提现 T+0 审完预警（FIN-003） */ @Injectable() @@ -75,11 +76,11 @@ export class SettlementScheduler { } } - @Cron('0 8 1 * *', { timeZone: 'Asia/Shanghai' }) - async handleMonthlyPartnerBills() { - this.logger.log('Monthly partner bills job start'); + @Cron('0 8 * * 1', { timeZone: 'Asia/Shanghai' }) + async handleWeeklyPartnerBills() { + this.logger.log('Weekly partner bills job start'); try { - const result = await this.settlementService.generatePreviousMonthPartnerBills(); + const result = await this.settlementService.generatePreviousWeekPartnerBills(); this.logger.log( `Partner bills: total=${result.total} success=${result.success} failed=${result.failed}`, ); @@ -87,9 +88,9 @@ export class SettlementScheduler { this.alert.notify({ level: 'P0', category: 'settlement', - title: '合伙人月账单部分失败', + title: '合伙人周账单部分失败', detail: `total=${result.total} success=${result.success} failed=${result.failed}`, - dedupeKey: `job_partner_bill|${new Date().toISOString().slice(0, 7)}`, + dedupeKey: `job_partner_bill|${new Date().toISOString().slice(0, 10)}`, }); } } catch (e) { @@ -97,11 +98,16 @@ export class SettlementScheduler { this.alert.notify({ level: 'P0', category: 'settlement', - title: '合伙人月账单任务失败', + title: '合伙人周账单任务失败', detail: e instanceof Error ? e.message : String(e), - dedupeKey: `job_partner_bill|${new Date().toISOString().slice(0, 7)}`, + dedupeKey: `job_partner_bill|${new Date().toISOString().slice(0, 10)}`, }); } + } + + @Cron('0 8 1 * *', { timeZone: 'Asia/Shanghai' }) + async handleMonthlyPartnerBills() { + this.logger.log('Monthly logistics bills job start'); try { const logistics = await this.settlementService.generatePreviousMonthLogisticsBills(); this.logger.log( diff --git a/server/dukang-api/src/modules/iam/partner-staff.service.ts b/server/dukang-api/src/modules/iam/partner-staff.service.ts index 1808bfc..a9adf85 100644 --- a/server/dukang-api/src/modules/iam/partner-staff.service.ts +++ b/server/dukang-api/src/modules/iam/partner-staff.service.ts @@ -115,7 +115,7 @@ export class PartnerStaffService { permissions, isPrimary: 0, parentAccountId: parent.id, - status: 'DISABLED', + status: 'ACTIVE', }, }); diff --git a/server/dukang-api/src/modules/settlement/settlement.controller.ts b/server/dukang-api/src/modules/settlement/settlement.controller.ts index fada46e..526abc2 100644 --- a/server/dukang-api/src/modules/settlement/settlement.controller.ts +++ b/server/dukang-api/src/modules/settlement/settlement.controller.ts @@ -1,5 +1,5 @@ -import { BadRequestException, Body, Controller, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common'; -import { IsOptional, IsString } from 'class-validator'; +import { BadRequestException, Body, Controller, ForbiddenException, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common'; +import { IsNotEmpty, IsOptional, IsString, MaxLength } from 'class-validator'; import { parseShanghaiYmd } from '@dukang/domain'; import { DEFAULT_PARTNER_STORE_STAFF_PERMISSIONS } from '@dukang/shared-types'; import { SettlementService } from './settlement.service'; @@ -20,11 +20,38 @@ class UpdatePartnerMeDto { name?: string; } +class UpdatePartnerBankDto { + @IsString() + @IsNotEmpty({ message: '请填写收款人' }) + @MaxLength(64) + bankAccountName!: string; + + @IsString() + @IsNotEmpty({ message: '请填写银行账号' }) + @MaxLength(32) + bankAccountNo!: string; + + @IsString() + @IsNotEmpty({ message: '请填写开户行名称' }) + @MaxLength(128) + bankBranch!: string; +} + @Controller('partner/settlement') @UseGuards(JwtAuthGuard, PartnerPrimaryGuard) export class SettlementController { constructor(private readonly settlementService: SettlementService) {} + @Get('cycle') + cycle() { + return this.settlementService.getPartnerSettlementCycle(); + } + + @Get('preview') + preview(@CurrentUser() user: AuthUser) { + return this.settlementService.getPartnerSettlementPreview(user.actorId); + } + @Get('bills') bills(@CurrentUser() user: AuthUser) { return this.settlementService.listPartnerBills(user.actorId); @@ -325,7 +352,9 @@ export class AdminPartnerBillController { refIdField: 'id', includeBody: true, }) - generate(@Body() body: { partnerId: string; year: number; month: number }) { + generate(@Body() body: { partnerId: string; weekStartYmd: string }) { + if (!body?.weekStartYmd) throw new BadRequestException('请提供 weekStartYmd'); + if (!body?.partnerId) throw new BadRequestException('请提供 partnerId'); return this.settlementService.generatePartnerBill(body); } @@ -336,7 +365,8 @@ export class AdminPartnerBillController { batch: true, includeBody: true, }) - generateAll(@Body() body: { year: number; month: number }) { + generateAll(@Body() body: { weekStartYmd: string }) { + if (!body?.weekStartYmd) throw new BadRequestException('请提供 weekStartYmd'); return this.settlementService.generateAllPartnerBills(body); } @@ -349,6 +379,7 @@ export class AdminPartnerBillController { partnerId: query.partnerId, year: query.year ? Number(query.year) : undefined, month: query.month ? Number(query.month) : undefined, + weekStartYmd: query.weekStartYmd, }); } @@ -359,6 +390,7 @@ export class AdminPartnerBillController { status: query.status, year: query.year ? Number(query.year) : undefined, month: query.month ? Number(query.month) : undefined, + weekStartYmd: query.weekStartYmd, }); } @@ -618,6 +650,29 @@ export class PartnerMeController { return this.buildPartnerMe(user.actorId); } + @Put('bank') + async updateBank(@CurrentUser() user: AuthUser, @Body() dto: UpdatePartnerBankDto) { + const account = await this.prisma.partnerAccount.findUniqueOrThrow({ + where: { id: user.actorId }, + }); + if (account.isPrimary !== 1) { + throw new ForbiddenException('仅主账号可修改收款账户'); + } + const bankAccountName = dto.bankAccountName.trim(); + const bankAccountNo = dto.bankAccountNo.replace(/\s+/g, ''); + const bankBranch = dto.bankBranch.trim(); + if (!bankAccountName) throw new BadRequestException('请填写收款人'); + if (!/^\d{8,32}$/.test(bankAccountNo)) { + throw new BadRequestException('请填写正确的银行账号'); + } + if (!bankBranch) throw new BadRequestException('请填写开户行名称'); + await this.prisma.partnerAccount.update({ + where: { id: account.id }, + data: { bankAccountName, bankAccountNo, bankBranch }, + }); + return this.buildPartnerMe(user.actorId); + } + private async buildPartnerMe(actorId: bigint) { let account = await this.prisma.partnerAccount.findUniqueOrThrow({ where: { id: actorId }, @@ -661,6 +716,14 @@ export class PartnerMeController { wxAvatarUrl: account.wxAvatarUrl ?? undefined, managedWarehouseId: primary.managedWarehouseId?.toString() ?? null, hasWarehouseAccess, + bankAccount: + account.isPrimary === 1 + ? { + bankAccountName: account.bankAccountName, + bankAccountNo: account.bankAccountNo, + bankBranch: account.bankBranch, + } + : undefined, }; } } diff --git a/server/dukang-api/src/modules/settlement/settlement.service.ts b/server/dukang-api/src/modules/settlement/settlement.service.ts index 704f9e6..eafe31c 100644 --- a/server/dukang-api/src/modules/settlement/settlement.service.ts +++ b/server/dukang-api/src/modules/settlement/settlement.service.ts @@ -18,15 +18,20 @@ import { parseShanghaiYmd, pickPayoutsForWithdrawAmount, previousShanghaiMonth, + previousShanghaiWeek, resolveSettlementRate, + shanghaiBillPeriodYmds, shanghaiMonthLastInstant, shanghaiMonthRange, shanghaiPeriodYmds, + shanghaiPeriodYmdsForWeek, shanghaiT1DayWindow, + shanghaiWeekRange, shanghaiWineryPeriodWindow, shanghaiYearMonth, shanghaiYmd, startOfShanghaiDay, + nextPartnerBillIssueAt, sumUnbilledPayoutAmount, validateStoreWithdraw, wineryIssueDateFromCompletedAt, @@ -80,7 +85,39 @@ function paymentProofUrlsInput(urls?: string[]): Prisma.InputJsonValue | typeof } function withShanghaiPeriod(row: T) { - return { ...row, ...shanghaiPeriodYmds(row.periodStart) }; + return { ...row, ...shanghaiBillPeriodYmds(row.periodStart, row.periodEnd) }; +} + +function resolvePartnerWeekPeriod(weekStartYmd: string): { + periodStart: Date; + periodEnd: Date; + endExclusive: Date; +} { + const ymd = String(weekStartYmd || '').trim(); + if (!/^\d{4}-\d{2}-\d{2}$/.test(ymd)) { + throw new BadRequestException('请提供周起始日 weekStartYmd（YYYY-MM-DD）'); + } + const start = parseShanghaiYmd(ymd); + const week = shanghaiWeekRange(start); + if (shanghaiYmd(week.start) !== ymd) { + throw new BadRequestException('账期起始日须为周一'); + } + return { + periodStart: week.start, + periodEnd: new Date(week.endExclusive.getTime() - 1), + endExclusive: week.endExclusive, + }; +} + +function partnerSettlementCycleDto(anchor = new Date()) { + const { start } = shanghaiWeekRange(anchor); + const ymds = shanghaiPeriodYmdsForWeek(start); + return { + periodStart: ymds.periodStart, + periodEnd: ymds.periodEnd, + nextIssueAt: nextPartnerBillIssueAt(anchor).toISOString(), + cycleLabel: '每周一 08:00 出账', + }; } function toPartnerBillItemDto(row: { @@ -1619,6 +1656,7 @@ export class SettlementService implements OnModuleInit { where: { partnerAccountId: primary.id, status: { in: ['AWAITING_CONFIRM', 'UNPAID', 'PAID', 'REJECTED'] }, + totalAmount: { gt: 0 }, }, orderBy: { createdAt: 'desc' }, }); @@ -1630,6 +1668,58 @@ export class SettlementService implements OnModuleInit { return serializeBigInt(bills.map(withShanghaiPeriod)); } + getPartnerSettlementCycle(anchor = new Date()) { + return partnerSettlementCycleDto(anchor); + } + + async getPartnerSettlementPreview(partnerAccountId: bigint) { + const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId); + const { start } = shanghaiWeekRange(); + const now = new Date(); + const periodEnd = now.getTime() < start.getTime() ? start : now; + const redeemCommissionRate = Number(primary.redeemCommissionRate ?? 0.03); + + const orders = await this.prisma.order.findMany({ + where: { + partnerAccountIdAtPay: primary.id, + payStatus: 'PAID', + paidAt: { gte: start, lte: periodEnd }, + }, + select: { payAmount: true, orderCommissionRateAtPay: true }, + }); + const orderCommission = round2( + orders.reduce((sum, o) => { + const rate = o.orderCommissionRateAtPay != null ? Number(o.orderCommissionRateAtPay) : 0; + return sum + Number(o.payAmount) * rate; + }, 0), + ); + + const stores = await this.prisma.store.findMany({ + where: { partnerAccountId: primary.id }, + select: { id: true }, + }); + const storeIds = stores.map((s) => s.id); + const redeems = !storeIds.length + ? [] + : await this.prisma.redeemRecord.findMany({ + where: { + storeId: { in: storeIds }, + createdAt: { gte: start, lte: periodEnd }, + }, + select: { amount: true }, + }); + const redeemCommission = round2( + redeems.reduce((sum, r) => sum + Number(r.amount) * redeemCommissionRate, 0), + ); + + return { + ...partnerSettlementCycleDto(), + prepaymentAmount: round2(orderCommission + redeemCommission), + orderCommissionEstimate: orderCommission, + redeemCommissionEstimate: redeemCommission, + }; + } + async getPartnerBill(partnerAccountId: bigint, billId: bigint) { const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId); const bill = await this.prisma.partnerBill.findFirst({ @@ -1637,6 +1727,7 @@ export class SettlementService implements OnModuleInit { include: { items: { orderBy: { occurredAt: 'asc' } } }, }); if (!bill) throw new NotFoundException('账单不存在'); + if (Number(bill.totalAmount) <= 0) throw new NotFoundException('账单不存在'); this.analyticsService.trackPartnerOneSafe(partnerAccountId, 'PARTNER_H5', { partnerAccountId: primary.id, eventName: 'partner_bill_detail_view', @@ -1659,6 +1750,7 @@ export class SettlementService implements OnModuleInit { partnerId?: string; year?: number; month?: number; + weekStartYmd?: string; }) { const page = query.page ?? 1; const pageSize = query.pageSize ?? 20; @@ -1712,18 +1804,22 @@ export class SettlementService implements OnModuleInit { partnerId?: string; year?: number; month?: number; + weekStartYmd?: string; }): Prisma.PartnerBillWhereInput { const where: Prisma.PartnerBillWhereInput = {}; if (query.status) where.status = query.status as Prisma.EnumPartnerBillStatusFilter['equals']; if (query.partnerId) where.partnerAccountId = BigInt(query.partnerId); - if (query.year && query.month) { + if (query.weekStartYmd) { + const { periodStart, endExclusive } = resolvePartnerWeekPeriod(query.weekStartYmd); + where.periodStart = { gte: periodStart, lt: endExclusive }; + } else if (query.year && query.month) { const { start, endExclusive } = shanghaiMonthRange(query.year, query.month); where.periodStart = { gte: start, lt: endExclusive }; } return where; } - async generateAllPartnerBills(body: { year: number; month: number }) { + async generateAllPartnerBills(body: { weekStartYmd: string }) { const partners = await this.prisma.partnerAccount.findMany({ where: { isPrimary: 1, status: 'ACTIVE' }, select: { @@ -1752,8 +1848,7 @@ export class SettlementService implements OnModuleInit { const bill = await this.generatePartnerBill( { partnerId: p.id.toString(), - year: body.year, - month: body.month, + weekStartYmd: body.weekStartYmd, }, { notify: false }, ); @@ -1781,10 +1876,7 @@ export class SettlementService implements OnModuleInit { }); } } - this.notifyPartnerBillDigest( - `${body.year}-${String(body.month).padStart(2, '0')}`, - created, - ); + this.notifyPartnerBillDigest(body.weekStartYmd, created); return { total: partners.length, success: results.filter((r) => r.ok).length, @@ -1793,10 +1885,15 @@ export class SettlementService implements OnModuleInit { }; } - /** 每月 1 日任务：生成上一自然月账单 */ + /** 每周一任务：生成上一自然周账单 */ + async generatePreviousWeekPartnerBills(anchor = new Date()) { + const prev = previousShanghaiWeek(anchor); + return this.generateAllPartnerBills({ weekStartYmd: shanghaiYmd(prev.start) }); + } + + /** @deprecated 月账任务已改为周账 */ async generatePreviousMonthPartnerBills(anchor = new Date()) { - const prev = previousShanghaiMonth(anchor); - return this.generateAllPartnerBills({ year: prev.year, month: prev.month }); + return this.generatePreviousWeekPartnerBills(anchor); } async getAdminPartnerBill(id: bigint) { @@ -1814,13 +1911,12 @@ export class SettlementService implements OnModuleInit { } async generatePartnerBill( - body: { partnerId: string; year: number; month: number }, + body: { partnerId: string; weekStartYmd: string }, opts?: { notify?: boolean }, ) { const partnerAccountId = BigInt(body.partnerId); const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId); - const { start: periodStart, endExclusive } = shanghaiMonthRange(body.year, body.month); - const periodEnd = shanghaiMonthLastInstant(body.year, body.month); + const { periodStart, periodEnd, endExclusive } = resolvePartnerWeekPeriod(body.weekStartYmd); const existing = await this.prisma.partnerBill.findFirst({ where: { @@ -1829,7 +1925,7 @@ export class SettlementService implements OnModuleInit { }, }); if (existing && existing.status !== 'PENDING_REVIEW') { - throw new BadRequestException('该月账单已进入审核流程，不可重复生成'); + throw new BadRequestException('该账期账单已进入审核流程，不可重复生成'); } if (!primary.cityId) { @@ -1952,7 +2048,7 @@ export class SettlementService implements OnModuleInit { }); cityName = city?.name?.trim() || '—'; } - this.notifyPartnerBillDigest(`${body.year}-${String(body.month).padStart(2, '0')}`, [ + this.notifyPartnerBillDigest(body.weekStartYmd, [ { cityName, partnerLabel: formatPartnerDashLabel(primary.companyName, primary.name), @@ -1981,6 +2077,9 @@ export class SettlementService implements OnModuleInit { async sendPartnerBill(id: bigint) { const bill = await this.prisma.partnerBill.findUnique({ where: { id } }); if (!bill) throw new NotFoundException('账单不存在'); + if (Number(bill.totalAmount) <= 0) { + throw new BadRequestException('零元账单不同步给合伙人'); + } if (bill.status !== 'PENDING_REVIEW' && bill.status !== 'REJECTED') { throw new BadRequestException('仅待审核或已驳回账单可发送'); } @@ -2129,6 +2228,7 @@ export class SettlementService implements OnModuleInit { status?: string; year?: number; month?: number; + weekStartYmd?: string; }) { const where = this.buildPartnerBillWhere(query); const bills = await this.prisma.partnerBill.findMany({ @@ -2172,8 +2272,8 @@ export class SettlementService implements OnModuleInit { csvEscape(b.billNo), csvEscape(b.partnerAccount.companyName ?? ''), csvEscape(b.partnerAccount.phone ?? ''), - shanghaiPeriodYmds(b.periodStart).periodStart, - shanghaiPeriodYmds(b.periodStart).periodEnd, + shanghaiBillPeriodYmds(b.periodStart, b.periodEnd).periodStart, + shanghaiBillPeriodYmds(b.periodStart, b.periodEnd).periodEnd, Number(b.orderCommission), Number(b.redeemCommission), Number(b.totalAmount), diff --git a/server/dukang-api/src/modules/store/partner-assoc.controller.ts b/server/dukang-api/src/modules/store/partner-assoc.controller.ts index ee8834d..38c1777 100644 --- a/server/dukang-api/src/modules/store/partner-assoc.controller.ts +++ b/server/dukang-api/src/modules/store/partner-assoc.controller.ts @@ -1,8 +1,11 @@ import { Body, Controller, Get, Param, Post, Put, Query, Res, UseGuards } from '@nestjs/common'; import type { Response } from 'express'; -import { IsOptional, IsString, MaxLength } from 'class-validator'; +import { Transform } from 'class-transformer'; +import { IsBoolean, IsOptional, IsString, MaxLength } from 'class-validator'; import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard'; +import { OptionalJwtAuthGuard } from '../../common/guards/optional-jwt-auth.guard'; import { PartnerPrimaryGuard } from '../../common/guards/partner-primary.guard'; +import { PartnerPermissionGuard } from '../../common/guards/partner-permission.guard'; import { CurrentUser } from '../../common/decorators/current-user.decorator'; import { PartnerAssocService } from './partner-assoc.service'; @@ -16,6 +19,17 @@ class BindPartnerAssocDto { partnerId?: string; } +class TouchPartnerAssocDto extends BindPartnerAssocDto { + @IsOptional() + @Transform(({ value }) => { + if (value === false || value === 'false' || value === 0 || value === '0') return false; + if (value === true || value === 'true' || value === 1 || value === '1') return true; + return undefined; + }) + @IsBoolean() + countScan?: boolean; +} + class PartnerAssocRemarkDto { @IsOptional() @IsString() @@ -23,6 +37,21 @@ class PartnerAssocRemarkDto { remark?: string | null; } +@Controller('user/partner-assoc') +export class UserPartnerAssocPublicController { + constructor(private readonly assoc: PartnerAssocService) {} + + @Post('touch') + @UseGuards(OptionalJwtAuthGuard) + touch(@Body() dto: TouchPartnerAssocDto) { + return this.assoc.touchScan({ + scene: dto.scene, + partnerId: dto.partnerId, + countScan: dto.countScan, + }); + } +} + @Controller('user/partner-assoc') @UseGuards(JwtAuthGuard) export class UserPartnerAssocController { @@ -35,7 +64,7 @@ export class UserPartnerAssocController { } @Controller('partner/assoc') -@UseGuards(JwtAuthGuard, PartnerPrimaryGuard) +@UseGuards(JwtAuthGuard, PartnerPermissionGuard) export class PartnerAssocController { constructor(private readonly assoc: PartnerAssocService) {} diff --git a/server/dukang-api/src/modules/store/partner-assoc.service.ts b/server/dukang-api/src/modules/store/partner-assoc.service.ts index bab314d..f147441 100644 --- a/server/dukang-api/src/modules/store/partner-assoc.service.ts +++ b/server/dukang-api/src/modules/store/partner-assoc.service.ts @@ -92,6 +92,32 @@ export class PartnerAssocService { }; } + async touchScan(input: { scene?: string; partnerId?: string; countScan?: boolean }) { + const partnerIdRaw = parseAssocScene(input.scene) || input.partnerId?.trim(); + if (!partnerIdRaw || !/^\d+$/.test(partnerIdRaw)) { + throw new BadRequestException('关联码无效'); + } + const primary = await this.partnerCityService.resolvePrimaryAccount(BigInt(partnerIdRaw)); + if (primary.isPrimary !== 1 || primary.status !== 'ACTIVE') { + throw new BadRequestException('合伙人不存在或已停用'); + } + const shouldCountScan = input.countScan !== false; + let scanCount = primary.assocScanCount ?? 0; + if (shouldCountScan) { + const updated = await this.prisma.partnerAccount.update({ + where: { id: primary.id }, + data: { assocScanCount: { increment: 1 } }, + select: { assocScanCount: true }, + }); + scanCount = updated.assocScanCount; + } + return { + partnerId: primary.id.toString(), + scanCounted: shouldCountScan, + scanCount, + }; + } + async unbindUser(userId: bigint) { const user = await this.prisma.user.findUnique({ where: { id: userId } }); if (!user) throw new NotFoundException('用户不存在'); @@ -149,9 +175,10 @@ export class PartnerAssocService { partnerId: primary.id.toString(), qrcodeUrl: ensured.qrcodeUrl, userCount, + scanCount: primary.assocScanCount ?? 0, companyName: primary.companyName, name: primary.name, - activityPosterId, + activityPosterId: partnerAccountId === primary.id ? activityPosterId : null, }; } diff --git a/server/dukang-api/src/modules/store/store.module.ts b/server/dukang-api/src/modules/store/store.module.ts index ea4f48b..908a9ad 100644 --- a/server/dukang-api/src/modules/store/store.module.ts +++ b/server/dukang-api/src/modules/store/store.module.ts @@ -35,6 +35,7 @@ import { PartnerAssocController, PartnerCommissionController, UserPartnerAssocController, + UserPartnerAssocPublicController, } from './partner-assoc.controller'; @Module({ @@ -62,6 +63,7 @@ import { PartnerStoreInfoChangeController, ShopStoreInfoChangeController, AdminStoreInfoChangeController, + UserPartnerAssocPublicController, UserPartnerAssocController, PartnerAssocController, PartnerCommissionController,