Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 jacy
|
e5fe8b903a | ||
|
jacy
|
c6b01def4c | ||
|
jacy
|
63fcf33416 | ||
|
jacy
|
101b27c92c | ||
|
jacy
|
5ed9f79a5e | ||
|
jacy
|
6880b5daf4 | ||
|
jacy
|
1000b489a0 | ||
|
jacy
|
72fef35807 | ||
|
jacy
|
f570383717 | ||
|
jacy
|
fe557c912d | ||
 developer_liu
|
77e9917a18 | ||
|
developer_liu
|
44bfbe0bef | ||
|
jacy
|
84fb2f314a | ||
|
jacy
|
11a9bb2414 | ||
|
jacy
|
a4530a64df | ||
|
jacy
|
c905b3f930 | ||
|
jacy
|
af3c4b6f08 | ||
|
developer_liu
|
c1f502a5e3 | ||
|
jacy
|
52816e3874 | ||
|
jacy
|
7f7719f281 | ||
|
jacy
|
a88fd6c29a | ||
|
jacy
|
bbb13cfd1a | ||
|
jacy
|
2e0518b5b7 | ||
|
jacy
|
f8f652a0a6 | ||
|
jacy
|
04d903c554 | ||
|
jacy
|
30bfcc0d93 | ||
|
jacy
|
283e6651aa | ||
|
jacy
|
0e883d3e70 | ||
|
jacy
|
6a95f47860 | ||
|
jacy
|
cdc4b82931 | ||
|
jacy
|
9a35c4aea9 | ||
|
jacy
|
99c7f8caea | ||
|
jacy
|
eeee55e215 | ||
|
jacy
|
971b8aaa7b | ||
|
jacy
|
d555240295 | ||
|
jacy
|
f35e1a3ba5 |
@@ -3,8 +3,10 @@
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive" />
|
||||
<title>杜康好客 · HQ 管理后台</title>
|
||||
<meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<title>管理后台</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
1aacdfe9dcc03f68e4dd855f8c4c8f33
|
||||
@@ -1,2 +1,2 @@
|
||||
User-agent: *
|
||||
Disallow: /
|
||||
Allow: /
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"cleanUrls": false,
|
||||
"trailingSlash": false,
|
||||
"rewrites": [
|
||||
{ "source": "**", "destination": "/index.html" }
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Form, Modal, Select, Typography, message } from 'antd';
|
||||
import type { ActivityPosterItem } from '@dukang/shared-types';
|
||||
import { request, requestDownload, type Paginated } from '../lib/api';
|
||||
import { ADMIN_OPTIONS_PAGE_SIZE } from '../lib/constants';
|
||||
|
||||
type Props = {
|
||||
open: boolean;
|
||||
partnerIds: string[];
|
||||
onClose: () => void;
|
||||
};
|
||||
|
||||
export default function ActivityPosterDownloadModal({ open, partnerIds, onClose }: Props) {
|
||||
const [posters, setPosters] = useState<ActivityPosterItem[]>([]);
|
||||
const [posterId, setPosterId] = useState<string>();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const multi = partnerIds.length > 1;
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
setPosterId(undefined);
|
||||
setLoading(true);
|
||||
void request<Paginated<ActivityPosterItem>>(
|
||||
`/admin/activity-posters?status=ACTIVE&page=1&pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`,
|
||||
)
|
||||
.then((res) => {
|
||||
const items = res.items ?? [];
|
||||
setPosters(items);
|
||||
setPosterId(items[0]?.id);
|
||||
})
|
||||
.catch((e) => message.error(e instanceof Error ? e.message : '加载活动图失败'))
|
||||
.finally(() => setLoading(false));
|
||||
}, [open]);
|
||||
|
||||
async function submit() {
|
||||
if (!posterId) {
|
||||
message.error('请选择活动图');
|
||||
return;
|
||||
}
|
||||
if (!partnerIds.length) {
|
||||
message.error('请选择合伙人');
|
||||
return;
|
||||
}
|
||||
setSubmitting(true);
|
||||
try {
|
||||
if (partnerIds.length === 1) {
|
||||
await requestDownload(
|
||||
`/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerIds[0])}`,
|
||||
{},
|
||||
'activity-poster.png',
|
||||
);
|
||||
} else {
|
||||
await requestDownload(
|
||||
`/admin/activity-posters/${posterId}/partner-pack`,
|
||||
{ method: 'POST', body: JSON.stringify({ partnerIds }) },
|
||||
'activity-poster-pack.zip',
|
||||
);
|
||||
}
|
||||
message.success('已开始下载');
|
||||
onClose();
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '下载失败');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title={multi ? `导出活动图（${partnerIds.length} 人）` : '下载活动图'}
|
||||
open={open}
|
||||
onCancel={onClose}
|
||||
onOk={() => void submit()}
|
||||
confirmLoading={submitting}
|
||||
okText="下载"
|
||||
okButtonProps={{ disabled: loading || !posterId }}
|
||||
destroyOnClose
|
||||
>
|
||||
<Typography.Paragraph type="secondary">
|
||||
{multi
|
||||
? '将把所选主合伙人的关联码贴进同一张活动图，打包为 zip。无关联码或测试账号会跳过。'
|
||||
: '将把该主合伙人的关联码贴进所选活动图后下载 PNG。'}
|
||||
</Typography.Paragraph>
|
||||
<Form layout="vertical">
|
||||
<Form.Item label="活动图" required>
|
||||
<Select
|
||||
loading={loading}
|
||||
placeholder={loading ? '加载中' : posters.length ? '选择已上架活动图' : '暂无上架活动图'}
|
||||
value={posterId}
|
||||
onChange={setPosterId}
|
||||
options={posters.map((row) => ({ value: row.id, label: row.title }))}
|
||||
showSearch
|
||||
optionFilterProp="label"
|
||||
/>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Form, Input, Modal, message } from 'antd';
|
||||
import type { UpdateMyHqCredentialsRequest } from '@dukang/shared-types';
|
||||
import { request, type HqProfile } from '../lib/api';
|
||||
|
||||
type Props = {
|
||||
open: boolean;
|
||||
profile: HqProfile | null;
|
||||
onClose: () => void;
|
||||
onUpdated: (profile: HqProfile) => void;
|
||||
};
|
||||
|
||||
export function HqAccountSettingsModal({ open, profile, onClose, onUpdated }: Props) {
|
||||
const [form] = Form.useForm<UpdateMyHqCredentialsRequest & { confirmPassword?: string }>();
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
form.setFieldsValue({
|
||||
loginName: profile?.loginName ?? '',
|
||||
oldPassword: '',
|
||||
newPassword: '',
|
||||
confirmPassword: '',
|
||||
});
|
||||
}, [open, profile, form]);
|
||||
|
||||
async function submit() {
|
||||
const values = await form.validateFields();
|
||||
if (values.newPassword && values.newPassword !== values.confirmPassword) {
|
||||
message.error('两次输入的新密码不一致');
|
||||
return;
|
||||
}
|
||||
const body: UpdateMyHqCredentialsRequest = {};
|
||||
const nextLogin = values.loginName?.trim();
|
||||
if (nextLogin && nextLogin !== (profile?.loginName ?? '')) {
|
||||
body.loginName = nextLogin;
|
||||
}
|
||||
if (values.newPassword?.trim()) {
|
||||
body.newPassword = values.newPassword.trim();
|
||||
if (values.oldPassword?.trim()) body.oldPassword = values.oldPassword.trim();
|
||||
}
|
||||
if (!body.loginName && !body.newPassword) {
|
||||
message.warning('请填写要修改的内容');
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
try {
|
||||
await request('/admin/me/credentials', {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
const updated = await request<HqProfile>('/admin/auth/me');
|
||||
message.success('账号信息已更新');
|
||||
onUpdated(updated);
|
||||
onClose();
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '保存失败');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title="账号设置"
|
||||
open={open}
|
||||
onCancel={onClose}
|
||||
onOk={() => void submit()}
|
||||
confirmLoading={saving}
|
||||
destroyOnClose
|
||||
>
|
||||
<Form form={form} layout="vertical">
|
||||
<Form.Item name="loginName" label="登录用户名" rules={[{ required: true, message: '请输入用户名' }]}>
|
||||
<Input autoComplete="username" placeholder="用于密码登录" />
|
||||
</Form.Item>
|
||||
<Form.Item name="oldPassword" label="当前密码" extra="已设置过密码时，修改密码必填">
|
||||
<Input.Password autoComplete="current-password" placeholder="不修改密码请留空" />
|
||||
</Form.Item>
|
||||
<Form.Item name="newPassword" label="新密码" rules={[{ min: 6, message: '至少 6 位' }]}>
|
||||
<Input.Password autoComplete="new-password" placeholder="不修改请留空" />
|
||||
</Form.Item>
|
||||
<Form.Item name="confirmPassword" label="确认新密码">
|
||||
<Input.Password autoComplete="new-password" placeholder="不修改请留空" />
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
Alert,
|
||||
Button,
|
||||
Descriptions,
|
||||
Drawer,
|
||||
@@ -140,6 +141,14 @@ export default function OrderTrackDrawer({
|
||||
</Space>
|
||||
</Image.PreviewGroup>
|
||||
</div>
|
||||
) : nodes.some((n) => n.statusName?.includes('签收') || n.trackInfo?.includes('签收')) ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
style={{ marginBottom: 16 }}
|
||||
message="暂无签收照片"
|
||||
description="小飞侠 100108 未返回图片（可能是本人签收未拍照，或照片已过期）。可在「小飞侠联调」用运单号复测。"
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<Typography.Title level={5} style={{ marginTop: 0 }}>
|
||||
|
||||
@@ -5,6 +5,7 @@ import type { ColumnsType } from 'antd/es/table';
|
||||
import type { PartnerAssocSummary, PartnerAssocUserItem } from '@dukang/shared-types';
|
||||
import { request, type HqProfile, type Paginated } from '../lib/api';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import ActivityPosterDownloadModal from './ActivityPosterDownloadModal';
|
||||
|
||||
function formatNicknameWithRemark(row: PartnerAssocUserItem) {
|
||||
const name = row.nickname?.trim() || '—';
|
||||
@@ -24,6 +25,8 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [issuing, setIssuing] = useState(false);
|
||||
const [canEditAssoc, setCanEditAssoc] = useState(false);
|
||||
const [canDownloadPosters, setCanDownloadPosters] = useState(false);
|
||||
const [posterDownloadOpen, setPosterDownloadOpen] = useState(false);
|
||||
|
||||
const loadSummary = useCallback(async () => {
|
||||
const data = await request<PartnerAssocSummary>(`/admin/partners/${partnerId}/assoc`);
|
||||
@@ -46,8 +49,15 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
|
||||
|
||||
useEffect(() => {
|
||||
void request<HqProfile>('/admin/auth/me')
|
||||
.then((p) => setCanEditAssoc((p.permissionKeys ?? []).includes('users_partner_assoc')))
|
||||
.catch(() => setCanEditAssoc(false));
|
||||
.then((p) => {
|
||||
const keys = p.permissionKeys ?? [];
|
||||
setCanEditAssoc(keys.includes('users_partner_assoc'));
|
||||
setCanDownloadPosters(keys.includes('activity_posters'));
|
||||
})
|
||||
.catch(() => {
|
||||
setCanEditAssoc(false);
|
||||
setCanDownloadPosters(false);
|
||||
});
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -130,6 +140,9 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
|
||||
<Button loading={issuing} onClick={() => void reissue()}>
|
||||
{summary?.qrcodeUrl ? '补发关联码' : '生成关联码'}
|
||||
</Button>
|
||||
{canDownloadPosters ? (
|
||||
<Button onClick={() => setPosterDownloadOpen(true)}>下载活动图</Button>
|
||||
) : null}
|
||||
</div>
|
||||
</Space>
|
||||
<Table
|
||||
@@ -145,6 +158,11 @@ export default function PartnerAssocPanel({ partnerId }: PartnerAssocPanelProps)
|
||||
onChange: (p) => void loadUsers(p),
|
||||
}}
|
||||
/>
|
||||
<ActivityPosterDownloadModal
|
||||
open={posterDownloadOpen}
|
||||
partnerIds={[partnerId]}
|
||||
onClose={() => setPosterDownloadOpen(false)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ import { clearAuth, request, type HqProfile } from '../lib/api';
|
||||
import { bindAdminEllipsisTitle } from '../lib/ellipsis-title';
|
||||
import { AUDIT_NOTICE_CHANGED_EVENT, PACKAGE_AUDIT_CHANGED_EVENT } from '../lib/admin-events';
|
||||
import { ListColumnPrefsProvider } from '../lib/ListColumnPrefsContext';
|
||||
import { HqAccountSettingsModal } from '../components/HqAccountSettingsModal';
|
||||
|
||||
const { Header, Sider, Content } = Layout;
|
||||
|
||||
@@ -292,6 +293,7 @@ export default function AdminLayout() {
|
||||
const contentRef = useRef<HTMLDivElement>(null);
|
||||
const [profile, setProfile] = useState<HqProfile | null>(null);
|
||||
const [auditPendingCount, setAuditPendingCount] = useState(0);
|
||||
const [accountSettingsOpen, setAccountSettingsOpen] = useState(false);
|
||||
|
||||
function refreshAuditPendingCount() {
|
||||
Promise.all([
|
||||
@@ -419,11 +421,20 @@ export default function AdminLayout() {
|
||||
<span style={{ color: '#999' }}>
|
||||
{HQ_ROLE_LABELS[profile?.adminRole ?? ''] || profile?.adminRole || ''}
|
||||
</span>
|
||||
<Button type="text" icon={<UserOutlined />} onClick={() => setAccountSettingsOpen(true)}>
|
||||
账号设置
|
||||
</Button>
|
||||
<Button type="text" icon={<LogoutOutlined />} onClick={logout}>
|
||||
退出
|
||||
</Button>
|
||||
</Space>
|
||||
</Header>
|
||||
<HqAccountSettingsModal
|
||||
open={accountSettingsOpen}
|
||||
profile={profile}
|
||||
onClose={() => setAccountSettingsOpen(false)}
|
||||
onUpdated={setProfile}
|
||||
/>
|
||||
<div
|
||||
ref={contentRef}
|
||||
className="admin-layout"
|
||||
|
||||
@@ -6,6 +6,7 @@ export const CLIENT_APP = 'HQ_WEB';
|
||||
export type HqProfile = {
|
||||
id: string;
|
||||
phone: string;
|
||||
loginName?: string | null;
|
||||
name: string;
|
||||
adminRole: string;
|
||||
status: string;
|
||||
@@ -58,6 +59,54 @@ export async function request<T>(path: string, options: RequestInit = {}): Promi
|
||||
return json.data as T;
|
||||
}
|
||||
|
||||
function parseDownloadFileName(header: string | null, fallback: string): string {
|
||||
if (!header) return fallback;
|
||||
const star = /filename\*=(?:UTF-8''|utf-8'')([^;]+)/i.exec(header);
|
||||
if (star?.[1]) {
|
||||
try {
|
||||
return decodeURIComponent(star[1].trim());
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
const quoted = /filename="([^"]+)"/i.exec(header);
|
||||
if (quoted?.[1]) return quoted[1];
|
||||
const plain = /filename=([^;]+)/i.exec(header);
|
||||
return plain?.[1]?.trim() || fallback;
|
||||
}
|
||||
|
||||
/** Binary download (PNG / zip). JSON error bodies are surfaced as Error. */
|
||||
export async function requestDownload(path: string, options: RequestInit = {}, fallbackName: string) {
|
||||
const headers: Record<string, string> = {
|
||||
'X-Client-App': CLIENT_APP,
|
||||
...(options.headers as Record<string, string>),
|
||||
};
|
||||
if (options.body && !headers['Content-Type']) headers['Content-Type'] = 'application/json';
|
||||
const token = getToken();
|
||||
if (token) headers.Authorization = `Bearer ${token}`;
|
||||
|
||||
const res = await fetch(`${apiBase}${path}`, { ...options, headers });
|
||||
const contentType = res.headers.get('content-type') || '';
|
||||
if (contentType.includes('application/json')) {
|
||||
const json = (await res.json()) as { code?: number; message?: string };
|
||||
if (json.code === 401) {
|
||||
clearAuth();
|
||||
window.location.href = '/login';
|
||||
throw new Error('未登录');
|
||||
}
|
||||
throw new Error(json.message || '下载失败');
|
||||
}
|
||||
if (!res.ok) throw new Error(`下载失败（HTTP ${res.status}）`);
|
||||
const blob = await res.blob();
|
||||
const fileName = parseDownloadFileName(res.headers.get('content-disposition'), fallbackName);
|
||||
const url = URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = fileName;
|
||||
a.click();
|
||||
URL.revokeObjectURL(url);
|
||||
}
|
||||
|
||||
export type Paginated<T> = {
|
||||
items: T[];
|
||||
total: number;
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
/** 将列表可见列 key 追加到导出 query */
|
||||
export function appendExportColumns(qs: URLSearchParams, keys: string[]) {
|
||||
if (keys.length) qs.set('columns', keys.join(','));
|
||||
}
|
||||
|
||||
export function exportColumnsBody(keys: string[]): { columns?: string[] } {
|
||||
return keys.length ? { columns: keys } : {};
|
||||
}
|
||||
@@ -8,8 +8,11 @@ export type StoreCreateForm = {
|
||||
city?: string;
|
||||
district: string;
|
||||
districtCode?: string;
|
||||
/** @deprecated 使用 categoryIds */
|
||||
categoryParentId?: string;
|
||||
categoryId: string;
|
||||
/** @deprecated 使用 categoryIds */
|
||||
categoryId?: string;
|
||||
categoryIds: string[];
|
||||
name: string;
|
||||
phone: string;
|
||||
address: string;
|
||||
@@ -52,7 +55,7 @@ export function validateStoreCreateStep1(
|
||||
| 'partnerAccountId'
|
||||
| 'cityId'
|
||||
| 'regionCodes'
|
||||
| 'categoryId'
|
||||
| 'categoryIds'
|
||||
| 'name'
|
||||
| 'phone'
|
||||
| 'address'
|
||||
@@ -69,7 +72,7 @@ export function validateStoreCreateStep1(
|
||||
if (!form.partnerAccountId) return '请选择开城合伙人';
|
||||
if (!form.regionCodes || form.regionCodes.length < 3) return '请选择省 / 市 / 区县';
|
||||
if (!form.cityId) return '所选地区未匹配到开城城市，请先在「开城 → 城市」配置对应区划';
|
||||
if (!form.categoryId?.trim()) return '请选择门店分类（细类）';
|
||||
if (!form.categoryIds?.length) return '请至少选择一个门店分类（细类）';
|
||||
if (!form.name?.trim()) return '请填写门店名称';
|
||||
if (!form.phone?.trim()) return '请填写门店手机号';
|
||||
if (!PHONE_RE.test(form.phone.trim())) return '门店手机号须为11位手机号';
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
applyColumnPrefs,
|
||||
columnKey,
|
||||
settingItems,
|
||||
visibleColumnKeys,
|
||||
type ListColumnSettingItem,
|
||||
} from './list-column-prefs';
|
||||
import { beginColumnResize, withResizeTitle } from './column-resize';
|
||||
@@ -48,6 +49,16 @@ export function useAdminListColumns<T>(
|
||||
);
|
||||
itemsRef.current = items;
|
||||
|
||||
const exportColumnKeys = useMemo(() => {
|
||||
const keyed = (allColumns as ColumnType<T>[]).map((col, i) => ({
|
||||
col,
|
||||
key: columnKey(col, i),
|
||||
actions: col.title === '操作' || col.key === ACTIONS_COLUMN_KEY || col.key === 'actions',
|
||||
}));
|
||||
const defaultKeys = keyed.filter((c) => !c.actions).map((c) => c.key);
|
||||
return visibleColumnKeys(defaultKeys, pref);
|
||||
}, [allColumns, pref]);
|
||||
|
||||
const serialCol: ColumnType<T> = useMemo(
|
||||
() => ({
|
||||
key: SERIAL_COLUMN_KEY,
|
||||
@@ -171,5 +182,5 @@ export function useAdminListColumns<T>(
|
||||
/>
|
||||
);
|
||||
|
||||
return { columns, settingsButton, settingsModal };
|
||||
return { columns, settingsButton, settingsModal, exportColumnKeys };
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useState } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link, useSearchParams } from 'react-router-dom';
|
||||
import {
|
||||
Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
|
||||
Alert, Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
|
||||
} from 'antd';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
import {
|
||||
@@ -10,7 +11,7 @@ import {
|
||||
type ActivityPosterQrSlot,
|
||||
type ActivityPosterStatus,
|
||||
} from '@dukang/shared-types';
|
||||
import { request } from '../lib/api';
|
||||
import { request, requestDownload } from '../lib/api';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
@@ -30,7 +31,16 @@ type FormValues = {
|
||||
status?: ActivityPosterStatus;
|
||||
};
|
||||
|
||||
type PartnerHint = {
|
||||
id: string;
|
||||
companyName?: string | null;
|
||||
name?: string;
|
||||
phone?: string;
|
||||
};
|
||||
|
||||
export default function ActivityPostersPage() {
|
||||
const [searchParams] = useSearchParams();
|
||||
const partnerId = searchParams.get('partnerId')?.trim() || '';
|
||||
const [form] = Form.useForm();
|
||||
const [editForm] = Form.useForm<FormValues>();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
@@ -45,6 +55,8 @@ export default function ActivityPostersPage() {
|
||||
);
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<ActivityPosterItem | null>(null);
|
||||
const [partnerHint, setPartnerHint] = useState<PartnerHint | null>(null);
|
||||
const [downloadingId, setDownloadingId] = useState<string | null>(null);
|
||||
|
||||
const imageUrl = Form.useWatch('imageUrl', editForm);
|
||||
const qrXPct = Form.useWatch('qrXPct', editForm);
|
||||
@@ -56,6 +68,20 @@ export default function ActivityPostersPage() {
|
||||
qrSizePct: qrSizePct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrSizePct,
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!partnerId) {
|
||||
setPartnerHint(null);
|
||||
return;
|
||||
}
|
||||
void request<PartnerHint>(`/admin/partners/${partnerId}`)
|
||||
.then(setPartnerHint)
|
||||
.catch(() => setPartnerHint({ id: partnerId }));
|
||||
}, [partnerId]);
|
||||
|
||||
const partnerLabel = partnerHint
|
||||
? (partnerHint.companyName || partnerHint.name || partnerHint.phone || partnerHint.id)
|
||||
: partnerId;
|
||||
|
||||
function openCreate() {
|
||||
setEditing(null);
|
||||
editForm.setFieldsValue({
|
||||
@@ -98,6 +124,23 @@ export default function ActivityPostersPage() {
|
||||
void reload();
|
||||
}
|
||||
|
||||
async function downloadForPartner(posterId: string) {
|
||||
if (!partnerId) return;
|
||||
setDownloadingId(posterId);
|
||||
try {
|
||||
await requestDownload(
|
||||
`/admin/activity-posters/${posterId}/image?partnerId=${encodeURIComponent(partnerId)}`,
|
||||
{},
|
||||
'activity-poster.png',
|
||||
);
|
||||
message.success('已开始下载');
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '下载失败');
|
||||
} finally {
|
||||
setDownloadingId(null);
|
||||
}
|
||||
}
|
||||
|
||||
const baseColumns: ColumnsType<ActivityPosterItem> = [
|
||||
{
|
||||
title: '标题',
|
||||
@@ -129,10 +172,20 @@ export default function ActivityPostersPage() {
|
||||
{ title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
|
||||
{
|
||||
title: '操作',
|
||||
width: 200,
|
||||
width: partnerId ? 280 : 200,
|
||||
render: (_, row) => (
|
||||
<Space>
|
||||
<Button type="link" size="small" onClick={() => openEdit(row)}>编辑</Button>
|
||||
{partnerId && row.status === 'ACTIVE' ? (
|
||||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
loading={downloadingId === row.id}
|
||||
onClick={() => void downloadForPartner(row.id)}
|
||||
>
|
||||
为该合伙人下载
|
||||
</Button>
|
||||
) : null}
|
||||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
@@ -176,6 +229,19 @@ export default function ActivityPostersPage() {
|
||||
settings={settingsButton}
|
||||
actions={<Button type="primary" onClick={openCreate}>新建活动图</Button>}
|
||||
/>
|
||||
{partnerId ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
style={{ marginBottom: 16 }}
|
||||
message={
|
||||
<>
|
||||
正在为合伙人「{partnerLabel}」下载活动图。点行内「为该合伙人下载」，或返回{' '}
|
||||
<Link to="/city-partners">城市合伙人</Link>。
|
||||
</>
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
<Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
|
||||
<Form.Item name="status" label="状态">
|
||||
<Select
|
||||
|
||||
@@ -30,7 +30,6 @@ import {
|
||||
PARTNER_STAFF_ROLE_LABELS,
|
||||
type PartnerPermissionKey,
|
||||
} from '@dukang/shared-types';
|
||||
import { request, type Paginated } from '../lib/api';
|
||||
import { omitNullFields } from '../lib/omit-null-fields';
|
||||
import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
|
||||
import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
|
||||
@@ -38,9 +37,11 @@ import { useAdminList } from '../lib/useAdminList';
|
||||
import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
|
||||
import PartnerSubAccountList, { type PartnerSubAccountRow } from '../components/PartnerSubAccountList';
|
||||
import PartnerAssocPanel from '../components/PartnerAssocPanel';
|
||||
import ActivityPosterDownloadModal from '../components/ActivityPosterDownloadModal';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
import { AdminListHeader } from '../components/AdminListHeader';
|
||||
import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
|
||||
import { request, type HqProfile, type Paginated } from '../lib/api';
|
||||
|
||||
|
||||
type SubRow = PartnerSubAccountRow;
|
||||
@@ -159,6 +160,9 @@ export default function CityPartnersPage() {
|
||||
const [maxCommissionRate, setMaxCommissionRate] = useState(0.05);
|
||||
const [createMaxRate, setCreateMaxRate] = useState(0.05);
|
||||
const [createCityCode, setCreateCityCode] = useState<string | undefined>();
|
||||
const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
|
||||
const [posterDownloadIds, setPosterDownloadIds] = useState<string[] | null>(null);
|
||||
const [canDownloadPosters, setCanDownloadPosters] = useState(false);
|
||||
|
||||
const loadCities = useCallback(async () => {
|
||||
const res = await request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`);
|
||||
@@ -169,6 +173,12 @@ export default function CityPartnersPage() {
|
||||
void loadCities();
|
||||
}, [loadCities]);
|
||||
|
||||
useEffect(() => {
|
||||
void request<HqProfile>('/admin/auth/me')
|
||||
.then((p) => setCanDownloadPosters((p.permissionKeys ?? []).includes('activity_posters')))
|
||||
.catch(() => setCanDownloadPosters(false));
|
||||
}, []);
|
||||
|
||||
const editCityCode = detail?.cityId
|
||||
? cities.find((c) => c.id === detail.cityId)?.code
|
||||
: undefined;
|
||||
@@ -373,17 +383,34 @@ export default function CityPartnersPage() {
|
||||
</Link>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '活动图',
|
||||
width: 70,
|
||||
render: (_, row) => (
|
||||
<Link
|
||||
to={`/activity-posters?partnerId=${encodeURIComponent(row.id)}`}
|
||||
title={`为「${row.companyName || row.phone}」下载活动图`}
|
||||
>
|
||||
查看
|
||||
</Link>
|
||||
),
|
||||
},
|
||||
{ title: '子账号', dataIndex: 'accountCount', width: 70, render: (n) => Math.max(0, n - 1) },
|
||||
{ title: '创建', dataIndex: 'createdAt', width: 150, render: fmtTime },
|
||||
{
|
||||
title: '操作',
|
||||
width: 140,
|
||||
width: 220,
|
||||
fixed: 'right',
|
||||
render: (_, row) => (
|
||||
<Space size={0}>
|
||||
<Button type="link" size="small" onClick={() => void openPartner(row.id)}>
|
||||
管理
|
||||
</Button>
|
||||
{canDownloadPosters ? (
|
||||
<Button type="link" size="small" onClick={() => setPosterDownloadIds([row.id])}>
|
||||
下载活动图
|
||||
</Button>
|
||||
) : null}
|
||||
<Popconfirm
|
||||
title="确认删除该城市合伙人？"
|
||||
description="若有门店需先删除门店；账号下有订单或核销单将禁止删除。"
|
||||
@@ -410,7 +437,16 @@ export default function CityPartnersPage() {
|
||||
settings={settingsButton}
|
||||
actions={
|
||||
<>
|
||||
<Link to="/activity-posters">活动图</Link>
|
||||
<Link to="/users?assocPartnerAccountId=any">全部关联用户</Link>
|
||||
{canDownloadPosters ? (
|
||||
<Button
|
||||
disabled={!selectedRowKeys.length}
|
||||
onClick={() => setPosterDownloadIds(selectedRowKeys)}
|
||||
>
|
||||
导出活动图{selectedRowKeys.length ? `（${selectedRowKeys.length}）` : ''}
|
||||
</Button>
|
||||
) : null}
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
@@ -498,6 +534,14 @@ export default function CityPartnersPage() {
|
||||
dataSource={toTableRows(data?.items ?? [])}
|
||||
scroll={{ x: 'max-content' }}
|
||||
childrenColumnName="__noTreeChildren__"
|
||||
rowSelection={
|
||||
canDownloadPosters
|
||||
? {
|
||||
selectedRowKeys,
|
||||
onChange: (keys) => setSelectedRowKeys(keys.map(String)),
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
expandable={{
|
||||
expandedRowRender: (record) => (
|
||||
<PartnerSubAccountList
|
||||
@@ -564,6 +608,21 @@ export default function CityPartnersPage() {
|
||||
{detail.assocUserCount ?? 0}
|
||||
</Link>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="活动图">
|
||||
<Space>
|
||||
<Link
|
||||
to={`/activity-posters?partnerId=${encodeURIComponent(detail.id)}`}
|
||||
title="查看活动图并下载该合伙人合成图"
|
||||
>
|
||||
查看
|
||||
</Link>
|
||||
{canDownloadPosters ? (
|
||||
<Button type="link" size="small" onClick={() => setPosterDownloadIds([detail.id])}>
|
||||
下载
|
||||
</Button>
|
||||
) : null}
|
||||
</Space>
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="管仓仓库" span={2}>
|
||||
{detail.managedWarehouseName ?? (
|
||||
<Typography.Text type="secondary">
|
||||
@@ -812,6 +871,12 @@ export default function CityPartnersPage() {
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
|
||||
<ActivityPosterDownloadModal
|
||||
open={posterDownloadIds != null && posterDownloadIds.length > 0}
|
||||
partnerIds={posterDownloadIds ?? []}
|
||||
onClose={() => setPosterDownloadIds(null)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ import {
|
||||
import { request } from '../lib/api';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import { downloadBase64File } from '../lib/exportExcel';
|
||||
import { exportColumnsBody } from '../lib/export-columns';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import OssUpload from '../components/OssUpload';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
@@ -50,6 +51,7 @@ const STATUS_COLOR: Record<DevPlanTaskStatusDto, string> = {
|
||||
IN_PROGRESS: 'orange',
|
||||
DEVELOPED: 'blue',
|
||||
RELEASED: 'green',
|
||||
STOPPED: 'red',
|
||||
};
|
||||
|
||||
const DEFAULT_DISPATCH_SUPPLEMENT = '请按以下任务进入开发流程';
|
||||
@@ -61,6 +63,8 @@ export default function DevPlanTasksPage() {
|
||||
const [dispatchOpen, setDispatchOpen] = useState(false);
|
||||
const [batchEditOpen, setBatchEditOpen] = useState(false);
|
||||
const [batchSaving, setBatchSaving] = useState(false);
|
||||
const [creatingVersion, setCreatingVersion] = useState(false);
|
||||
const [newVersionNo, setNewVersionNo] = useState('');
|
||||
const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
|
||||
const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
|
||||
const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
|
||||
@@ -171,9 +175,34 @@ export default function DevPlanTasksPage() {
|
||||
|
||||
function openBatchEdit() {
|
||||
batchForm.setFieldsValue({ status: undefined, versionId: undefined });
|
||||
setNewVersionNo('');
|
||||
setBatchEditOpen(true);
|
||||
}
|
||||
|
||||
async function createVersionInBatch() {
|
||||
const versionNo = newVersionNo.trim();
|
||||
if (!versionNo) {
|
||||
message.warning('请输入版本号');
|
||||
return;
|
||||
}
|
||||
setCreatingVersion(true);
|
||||
try {
|
||||
const created = await request<DevPlanVersionDto>('/admin/dev-plan/versions', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ versionNo }),
|
||||
});
|
||||
const res = await request<{ items: DevPlanVersionDto[] }>('/admin/dev-plan/versions?pageSize=100');
|
||||
setVersions(res.items ?? []);
|
||||
batchForm.setFieldsValue({ versionId: created.id });
|
||||
setNewVersionNo('');
|
||||
message.success(`已创建版本 ${versionNo}`);
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '创建失败');
|
||||
} finally {
|
||||
setCreatingVersion(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function submitBatchEdit() {
|
||||
const values = await batchForm.validateFields();
|
||||
if (!values.status && !values.versionId) {
|
||||
@@ -223,34 +252,6 @@ export default function DevPlanTasksPage() {
|
||||
}
|
||||
}
|
||||
|
||||
async function exportTasks(scope: 'filter' | 'selected') {
|
||||
setExporting(true);
|
||||
try {
|
||||
const result = await request<{
|
||||
filename: string;
|
||||
mimeType: string;
|
||||
contentBase64: string;
|
||||
count: number;
|
||||
}>('/admin/dev-plan/tasks/export', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
scope,
|
||||
format: exportFormat,
|
||||
ids: scope === 'selected' ? selectedRowKeys : undefined,
|
||||
status: filters.status || undefined,
|
||||
type: filters.type || undefined,
|
||||
keyword: filters.keyword || undefined,
|
||||
}),
|
||||
});
|
||||
downloadBase64File(result.contentBase64, result.filename, result.mimeType);
|
||||
message.success(`已导出 ${result.count} 条任务`);
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '导出失败');
|
||||
} finally {
|
||||
setExporting(false);
|
||||
}
|
||||
}
|
||||
|
||||
const baseColumns: ColumnsType<DevPlanTaskDto> = [
|
||||
{
|
||||
title: '任务号',
|
||||
@@ -284,6 +285,7 @@ export default function DevPlanTasksPage() {
|
||||
},
|
||||
{
|
||||
title: '附件',
|
||||
key: 'attachmentUrls',
|
||||
width: 100,
|
||||
render: (_, row) =>
|
||||
row.attachmentUrls?.length ? (
|
||||
@@ -313,6 +315,7 @@ export default function DevPlanTasksPage() {
|
||||
},
|
||||
{
|
||||
title: '关联版本',
|
||||
key: 'versions',
|
||||
dataIndex: 'versions',
|
||||
width: 140,
|
||||
render: (_, row) =>
|
||||
@@ -346,7 +349,36 @@ export default function DevPlanTasksPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('dev-plan-tasks', baseColumns, { page, pageSize });
|
||||
|
||||
async function exportTasks(scope: 'filter' | 'selected') {
|
||||
setExporting(true);
|
||||
try {
|
||||
const result = await request<{
|
||||
filename: string;
|
||||
mimeType: string;
|
||||
contentBase64: string;
|
||||
count: number;
|
||||
}>('/admin/dev-plan/tasks/export', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
scope,
|
||||
format: exportFormat,
|
||||
ids: scope === 'selected' ? selectedRowKeys : undefined,
|
||||
status: filters.status || undefined,
|
||||
type: filters.type || undefined,
|
||||
keyword: filters.keyword || undefined,
|
||||
...exportColumnsBody(exportColumnKeys),
|
||||
}),
|
||||
});
|
||||
downloadBase64File(result.contentBase64, result.filename, result.mimeType);
|
||||
message.success(`已导出 ${result.count} 条任务`);
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '导出失败');
|
||||
} finally {
|
||||
setExporting(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -540,6 +572,19 @@ export default function DevPlanTasksPage() {
|
||||
options={versions.map((v) => ({ value: v.id, label: v.versionNo }))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item label="创建新版本">
|
||||
<Space.Compact style={{ width: '100%' }}>
|
||||
<Input
|
||||
placeholder="版本号，如 v4.0.11"
|
||||
value={newVersionNo}
|
||||
onChange={(e) => setNewVersionNo(e.target.value)}
|
||||
onPressEnter={() => void createVersionInBatch()}
|
||||
/>
|
||||
<Button loading={creatingVersion} onClick={() => void createVersionInBatch()}>
|
||||
创建
|
||||
</Button>
|
||||
</Space.Compact>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
</div>
|
||||
|
||||
@@ -36,6 +36,7 @@ const STATUS_COLOR: Record<DevPlanVersionStatusDto, string> = {
|
||||
IN_PROGRESS: 'processing',
|
||||
TESTING: 'purple',
|
||||
RELEASED: 'green',
|
||||
STOPPED: 'red',
|
||||
};
|
||||
|
||||
function formatDuration(minutes?: number | null) {
|
||||
@@ -56,6 +57,7 @@ export default function DevPlanVersionsPage() {
|
||||
useAdminList<DevPlanVersionDto>('/admin/dev-plan/versions', () => {
|
||||
const qs = new URLSearchParams();
|
||||
if (filters.status) qs.set('status', filters.status);
|
||||
if (filters.keyword) qs.set('keyword', filters.keyword);
|
||||
return qs;
|
||||
}, [filters]);
|
||||
|
||||
@@ -189,6 +191,9 @@ export default function DevPlanVersionsPage() {
|
||||
<Form.Item name="status" label="状态">
|
||||
<Select allowClear style={{ width: 120 }} options={STATUS_OPTIONS} />
|
||||
</Form.Item>
|
||||
<Form.Item name="keyword" label="查找">
|
||||
<Input allowClear placeholder="版本号或内容" style={{ width: 220 }} />
|
||||
</Form.Item>
|
||||
<Button type="primary" htmlType="submit">
|
||||
筛选
|
||||
</Button>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
@@ -27,6 +28,7 @@ import {
|
||||
} from '@dukang/shared-types';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import { downloadExcelCsv } from '../lib/exportExcel';
|
||||
import { appendExportColumns } from '../lib/export-columns';
|
||||
import { request } from '../lib/api';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
@@ -98,6 +100,7 @@ const STATUS_COLORS: Record<string, string> = {
|
||||
};
|
||||
|
||||
export default function LogisticsBillsPage() {
|
||||
const navigate = useNavigate();
|
||||
const [form] = Form.useForm();
|
||||
const [summaryForm] = Form.useForm();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
@@ -202,6 +205,7 @@ export default function LogisticsBillsPage() {
|
||||
if (filters.providerId) qs.set('providerId', filters.providerId);
|
||||
if (filters.year) qs.set('year', filters.year);
|
||||
if (filters.month) qs.set('month', filters.month);
|
||||
appendExportColumns(qs, exportColumnKeys);
|
||||
const result = await request<{ csv: string; count: number }>(
|
||||
`/admin/logistics-bills/export?${qs}`,
|
||||
);
|
||||
@@ -250,6 +254,7 @@ export default function LogisticsBillsPage() {
|
||||
const billColumns: ColumnsType<BillRow> = [
|
||||
{
|
||||
title: '账单号',
|
||||
key: '账单号',
|
||||
dataIndex: 'billNo',
|
||||
width: 170,
|
||||
render: (v, row) => (
|
||||
@@ -258,42 +263,49 @@ export default function LogisticsBillsPage() {
|
||||
},
|
||||
{
|
||||
title: '承运商',
|
||||
key: '承运商',
|
||||
width: 140,
|
||||
render: (_, r) => `${r.providerName || ''} (${r.providerCode || ''})`,
|
||||
},
|
||||
{
|
||||
title: '账期',
|
||||
key: '账期',
|
||||
width: 200,
|
||||
render: (_, r) =>
|
||||
`${String(r.periodStart || '').slice(0, 10)} ~ ${String(r.periodEnd || '').slice(0, 10)}`,
|
||||
},
|
||||
{
|
||||
title: '结算方式',
|
||||
key: '结算方式',
|
||||
dataIndex: 'settlementMethod',
|
||||
width: 100,
|
||||
render: (v) =>
|
||||
LOGISTICS_SETTLEMENT_METHOD_LABELS[v as LogisticsSettlementMethod] || v,
|
||||
},
|
||||
{ title: '订单数', dataIndex: 'orderCount', width: 80 },
|
||||
{ title: '瓶数', dataIndex: 'bottleCount', width: 80 },
|
||||
{ title: '订单数', key: '订单数', dataIndex: 'orderCount', width: 80 },
|
||||
{ title: '瓶数', key: '瓶数', dataIndex: 'bottleCount', width: 80 },
|
||||
{
|
||||
title: '物流费',
|
||||
key: '物流费',
|
||||
dataIndex: 'logisticsAmount',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '收款户名',
|
||||
key: '收款户名',
|
||||
width: 100,
|
||||
render: (_, r) => providerBank(r)?.bankAccountName || '—',
|
||||
},
|
||||
{
|
||||
title: '收款账号',
|
||||
key: '收款账号',
|
||||
width: 140,
|
||||
render: (_, r) => providerBank(r)?.bankAccountNo || '—',
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 90,
|
||||
render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
|
||||
@@ -398,7 +410,7 @@ export default function LogisticsBillsPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-logistics-bills', billColumns, {
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-logistics-bills', billColumns, {
|
||||
page,
|
||||
pageSize,
|
||||
});
|
||||
@@ -627,7 +639,20 @@ export default function LogisticsBillsPage() {
|
||||
pagination={false}
|
||||
dataSource={detail.items ?? []}
|
||||
columns={[
|
||||
{ title: '订单号', dataIndex: 'orderNo' },
|
||||
{
|
||||
title: '订单号',
|
||||
dataIndex: 'orderNo',
|
||||
render: (v: string) =>
|
||||
v ? (
|
||||
<AdminPrimaryLink
|
||||
onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
|
||||
>
|
||||
{v}
|
||||
</AdminPrimaryLink>
|
||||
) : (
|
||||
'—'
|
||||
),
|
||||
},
|
||||
{ title: '瓶数', dataIndex: 'quantity', width: 70 },
|
||||
{
|
||||
title: '物流费',
|
||||
|
||||
@@ -29,6 +29,7 @@ import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
import { AdminListHeader } from '../components/AdminListHeader';
|
||||
import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
|
||||
import { downloadBase64File } from '../lib/exportExcel';
|
||||
import { exportColumnsBody } from '../lib/export-columns';
|
||||
import {
|
||||
ADMIN_OPTIONS_PAGE_SIZE,
|
||||
DELIVERY_PROVIDER_LABELS,
|
||||
@@ -265,8 +266,9 @@ function buildExportPayload(
|
||||
format: OrderExportFormat,
|
||||
filters: OrderExportFilters,
|
||||
selectedIds: string[],
|
||||
columns?: string[],
|
||||
) {
|
||||
const payload: Record<string, unknown> = { scope, format };
|
||||
const payload: Record<string, unknown> = { scope, format, ...exportColumnsBody(columns ?? []) };
|
||||
if (scope === 'selected') {
|
||||
payload.ids = selectedIds;
|
||||
return payload;
|
||||
@@ -671,6 +673,7 @@ export default function OrdersPage() {
|
||||
status: selectedStatuses(values.status).length ? values.status : initialStatuses,
|
||||
},
|
||||
selectedRowKeys,
|
||||
exportColumnKeys,
|
||||
);
|
||||
const result = await request<OrderExportResult>('/admin/orders/export', {
|
||||
method: 'POST',
|
||||
@@ -688,6 +691,7 @@ export default function OrdersPage() {
|
||||
const baseColumns: ColumnsType<AdminOrderRow> = [
|
||||
{
|
||||
title: '订单号',
|
||||
key: '订单号',
|
||||
dataIndex: 'orderNo',
|
||||
width: 180,
|
||||
render: (v, row) => (
|
||||
@@ -699,7 +703,7 @@ export default function OrdersPage() {
|
||||
},
|
||||
{
|
||||
title: '用户',
|
||||
key: 'user',
|
||||
key: '用户',
|
||||
width: 200,
|
||||
render: (_, row) =>
|
||||
row.user?.id ? (
|
||||
@@ -712,12 +716,20 @@ export default function OrdersPage() {
|
||||
},
|
||||
{
|
||||
title: '商品',
|
||||
key: 'productName',
|
||||
key: '商品',
|
||||
width: 180,
|
||||
render: (_, row) => (
|
||||
<Space size={4} wrap>
|
||||
<span>{row.productName || '—'}</span>
|
||||
{row.fulfillmentHold ? <Tag color="orange">大单</Tag> : null}
|
||||
{row.fulfillmentHold ? (
|
||||
<Tag color="orange">
|
||||
{row.fulfillmentHoldReason === 'LARGE_ORDER_GE_10_BOXES'
|
||||
? '大单'
|
||||
: row.fulfillmentHoldReason === 'COURIER_OUT_OF_SERVICE'
|
||||
? '超区'
|
||||
: '推单失败'}
|
||||
</Tag>
|
||||
) : null}
|
||||
{row.orderType === 'PROXY' || row.isProxyOrder ? (
|
||||
<Tag color="purple">代下单</Tag>
|
||||
) : null}
|
||||
@@ -726,12 +738,14 @@ export default function OrdersPage() {
|
||||
},
|
||||
{
|
||||
title: '规格',
|
||||
key: '规格',
|
||||
dataIndex: 'productSpec',
|
||||
width: 140,
|
||||
render: (v: string | undefined) => v || '—',
|
||||
},
|
||||
{
|
||||
title: '数量',
|
||||
key: '数量',
|
||||
dataIndex: 'quantity',
|
||||
width: 80,
|
||||
render: (v: number | undefined, row) =>
|
||||
@@ -739,12 +753,14 @@ export default function OrdersPage() {
|
||||
},
|
||||
{
|
||||
title: '配送方式',
|
||||
key: '配送方式',
|
||||
dataIndex: 'deliveryType',
|
||||
width: 100,
|
||||
render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 100,
|
||||
render: (s: string) => (
|
||||
@@ -753,42 +769,47 @@ export default function OrdersPage() {
|
||||
},
|
||||
{
|
||||
title: '实付',
|
||||
key: '实付',
|
||||
dataIndex: 'payAmount',
|
||||
width: 90,
|
||||
render: (v: number) => `¥${v}`,
|
||||
},
|
||||
{
|
||||
title: '运费',
|
||||
key: 'logisticsFee',
|
||||
key: '运费',
|
||||
width: 90,
|
||||
render: (_, row) =>
|
||||
row.delivery?.logisticsFee == null ? '—' : `¥${Number(row.delivery.logisticsFee).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '好客权益',
|
||||
key: '好客权益',
|
||||
width: 200,
|
||||
render: (_, row) => formatBenefitBrief(row),
|
||||
},
|
||||
{
|
||||
title: '收货人',
|
||||
key: '收货人',
|
||||
dataIndex: 'receiverName',
|
||||
width: 90,
|
||||
render: (v: string | undefined) => v || '—',
|
||||
},
|
||||
{
|
||||
title: '电话',
|
||||
key: '电话',
|
||||
dataIndex: 'receiverPhone',
|
||||
width: 120,
|
||||
render: (v: string | undefined) => v || '—',
|
||||
},
|
||||
{
|
||||
title: '地址',
|
||||
key: 'receiverAddress',
|
||||
key: '地址',
|
||||
width: 260,
|
||||
render: (_, row) => formatReceiverAddress(row) || '—',
|
||||
},
|
||||
{
|
||||
title: '下单时间',
|
||||
key: '下单时间',
|
||||
dataIndex: 'createdAt',
|
||||
width: 170,
|
||||
render: fmtTime,
|
||||
@@ -823,7 +844,7 @@ export default function OrdersPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('orders', baseColumns, {
|
||||
page,
|
||||
pageSize,
|
||||
});
|
||||
@@ -1010,7 +1031,7 @@ export default function OrdersPage() {
|
||||
) : <span />}
|
||||
<Space size={12} wrap>
|
||||
<Form.Item name="fulfillmentHold" valuePropName="checked" noStyle>
|
||||
<Checkbox>大单拦截</Checkbox>
|
||||
<Checkbox>履约拦截</Checkbox>
|
||||
</Form.Item>
|
||||
<Button
|
||||
onClick={() => {
|
||||
@@ -1120,7 +1141,7 @@ export default function OrdersPage() {
|
||||
{detail.fulfillmentHold ? (
|
||||
<Tag color="orange">
|
||||
{FULFILLMENT_HOLD_REASON_LABELS[detail.fulfillmentHoldReason || ''] ||
|
||||
'大单待确认'}
|
||||
'履约待确认'}
|
||||
</Tag>
|
||||
) : null}
|
||||
{detail.orderType === 'PROXY' || detail.isProxyOrder ? (
|
||||
@@ -1517,10 +1538,16 @@ export default function OrdersPage() {
|
||||
type="warning"
|
||||
showIcon
|
||||
style={{ marginBottom: 12 }}
|
||||
message="大单已拦截自动推小飞侠"
|
||||
message={
|
||||
shipTarget.fulfillmentHoldReason === 'LARGE_ORDER_GE_10_BOXES'
|
||||
? '大单已拦截自动推小飞侠'
|
||||
: shipTarget.fulfillmentHoldReason === 'COURIER_OUT_OF_SERVICE'
|
||||
? '小飞侠超出服务区'
|
||||
: '自动推配送失败'
|
||||
}
|
||||
description={
|
||||
FULFILLMENT_HOLD_REASON_LABELS[shipTarget.fulfillmentHoldReason || ''] ||
|
||||
'≥10箱订单需总部确认：可选仓推小飞侠，或改用快递自配送。'
|
||||
'请确认后：可选仓重推小飞侠，或改用快递自配送。'
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
@@ -14,6 +15,7 @@ import {
|
||||
Table,
|
||||
Tabs,
|
||||
Tag,
|
||||
Tooltip,
|
||||
Typography,
|
||||
message,
|
||||
} from 'antd';
|
||||
@@ -22,6 +24,7 @@ import dayjs, { type Dayjs } from 'dayjs';
|
||||
import { request, type Paginated } from '../lib/api';
|
||||
import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
|
||||
import { downloadExcelCsv } from '../lib/exportExcel';
|
||||
import { appendExportColumns } from '../lib/export-columns';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
import { AdminListHeader } from '../components/AdminListHeader';
|
||||
@@ -48,6 +51,7 @@ type Row = {
|
||||
redeemCommission: number;
|
||||
totalAmount: number;
|
||||
status: string;
|
||||
billDate: string;
|
||||
periodStart: string;
|
||||
periodEnd: string;
|
||||
rejectReason?: string | null;
|
||||
@@ -103,7 +107,13 @@ 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 navigate = useNavigate();
|
||||
const [form] = Form.useForm();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
const [partners, setPartners] = useState<PartnerOption[]>([]);
|
||||
@@ -113,8 +123,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 +145,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 +267,10 @@ 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);
|
||||
appendExportColumns(qs, exportColumnKeys);
|
||||
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,13 +282,16 @@ 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);
|
||||
|
||||
const baseColumns: ColumnsType<Row> = [
|
||||
{
|
||||
title: '账单号',
|
||||
key: '账单号',
|
||||
dataIndex: 'billNo',
|
||||
width: 180,
|
||||
render: (v, row) => (
|
||||
@@ -289,45 +300,65 @@ export default function PartnerBillsPage() {
|
||||
},
|
||||
{
|
||||
title: '合伙人',
|
||||
key: '合伙人',
|
||||
width: 200,
|
||||
render: (_, r) => partnerName(r),
|
||||
},
|
||||
{
|
||||
title: (
|
||||
<Tooltip title="周账出账日为账期结束后的下周一；历史月账为次月 1 日">
|
||||
出账日
|
||||
</Tooltip>
|
||||
),
|
||||
key: '出账日',
|
||||
dataIndex: 'billDate',
|
||||
width: 110,
|
||||
render: (v) => String(v || '').slice(0, 10),
|
||||
},
|
||||
{
|
||||
title: '账期',
|
||||
key: '账期',
|
||||
width: 200,
|
||||
render: (_, r) =>
|
||||
`${String(r.periodStart || '').slice(0, 10)} ~ ${String(r.periodEnd || '').slice(0, 10)}`,
|
||||
},
|
||||
{
|
||||
title: '酒单佣金',
|
||||
key: '酒单佣金',
|
||||
dataIndex: 'orderCommission',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '核销佣金',
|
||||
key: '核销佣金',
|
||||
dataIndex: 'redeemCommission',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '合计应付',
|
||||
key: '合计应付',
|
||||
dataIndex: 'totalAmount',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
width: 130,
|
||||
render: (v) =>
|
||||
Number(v) <= 0 ? '¥0.00（不同步）' : `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '收款户名',
|
||||
key: '收款户名',
|
||||
width: 100,
|
||||
render: (_, r) => partnerBank(r)?.bankAccountName || '—',
|
||||
},
|
||||
{
|
||||
title: '收款账号',
|
||||
key: '收款账号',
|
||||
width: 140,
|
||||
render: (_, r) => partnerBank(r)?.bankAccountNo || '—',
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 130,
|
||||
render: (s, row) => (
|
||||
@@ -350,7 +381,7 @@ export default function PartnerBillsPage() {
|
||||
<Button type="link" size="small" onClick={() => void openDetail(row.id)}>
|
||||
明细
|
||||
</Button>
|
||||
{(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
|
||||
{(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && Number(row.totalAmount) > 0 && (
|
||||
<Button type="link" size="small" onClick={() => sendBills([row.id])}>
|
||||
发送
|
||||
</Button>
|
||||
@@ -375,7 +406,7 @@ export default function PartnerBillsPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-partner-bills', baseColumns, { page, pageSize });
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -383,7 +414,7 @@ export default function PartnerBillsPage() {
|
||||
<AdminListHeader
|
||||
title="合伙人账单"
|
||||
settings={settingsButton}
|
||||
description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
|
||||
description="每周一 8:00 自动生成上周账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款。零元账单不同步给合伙人。"
|
||||
/>
|
||||
|
||||
{summary && (
|
||||
@@ -401,12 +432,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 +454,8 @@ export default function PartnerBillsPage() {
|
||||
}))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="month" label="账期月">
|
||||
<DatePicker picker="month" />
|
||||
<Form.Item name="week" label="账期周">
|
||||
<DatePicker picker="week" />
|
||||
</Form.Item>
|
||||
<Form.Item name="status" label="状态">
|
||||
<Select
|
||||
@@ -503,11 +533,11 @@ export default function PartnerBillsPage() {
|
||||
<Form
|
||||
form={genForm}
|
||||
layout="vertical"
|
||||
initialValues={{ month: dayjs().subtract(1, 'month') }}
|
||||
initialValues={{ week: weekMonday(dayjs().subtract(1, 'week')) }}
|
||||
onFinish={generateBill}
|
||||
>
|
||||
<Form.Item name="month" label="账单月份" rules={[{ required: true }]}>
|
||||
<DatePicker picker="month" style={{ width: '100%' }} />
|
||||
<Form.Item name="week" label="账单周（选任意一天，按周一起算）" rules={[{ required: true }]}>
|
||||
<DatePicker picker="week" style={{ width: '100%' }} />
|
||||
</Form.Item>
|
||||
<Form.Item name="partnerId" label="指定合伙人（留空则全部主合伙人）">
|
||||
<Select
|
||||
@@ -568,6 +598,7 @@ export default function PartnerBillsPage() {
|
||||
<Descriptions column={1} size="small" bordered>
|
||||
<Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
|
||||
<Descriptions.Item label="合伙人">{partnerName(detail)}</Descriptions.Item>
|
||||
<Descriptions.Item label="出账日">{String(detail.billDate || '').slice(0, 10)}</Descriptions.Item>
|
||||
<Descriptions.Item label="账期">
|
||||
{String(detail.periodStart).slice(0, 10)} ~ {String(detail.periodEnd).slice(0, 10)}
|
||||
</Descriptions.Item>
|
||||
@@ -606,7 +637,21 @@ export default function PartnerBillsPage() {
|
||||
pagination={false}
|
||||
dataSource={detail.orderItems ?? []}
|
||||
columns={[
|
||||
{ title: '订单号', dataIndex: 'refNo', width: 160 },
|
||||
{
|
||||
title: '订单号',
|
||||
dataIndex: 'refNo',
|
||||
width: 160,
|
||||
render: (v: string) =>
|
||||
v ? (
|
||||
<AdminPrimaryLink
|
||||
onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
|
||||
>
|
||||
{v}
|
||||
</AdminPrimaryLink>
|
||||
) : (
|
||||
'—'
|
||||
),
|
||||
},
|
||||
{ title: '商品', dataIndex: 'title' },
|
||||
{ title: '数量', dataIndex: 'extra', width: 70 },
|
||||
{
|
||||
|
||||
@@ -31,6 +31,7 @@ import {
|
||||
import { request, type Paginated } from '../lib/api';
|
||||
import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
|
||||
import { downloadExcelCsv } from '../lib/exportExcel';
|
||||
import { appendExportColumns } from '../lib/export-columns';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
import { AdminListHeader } from '../components/AdminListHeader';
|
||||
@@ -44,6 +45,8 @@ type Row = {
|
||||
amount: number;
|
||||
status: StoreSettlementStatus;
|
||||
date: string;
|
||||
periodStart?: string | null;
|
||||
periodEnd?: string | null;
|
||||
overdue?: boolean;
|
||||
redeemCount?: number | null;
|
||||
redeemAmount?: number | null;
|
||||
@@ -198,6 +201,7 @@ export default function StoreBillsPage() {
|
||||
if (filters.storeId) qs.set('storeId', filters.storeId);
|
||||
if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
|
||||
if (filters.dateTo) qs.set('dateTo', filters.dateTo);
|
||||
appendExportColumns(qs, exportColumnKeys);
|
||||
const result = await request<{ csv: string; count: number }>(`/admin/store-bills/export?${qs}`);
|
||||
downloadExcelCsv(result.csv, `门店对账单_${filters.dateFrom || 'all'}_${filters.dateTo || 'all'}.csv`);
|
||||
message.success(`已导出 ${result.count} 条 T+1 账单`);
|
||||
@@ -218,6 +222,7 @@ export default function StoreBillsPage() {
|
||||
const baseColumns: ColumnsType<Row> = [
|
||||
{
|
||||
title: '类型',
|
||||
key: '类型',
|
||||
dataIndex: 'kind',
|
||||
width: 100,
|
||||
render: (k: StoreSettlementKind) => (
|
||||
@@ -228,6 +233,7 @@ export default function StoreBillsPage() {
|
||||
},
|
||||
{
|
||||
title: '单号',
|
||||
key: '账单号',
|
||||
dataIndex: 'billNo',
|
||||
width: 180,
|
||||
render: (v, row) => (
|
||||
@@ -243,39 +249,58 @@ export default function StoreBillsPage() {
|
||||
出账日
|
||||
</Tooltip>
|
||||
),
|
||||
key: '出账日',
|
||||
dataIndex: 'date',
|
||||
width: 160,
|
||||
render: (v, row) => (row.kind === 'T1_BILL' ? String(v || '').slice(0, 10) : fmtTime(v)),
|
||||
},
|
||||
{ title: '门店', dataIndex: ['store', 'name'], width: 140 },
|
||||
{ title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
|
||||
{ title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
|
||||
{
|
||||
title: (
|
||||
<Tooltip title="T+1 账期为出账日前一日的核销窗口；手动提现无账期">
|
||||
账期
|
||||
</Tooltip>
|
||||
),
|
||||
key: '账期',
|
||||
width: 200,
|
||||
render: (_, row) =>
|
||||
row.kind === 'T1_BILL' && row.periodStart
|
||||
? `${row.periodStart} ~ ${row.periodEnd}`
|
||||
: '—',
|
||||
},
|
||||
{ title: '门店', key: '门店', dataIndex: ['store', 'name'], width: 140 },
|
||||
{ title: '登录手机', key: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
|
||||
{ title: '城市', key: '城市', dataIndex: ['store', 'cityName'], width: 90 },
|
||||
{
|
||||
title: '收款户名',
|
||||
key: '收款户名',
|
||||
width: 100,
|
||||
render: (_, row) =>
|
||||
row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
|
||||
},
|
||||
{
|
||||
title: '收款账号',
|
||||
key: '收款账号',
|
||||
width: 140,
|
||||
render: (_, row) =>
|
||||
row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
|
||||
},
|
||||
{
|
||||
title: '笔数',
|
||||
key: '笔数',
|
||||
width: 80,
|
||||
render: (_, row) =>
|
||||
row.kind === 'T1_BILL' ? (row.redeemCount ?? '—') : (row.payoutCount ?? '—'),
|
||||
},
|
||||
{
|
||||
title: '应付金额',
|
||||
key: '应付金额',
|
||||
dataIndex: 'amount',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 100,
|
||||
render: (s: string, row) => (
|
||||
@@ -325,7 +350,7 @@ export default function StoreBillsPage() {
|
||||
}
|
||||
| undefined;
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-store-bills', baseColumns, { page, pageSize });
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -495,6 +520,11 @@ export default function StoreBillsPage() {
|
||||
<Descriptions.Item label="出账日">
|
||||
{String(detail.billDate || '').slice(0, 10)}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="账期">
|
||||
{detail.periodStart
|
||||
? `${String(detail.periodStart).slice(0, 10)} ~ ${String(detail.periodEnd || '').slice(0, 10)}`
|
||||
: '—'}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="应付">
|
||||
¥{Number(detail.payoutAmount ?? 0).toFixed(2)}
|
||||
</Descriptions.Item>
|
||||
|
||||
@@ -224,6 +224,7 @@ type StoreRow = {
|
||||
settlementRate?: number;
|
||||
sortOrder?: number;
|
||||
category?: { id: string; name: string; parentId?: string | null } | null;
|
||||
categories?: { id: string; name: string; parentId?: string | null }[] | null;
|
||||
};
|
||||
|
||||
type PartnerOption = { id: string; companyName?: string | null; name?: string | null; phone?: string | null };
|
||||
@@ -350,29 +351,17 @@ export default function StoresPage() {
|
||||
const selectedPartnerId = Form.useWatch('partnerAccountId', createForm);
|
||||
const selectedRegionCodes = Form.useWatch('regionCodes', createForm);
|
||||
const selectedCityId = Form.useWatch('cityId', createForm);
|
||||
const selectedCategoryParentId = Form.useWatch('categoryParentId', createForm);
|
||||
const editCategoryParentId = Form.useWatch('categoryParentId', editForm);
|
||||
|
||||
const categoryParentOptions = useMemo(
|
||||
() =>
|
||||
categoryTree
|
||||
.filter((n) => n.status !== 'INACTIVE')
|
||||
.map((n) => ({ value: n.id, label: n.name })),
|
||||
[categoryTree],
|
||||
);
|
||||
const categoryChildOptions = useMemo(() => {
|
||||
const parent = categoryTree.find((n) => n.id === selectedCategoryParentId);
|
||||
return (parent?.children ?? [])
|
||||
.filter((n) => n.status !== 'INACTIVE')
|
||||
.map((n) => ({ value: n.id, label: n.name }));
|
||||
}, [categoryTree, selectedCategoryParentId]);
|
||||
|
||||
const editCategoryChildOptions = useMemo(() => {
|
||||
const parent = categoryTree.find((n) => n.id === editCategoryParentId);
|
||||
return (parent?.children ?? [])
|
||||
.filter((n) => n.status !== 'INACTIVE')
|
||||
.map((n) => ({ value: n.id, label: n.name }));
|
||||
}, [categoryTree, editCategoryParentId]);
|
||||
const categoryLeafOptions = useMemo(() => {
|
||||
const options: { value: string; label: string }[] = [];
|
||||
for (const parent of categoryTree) {
|
||||
if (parent.status === 'INACTIVE') continue;
|
||||
for (const child of parent.children ?? []) {
|
||||
if (child.status === 'INACTIVE') continue;
|
||||
options.push({ value: child.id, label: `${parent.name} / ${child.name}` });
|
||||
}
|
||||
}
|
||||
return options;
|
||||
}, [categoryTree]);
|
||||
|
||||
async function deleteStore(id: string) {
|
||||
setDeleting(true);
|
||||
@@ -414,20 +403,14 @@ export default function StoresPage() {
|
||||
bankBranch?: string | null;
|
||||
})
|
||||
: null;
|
||||
const categoryId = category?.id != null ? String(category.id) : undefined;
|
||||
let parentId = category?.parentId != null ? String(category.parentId) : undefined;
|
||||
if (!parentId && categoryId) {
|
||||
for (const parent of cats) {
|
||||
if (parent.id === categoryId) {
|
||||
parentId = parent.id;
|
||||
break;
|
||||
}
|
||||
if ((parent.children ?? []).some((c) => c.id === categoryId)) {
|
||||
parentId = parent.id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
const categories = Array.isArray(d.categories)
|
||||
? (d.categories as { id?: string }[])
|
||||
: [];
|
||||
const categoryIds = categories.length
|
||||
? categories.map((c) => String(c.id)).filter(Boolean)
|
||||
: category?.id != null
|
||||
? [String(category.id)]
|
||||
: [];
|
||||
const loginPhone =
|
||||
(typeof d.loginPhone === 'string' && d.loginPhone) ||
|
||||
account?.phone ||
|
||||
@@ -466,8 +449,7 @@ export default function StoresPage() {
|
||||
city: d.cityName,
|
||||
district: d.district,
|
||||
address: d.address,
|
||||
categoryParentId: parentId,
|
||||
categoryId,
|
||||
categoryIds,
|
||||
latitude: d.latitude != null ? Number(d.latitude) : undefined,
|
||||
longitude: d.longitude != null ? Number(d.longitude) : undefined,
|
||||
settlementRate: d.settlementRate != null ? Number(d.settlementRate) * 100 : 60,
|
||||
@@ -530,7 +512,7 @@ export default function StoresPage() {
|
||||
!/^null$/i.test(v.benefitUsageRule.trim())
|
||||
? v.benefitUsageRule.trim()
|
||||
: null,
|
||||
categoryId: v.categoryId,
|
||||
categoryIds: v.categoryIds,
|
||||
province: v.province,
|
||||
city: v.city,
|
||||
district: v.district,
|
||||
@@ -661,8 +643,7 @@ export default function StoresPage() {
|
||||
'partnerAccountId',
|
||||
'regionCodes',
|
||||
'cityId',
|
||||
'categoryParentId',
|
||||
'categoryId',
|
||||
'categoryIds',
|
||||
'name',
|
||||
'phone',
|
||||
'address',
|
||||
@@ -691,7 +672,7 @@ export default function StoresPage() {
|
||||
body: JSON.stringify({
|
||||
partnerAccountId: values.partnerAccountId,
|
||||
cityId: values.cityId,
|
||||
categoryId: values.categoryId,
|
||||
categoryIds: values.categoryIds,
|
||||
province: values.province,
|
||||
city: values.city,
|
||||
name: values.name.trim(),
|
||||
@@ -769,8 +750,14 @@ export default function StoresPage() {
|
||||
{
|
||||
key: 'category',
|
||||
title: '分类',
|
||||
width: 100,
|
||||
render: (_, row) => row.category?.name || '—',
|
||||
width: 140,
|
||||
render: (_, row) => {
|
||||
const cats = Array.isArray(row.categories)
|
||||
? row.categories.map((c: { name?: string }) => c.name).filter(Boolean)
|
||||
: [];
|
||||
if (cats.length) return cats.join('、');
|
||||
return row.category?.name || '—';
|
||||
},
|
||||
},
|
||||
{ key: 'cityName', title: '城市', dataIndex: 'cityName', width: 80 },
|
||||
{ key: 'phone', title: '登录号', dataIndex: 'phone', width: 120 },
|
||||
@@ -1156,29 +1143,17 @@ export default function StoresPage() {
|
||||
<Input placeholder="手机号或座机，如 0379-8888888" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="categoryParentId"
|
||||
label="门店分类（大类）"
|
||||
rules={[{ required: true, message: '请选择门店大类' }]}
|
||||
name="categoryIds"
|
||||
label="门店分类（细类，可多选）"
|
||||
rules={[{ required: true, message: '请至少选择一个门店细类' }]}
|
||||
>
|
||||
<Select
|
||||
mode="multiple"
|
||||
showSearch
|
||||
loading={optionsLoading}
|
||||
optionFilterProp="label"
|
||||
options={categoryParentOptions}
|
||||
onChange={() => editForm.setFieldValue('categoryId', undefined)}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="categoryId"
|
||||
label="门店分类（细类）"
|
||||
rules={[{ required: true, message: '请选择门店细类' }]}
|
||||
>
|
||||
<Select
|
||||
showSearch
|
||||
optionFilterProp="label"
|
||||
placeholder={editCategoryParentId ? '选择细类' : '请先选大类'}
|
||||
disabled={!editCategoryParentId}
|
||||
options={editCategoryChildOptions}
|
||||
placeholder="选择细类，可多选"
|
||||
options={categoryLeafOptions}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="coverUrl" label="封面图 / 门头照">
|
||||
@@ -1457,23 +1432,9 @@ export default function StoresPage() {
|
||||
<Form.Item name="district" hidden><Input /></Form.Item>
|
||||
<Form.Item name="districtCode" hidden><Input /></Form.Item>
|
||||
<Form.Item
|
||||
name="categoryParentId"
|
||||
label="门店分类（大类）"
|
||||
rules={[{ required: true, message: '请选择门店大类' }]}
|
||||
>
|
||||
<Select
|
||||
showSearch
|
||||
loading={optionsLoading}
|
||||
optionFilterProp="label"
|
||||
placeholder={optionsLoading ? '加载中…' : '选择大类'}
|
||||
options={categoryParentOptions}
|
||||
onChange={() => createForm.setFieldValue('categoryId', undefined)}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="categoryId"
|
||||
label="门店分类（细类）"
|
||||
rules={[{ required: true, message: '请选择门店细类' }]}
|
||||
name="categoryIds"
|
||||
label="门店分类（细类，可多选）"
|
||||
rules={[{ required: true, message: '请至少选择一个门店细类' }]}
|
||||
extra={
|
||||
<Typography.Link onClick={() => navigate('/store-categories')}>
|
||||
去配置门店分类
|
||||
@@ -1481,11 +1442,12 @@ export default function StoresPage() {
|
||||
}
|
||||
>
|
||||
<Select
|
||||
mode="multiple"
|
||||
showSearch
|
||||
loading={optionsLoading}
|
||||
optionFilterProp="label"
|
||||
placeholder={selectedCategoryParentId ? '选择细类' : '请先选大类'}
|
||||
disabled={!selectedCategoryParentId}
|
||||
options={categoryChildOptions}
|
||||
placeholder={optionsLoading ? '加载中…' : '选择细类，可多选'}
|
||||
options={categoryLeafOptions}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="name" label="门店名称" rules={[{ required: true, message: '请填写门店名称' }]}>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
@@ -19,12 +20,14 @@ import {
|
||||
} from 'antd';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
import type { Dayjs } from 'dayjs';
|
||||
import dayjs from 'dayjs';
|
||||
import {
|
||||
WINERY_SETTLEMENT_RATE,
|
||||
type SystemConfigFormResponse,
|
||||
} from '@dukang/shared-types';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import { downloadExcelCsv } from '../lib/exportExcel';
|
||||
import { appendExportColumns } from '../lib/export-columns';
|
||||
import { request, type HqProfile } from '../lib/api';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
@@ -36,6 +39,8 @@ type Row = {
|
||||
id: string;
|
||||
billNo: string;
|
||||
billDate: string;
|
||||
periodStart: string;
|
||||
periodEnd: string;
|
||||
orderCount: number;
|
||||
orderAmount: number;
|
||||
wineryRate: number;
|
||||
@@ -95,6 +100,7 @@ function canConfirmWineryPay(row: { status: string; wineryAmount: number | strin
|
||||
const DELIVERY_LABELS: Record<string, string> = {
|
||||
LOCAL: '同城',
|
||||
CROSS_CITY: '跨城',
|
||||
ON_SITE_PICKUP: '现场提货',
|
||||
};
|
||||
|
||||
const WINERY_BANK_KEYS = [
|
||||
@@ -105,8 +111,10 @@ const WINERY_BANK_KEYS = [
|
||||
] as const;
|
||||
|
||||
export default function WineryBillsPage() {
|
||||
const navigate = useNavigate();
|
||||
const [form] = Form.useForm();
|
||||
const [bankForm] = Form.useForm<Record<string, string>>();
|
||||
const [reconcileForm] = Form.useForm<{ range?: [Dayjs, Dayjs] }>();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<Row>(
|
||||
'/admin/winery-bills',
|
||||
@@ -122,6 +130,8 @@ export default function WineryBillsPage() {
|
||||
[filters],
|
||||
);
|
||||
const [exporting, setExporting] = useState(false);
|
||||
const [reconciling, setReconciling] = useState(false);
|
||||
const [reconcileOpen, setReconcileOpen] = useState(false);
|
||||
const [selectedKeys, setSelectedKeys] = useState<React.Key[]>([]);
|
||||
const [detail, setDetail] = useState<(Row & { items?: BillItem[] }) | null>(null);
|
||||
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||
@@ -191,6 +201,7 @@ export default function WineryBillsPage() {
|
||||
if (filters.month) qs.set('month', filters.month);
|
||||
if (filters.dateFrom) qs.set('dateFrom', filters.dateFrom);
|
||||
if (filters.dateTo) qs.set('dateTo', filters.dateTo);
|
||||
appendExportColumns(qs, exportColumnKeys);
|
||||
const result = await request<{ csv: string; count: number }>(`/admin/winery-bills/export?${qs}`);
|
||||
const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all';
|
||||
downloadExcelCsv(result.csv, `酒厂对账单_${suffix}.csv`);
|
||||
@@ -200,6 +211,33 @@ export default function WineryBillsPage() {
|
||||
}
|
||||
}
|
||||
|
||||
async function runReconcile(values: { range?: [Dayjs, Dayjs] }) {
|
||||
setReconciling(true);
|
||||
try {
|
||||
const body: { dateFrom?: string; dateTo?: string } = {};
|
||||
if (values.range?.[0]) body.dateFrom = values.range[0].format('YYYY-MM-DD');
|
||||
if (values.range?.[1]) body.dateTo = values.range[1].format('YYYY-MM-DD');
|
||||
const result = await request<{
|
||||
generated: number;
|
||||
skipped: number;
|
||||
orphanOrders: number;
|
||||
days: number;
|
||||
}>('/admin/winery-bills/reconcile', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
message.success(
|
||||
`核对完成：重算 ${result.generated} 天，跳过 ${result.skipped} 天，补入孤儿订单 ${result.orphanOrders} 笔`,
|
||||
);
|
||||
setReconcileOpen(false);
|
||||
reload();
|
||||
} catch (e) {
|
||||
message.error(e instanceof Error ? e.message : '核对失败');
|
||||
} finally {
|
||||
setReconciling(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function openBankModal() {
|
||||
setBankOpen(true);
|
||||
setBankLoading(true);
|
||||
@@ -243,6 +281,7 @@ export default function WineryBillsPage() {
|
||||
const baseColumns: ColumnsType<Row> = [
|
||||
{
|
||||
title: '账单号',
|
||||
key: '账单号',
|
||||
dataIndex: 'billNo',
|
||||
width: 170,
|
||||
render: (v, row) => (
|
||||
@@ -252,34 +291,49 @@ export default function WineryBillsPage() {
|
||||
{
|
||||
title: (
|
||||
<Tooltip title="出账当天的北京日历日；T+3 只决定纳入哪天完成的订单">
|
||||
账单日
|
||||
出账日
|
||||
</Tooltip>
|
||||
),
|
||||
key: '出账日',
|
||||
dataIndex: 'billDate',
|
||||
width: 110,
|
||||
render: (v) => String(v || '').slice(0, 10),
|
||||
},
|
||||
{ title: '订单数', dataIndex: 'orderCount', width: 80 },
|
||||
{
|
||||
title: '酒单实付合计',
|
||||
title: (
|
||||
<Tooltip title="纳入本账单的订单完成日区间（含起止日）">
|
||||
账期
|
||||
</Tooltip>
|
||||
),
|
||||
key: '账期',
|
||||
width: 200,
|
||||
render: (_, row) => `${row.periodStart} ~ ${row.periodEnd}`,
|
||||
},
|
||||
{ title: '订单数', key: '订单数', dataIndex: 'orderCount', width: 80 },
|
||||
{
|
||||
title: '订单总额',
|
||||
key: '订单总额',
|
||||
dataIndex: 'orderAmount',
|
||||
width: 120,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '酒厂比例',
|
||||
key: '酒厂比例',
|
||||
dataIndex: 'wineryRate',
|
||||
width: 90,
|
||||
render: (v) => `${Math.round(Number(v) * 100)}%`,
|
||||
},
|
||||
{
|
||||
title: '应付',
|
||||
key: '应付',
|
||||
dataIndex: 'wineryAmount',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 100,
|
||||
render: (s, row) => {
|
||||
@@ -306,7 +360,7 @@ export default function WineryBillsPage() {
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
|
||||
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -314,13 +368,18 @@ export default function WineryBillsPage() {
|
||||
<AdminListHeader
|
||||
title="酒厂对账单"
|
||||
settings={settingsButton}
|
||||
description={`T+3：每日 8:00 汇总 3 天前（自然日）已完成的同城/跨城订单（实付 × ${ratePct}%）；未打款红色、已打款绿色、应付为 0 无需打款（灰），可展开订单明细`}
|
||||
description={`T+3：每 3 天出一期（相对 2026-08-01），纳入上期 3 天同城/跨城/现场提货已付已完成订单（实付 × ${ratePct}%）；应付为 0 仍出账「无需打款」`}
|
||||
actions={
|
||||
canEditWineryBank ? (
|
||||
<Button type="default" onClick={() => void openBankModal()}>
|
||||
酒厂银行账户信息配置
|
||||
<Space>
|
||||
<Button type="primary" onClick={() => setReconcileOpen(true)}>
|
||||
核对补生成
|
||||
</Button>
|
||||
) : null
|
||||
{canEditWineryBank ? (
|
||||
<Button type="default" onClick={() => void openBankModal()}>
|
||||
酒厂银行账户信息配置
|
||||
</Button>
|
||||
) : null}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
|
||||
@@ -328,7 +387,7 @@ export default function WineryBillsPage() {
|
||||
<Card size="small" style={{ marginBottom: 16 }}>
|
||||
<Space size="large" wrap>
|
||||
<Statistic title="账单数" value={summary.count} />
|
||||
<Statistic title="酒单实付合计" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
|
||||
<Statistic title="订单总额" value={summary.orderAmount ?? 0} prefix="¥" precision={2} />
|
||||
<Statistic title="应付合计" value={summary.wineryAmount ?? 0} prefix="¥" precision={2} />
|
||||
</Space>
|
||||
</Card>
|
||||
@@ -423,7 +482,10 @@ export default function WineryBillsPage() {
|
||||
<>
|
||||
<Descriptions column={1} size="small" bordered>
|
||||
<Descriptions.Item label="账单号">{detail.billNo}</Descriptions.Item>
|
||||
<Descriptions.Item label="账单日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
|
||||
<Descriptions.Item label="出账日">{String(detail.billDate).slice(0, 10)}</Descriptions.Item>
|
||||
<Descriptions.Item label="账期">
|
||||
{detail.periodStart} ~ {detail.periodEnd}
|
||||
</Descriptions.Item>
|
||||
<Descriptions.Item label="应付">¥{Number(detail.wineryAmount).toFixed(2)}</Descriptions.Item>
|
||||
<Descriptions.Item label="状态">
|
||||
{displayWineryStatus(detail.status, detail.wineryAmount).label}
|
||||
@@ -463,7 +525,20 @@ export default function WineryBillsPage() {
|
||||
pagination={false}
|
||||
dataSource={detail.items ?? []}
|
||||
columns={[
|
||||
{ title: '订单号', dataIndex: 'orderNo' },
|
||||
{
|
||||
title: '订单号',
|
||||
dataIndex: 'orderNo',
|
||||
render: (v: string) =>
|
||||
v ? (
|
||||
<AdminPrimaryLink
|
||||
onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
|
||||
>
|
||||
{v}
|
||||
</AdminPrimaryLink>
|
||||
) : (
|
||||
'—'
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '配送',
|
||||
dataIndex: 'deliveryType',
|
||||
@@ -530,6 +605,32 @@ export default function WineryBillsPage() {
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
|
||||
<Modal
|
||||
title="核对补生成酒厂账单"
|
||||
open={reconcileOpen}
|
||||
onCancel={() => setReconcileOpen(false)}
|
||||
footer={null}
|
||||
destroyOnClose
|
||||
>
|
||||
<Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
|
||||
核对时会补齐同城配送、跨城配送、现场提货的已付已完成订单；并修复历史现场单缺完成时间的问题。
|
||||
实付或应付为 0 也会出账，状态显示为「无需打款」。已打款账单不回刷。
|
||||
</Typography.Paragraph>
|
||||
<Form
|
||||
form={reconcileForm}
|
||||
layout="vertical"
|
||||
initialValues={{ range: [dayjs().subtract(60, 'day'), dayjs()] }}
|
||||
onFinish={(v) => void runReconcile(v)}
|
||||
>
|
||||
<Form.Item name="range" label="出账日区间（可留空则默认近 60 天）">
|
||||
<DatePicker.RangePicker style={{ width: '100%' }} />
|
||||
</Form.Item>
|
||||
<Button type="primary" htmlType="submit" block loading={reconciling}>
|
||||
开始核对
|
||||
</Button>
|
||||
</Form>
|
||||
</Modal>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import {
|
||||
Alert, Button, Card, Col, Descriptions, Form, Input, InputNumber, Row, Select, Space,
|
||||
Alert, Button, Card, Col, Descriptions, Form, Image, Input, InputNumber, Row, Select, Space,
|
||||
Tabs, Tag, Typography, message,
|
||||
} from 'antd';
|
||||
import { request } from '../lib/api';
|
||||
@@ -53,6 +53,22 @@ const CREATE_DEFAULTS = {
|
||||
|
||||
function ResultPanel({ result }: { result: ApiResult | null }) {
|
||||
if (!result) return <Typography.Text type="secondary">点击「调用接口」后在此显示响应</Typography.Text>;
|
||||
const display = (() => {
|
||||
if (!result.data || typeof result.data !== 'object') return result;
|
||||
const data = result.data as { count?: number; data?: string[] };
|
||||
if (!Array.isArray(data.data)) return result;
|
||||
return {
|
||||
...result,
|
||||
data: {
|
||||
...data,
|
||||
data: data.data.map((item) =>
|
||||
typeof item === 'string' && item.length > 120
|
||||
? `${item.slice(0, 80)}…(len=${item.length})`
|
||||
: item,
|
||||
),
|
||||
},
|
||||
};
|
||||
})();
|
||||
return (
|
||||
<div>
|
||||
<Space style={{ marginBottom: 8 }}>
|
||||
@@ -64,7 +80,7 @@ function ResultPanel({ result }: { result: ApiResult | null }) {
|
||||
margin: 0, padding: 12, background: '#f5f5f5', borderRadius: 4,
|
||||
maxHeight: 360, overflow: 'auto', fontSize: 12,
|
||||
}}>
|
||||
{JSON.stringify(result, null, 2)}
|
||||
{JSON.stringify(display, null, 2)}
|
||||
</pre>
|
||||
</div>
|
||||
);
|
||||
@@ -81,7 +97,9 @@ export default function XiaofeixiaTestPage() {
|
||||
const [queryForm] = Form.useForm();
|
||||
const [batchForm] = Form.useForm();
|
||||
const [trackForm] = Form.useForm();
|
||||
const [signPhotoForm] = Form.useForm();
|
||||
const [cancelForm] = Form.useForm();
|
||||
const [signPhotoPreview, setSignPhotoPreview] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
void request<XfxConfig>('/admin/courier/xiaofeixia/config').then(setConfig);
|
||||
@@ -99,12 +117,19 @@ export default function XiaofeixiaTestPage() {
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
setResult(res);
|
||||
if (path.endsWith('/get-sign-photos')) {
|
||||
const data = (res.data as { data?: string[] } | undefined)?.data;
|
||||
setSignPhotoPreview(Array.isArray(data) ? data.filter((u) => typeof u === 'string') : []);
|
||||
} else {
|
||||
setSignPhotoPreview([]);
|
||||
}
|
||||
if (res.ok) message.success('调用成功');
|
||||
else message.warning(res.error || '调用失败');
|
||||
} catch (e) {
|
||||
const err = e instanceof Error ? e.message : String(e);
|
||||
message.error(err);
|
||||
setResult({ ok: false, elapsedMs: 0, error: err });
|
||||
setSignPhotoPreview([]);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -118,7 +143,7 @@ export default function XiaofeixiaTestPage() {
|
||||
<div>
|
||||
<Typography.Title level={4}>小飞侠接口联调</Typography.Title>
|
||||
<Typography.Paragraph type="secondary">
|
||||
通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301）。凭证请在
|
||||
通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301，含签收图片 100108）。凭证请在
|
||||
<Link to="/fulfillment-providers">仓配管理</Link>
|
||||
中配置；联调会优先使用仓配管理里启用的小飞侠承运商。
|
||||
</Typography.Paragraph>
|
||||
@@ -273,6 +298,25 @@ export default function XiaofeixiaTestPage() {
|
||||
</Form>
|
||||
),
|
||||
},
|
||||
{
|
||||
key: 'signPhotos',
|
||||
label: '签收图片 (100108)',
|
||||
children: (
|
||||
<Form
|
||||
form={signPhotoForm}
|
||||
layout="vertical"
|
||||
onFinish={(v) => void invoke('/admin/courier/xiaofeixia/get-sign-photos', v)}
|
||||
>
|
||||
<Form.Item name="trackingNumber" label="运单号 number">
|
||||
<Input placeholder="小飞侠运单号，与商家单号二选一" />
|
||||
</Form.Item>
|
||||
<Form.Item name="outNumber" label="商家单号 outNumber">
|
||||
<Input placeholder="外部单号，与运单号二选一" />
|
||||
</Form.Item>
|
||||
<Button type="primary" htmlType="submit" loading={loading}>调用接口</Button>
|
||||
</Form>
|
||||
),
|
||||
},
|
||||
{
|
||||
key: 'cancel',
|
||||
label: '取消订单 (100103)',
|
||||
@@ -290,6 +334,24 @@ export default function XiaofeixiaTestPage() {
|
||||
<Col xs={24} lg={10}>
|
||||
<Card title="响应结果" size="small">
|
||||
<ResultPanel result={result} />
|
||||
{signPhotoPreview.length > 0 ? (
|
||||
<div style={{ marginTop: 16 }}>
|
||||
<Typography.Text strong>签收照片预览（{signPhotoPreview.length}）</Typography.Text>
|
||||
<Image.PreviewGroup>
|
||||
<Space wrap style={{ marginTop: 8 }}>
|
||||
{signPhotoPreview.map((url, index) => (
|
||||
<Image
|
||||
key={`${index}-${url.slice(0, 32)}`}
|
||||
src={url}
|
||||
width={96}
|
||||
height={96}
|
||||
style={{ objectFit: 'cover', borderRadius: 6 }}
|
||||
/>
|
||||
))}
|
||||
</Space>
|
||||
</Image.PreviewGroup>
|
||||
</div>
|
||||
) : null}
|
||||
</Card>
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<title>城市合伙人</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
User-agent: *
|
||||
Disallow: /
|
||||
Allow: /
|
||||
|
||||
@@ -26,6 +26,7 @@ import UsersManagePage from './pages/UsersManagePage';
|
||||
import AssocOrdersPage from './pages/AssocOrdersPage';
|
||||
import CommissionOrdersPage from './pages/CommissionOrdersPage';
|
||||
import ActivityPostersPage from './pages/ActivityPostersPage';
|
||||
import BankAccountPage from './pages/BankAccountPage';
|
||||
|
||||
function PrimaryRoutes() {
|
||||
return (
|
||||
@@ -42,6 +43,7 @@ function PrimaryRoutes() {
|
||||
<Route path="/center/settlement" element={<SettlementPage />} />
|
||||
<Route path="/center/staff" element={<StaffListPage />} />
|
||||
<Route path="/center/staff/new" element={<StaffCreatePage />} />
|
||||
<Route path="/center/bank" element={<BankAccountPage />} />
|
||||
<Route path="/center/activity-posters" element={<ActivityPostersPage />} />
|
||||
<Route path="/center/assoc" element={<Navigate to="/users" replace />} />
|
||||
<Route path="/center/assoc/users" element={<Navigate to="/users" replace />} />
|
||||
@@ -71,6 +73,7 @@ function SubAccountRoutes() {
|
||||
<Routes>
|
||||
<Route element={<SubAccountLayout navKind={navKind} />}>
|
||||
<Route path="/" element={<HomePage />} />
|
||||
<Route path="/users" element={<UsersManagePage />} />
|
||||
{isWarehouse ? (
|
||||
<Route path="/orders" element={<OrderListPage tabRoot />} />
|
||||
) : (
|
||||
@@ -86,6 +89,7 @@ function SubAccountRoutes() {
|
||||
</>
|
||||
)}
|
||||
<Route path="/leaderboard" element={<LeaderboardPage />} />
|
||||
<Route path="/users/:userId/orders" element={<AssocOrdersPage />} />
|
||||
{isWarehouse && <Route path="/orders/:id" element={<OrderDetailPage />} />}
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
saveActivityPosterSelection,
|
||||
} from '../lib/activity-posters';
|
||||
import { toastError, toastSuccess } from '../lib/toast';
|
||||
import { blobToDataUrl, isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
|
||||
import { isWechatEnv } from '../lib/weixin';
|
||||
|
||||
const NONE_ID = 'none';
|
||||
@@ -98,11 +99,13 @@ export default function ActivityPosterPicker({ initialId }: Props) {
|
||||
setDownloading(true);
|
||||
try {
|
||||
if (selectedId === NONE_ID) {
|
||||
if (isWechatEnv() && isHttpImageUrl(qrcodeUrl)) {
|
||||
await previewSaveableImage(qrcodeUrl);
|
||||
return;
|
||||
}
|
||||
const blob = await fetchAssocQrcodeImage();
|
||||
if (isWechatEnv()) {
|
||||
const url = URL.createObjectURL(blob);
|
||||
urlsRef.current.push(url);
|
||||
setQrcodeUrl(url);
|
||||
setQrcodeUrl(await blobToDataUrl(blob));
|
||||
toastSuccess('请长按上方图片保存到相册');
|
||||
return;
|
||||
}
|
||||
@@ -118,9 +121,8 @@ export default function ActivityPosterPicker({ initialId }: Props) {
|
||||
}
|
||||
if (isWechatEnv()) {
|
||||
let url = previewUrls[selected.id];
|
||||
if (!url) {
|
||||
url = URL.createObjectURL(blob);
|
||||
urlsRef.current.push(url);
|
||||
if (!url || url.startsWith('blob:')) {
|
||||
url = await blobToDataUrl(blob);
|
||||
setPreviewUrls((prev) => ({ ...prev, [selected.id]: url }));
|
||||
}
|
||||
toastSuccess('请长按上方图片保存到相册');
|
||||
@@ -172,7 +174,7 @@ export default function ActivityPosterPicker({ initialId }: Props) {
|
||||
<div className="partner-activity-panel">
|
||||
{qrcodeUrl ? (
|
||||
<div className="partner-activity-preview partner-activity-preview--qr">
|
||||
<img src={qrcodeUrl} alt="关联码" />
|
||||
<img className="partner-longpress-img" src={qrcodeUrl} alt="关联码" />
|
||||
</div>
|
||||
) : (
|
||||
<p className="body-md text-muted" style={{ marginBottom: 12 }}>关联码尚未生成</p>
|
||||
@@ -200,7 +202,7 @@ export default function ActivityPosterPicker({ initialId }: Props) {
|
||||
{selectedId === item.id && (
|
||||
<div className="partner-activity-panel">
|
||||
<div className="partner-activity-preview">
|
||||
<img src={previewUrl || item.imageUrl} alt={item.title} />
|
||||
<img className="partner-longpress-img" src={previewUrl || item.imageUrl} alt={item.title} />
|
||||
{previewLoading && !previewUrl && (
|
||||
<div className="partner-activity-preview-mask">正在贴入二维码…</div>
|
||||
)}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<PartnerSettlementPreviewDto, 'nextIssueAt' | 'cycleLabel'> | 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 出账`;
|
||||
}
|
||||
@@ -25,7 +25,10 @@ export type StoreDraftForm = {
|
||||
/** 人均费用（选填） */
|
||||
avgPrice: string;
|
||||
categoryParentId: string;
|
||||
/** @deprecated 使用 categoryIds */
|
||||
categoryId: string;
|
||||
/** 二级分类多选 */
|
||||
categoryIds: string[];
|
||||
intro: string;
|
||||
/** 好客权益券使用规则 */
|
||||
benefitUsageRule: string;
|
||||
@@ -68,6 +71,7 @@ export const defaultStoreForm = (): StoreDraftForm => ({
|
||||
avgPrice: '',
|
||||
categoryParentId: '',
|
||||
categoryId: '',
|
||||
categoryIds: [],
|
||||
intro: '',
|
||||
benefitUsageRule: '',
|
||||
coverUrl: '',
|
||||
@@ -122,6 +126,20 @@ export function normalizeStoreDraftForm(raw: Partial<StoreDraftForm> | null | un
|
||||
openTime2: String(raw.openTime2 ?? base.openTime2),
|
||||
closeTime2: String(raw.closeTime2 ?? base.closeTime2),
|
||||
avgPrice: String(raw.avgPrice ?? base.avgPrice),
|
||||
categoryIds: (() => {
|
||||
if (Array.isArray(raw.categoryIds) && raw.categoryIds.length) {
|
||||
return raw.categoryIds.map(String).filter(Boolean);
|
||||
}
|
||||
const legacy = String(raw.categoryId ?? '').trim();
|
||||
return legacy ? [legacy] : base.categoryIds;
|
||||
})(),
|
||||
categoryId: (() => {
|
||||
const ids = Array.isArray(raw.categoryIds) && raw.categoryIds.length
|
||||
? raw.categoryIds.map(String).filter(Boolean)
|
||||
: [];
|
||||
if (ids.length) return ids[0];
|
||||
return String(raw.categoryId ?? base.categoryId);
|
||||
})(),
|
||||
envPhotoUrls: normalizeStringArray(raw.envPhotoUrls, MIN_ENV_PHOTO_COUNT),
|
||||
// 兼容旧草稿：单个 contractUrl 迁移为数组
|
||||
contractUrls: (() => {
|
||||
@@ -201,7 +219,7 @@ export function validateStoreStep1(
|
||||
| 'openTime2'
|
||||
| 'closeTime2'
|
||||
| 'avgPrice'
|
||||
| 'categoryId'
|
||||
| 'categoryIds'
|
||||
| 'intro'
|
||||
| 'benefitUsageRule'
|
||||
>,
|
||||
@@ -233,7 +251,7 @@ export function validateStoreStep1(
|
||||
const n = Number(form.avgPrice);
|
||||
if (Number.isNaN(n) || n < 0) return '人均费用须为非负数字';
|
||||
}
|
||||
if (!form.categoryId.trim()) return '请选择店铺类型';
|
||||
if (!form.categoryIds?.length) return '请至少选择一个店铺类型';
|
||||
if (form.intro.trim()) {
|
||||
const len = form.intro.trim().length;
|
||||
if (len < 2 || len > 500) return '门店简介须为 2~500 字';
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { isHttpImageUrl } from '@dukang/weixin-sdk';
|
||||
import { toastSuccess } from './toast';
|
||||
import { isWechatEnv, weixinSdk } from './weixin';
|
||||
|
||||
export { isHttpImageUrl };
|
||||
|
||||
export function blobToDataUrl(blob: Blob): Promise<string> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => resolve(String(reader.result || ''));
|
||||
reader.onerror = () => reject(new Error('读取图片失败'));
|
||||
reader.readAsDataURL(blob);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 微信内用 previewImage 打开可公网访问的图片，用户长按即可保存。
|
||||
* blob / data URL 不能走该接口。
|
||||
*/
|
||||
export async function previewSaveableImage(url: string): Promise<boolean> {
|
||||
const href = url.trim();
|
||||
if (!isWechatEnv() || !isHttpImageUrl(href)) return false;
|
||||
try {
|
||||
await weixinSdk.previewImage(href);
|
||||
toastSuccess('请长按图片保存到相册');
|
||||
return true;
|
||||
} catch {
|
||||
toastSuccess('请长按上方图片保存到相册');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
|
||||
import type { PartnerAssocSummary } from '@dukang/shared-types';
|
||||
import { request } from '../lib/api';
|
||||
import { toastError, toastSuccess } from '../lib/toast';
|
||||
import { isHttpImageUrl, previewSaveableImage } from '../lib/wechat-save-image';
|
||||
import { isWechatEnv } from '../lib/weixin';
|
||||
import { usePartnerPageView } from '../lib/usePageView';
|
||||
|
||||
@@ -11,7 +12,6 @@ export default function AssocQrcodePage() {
|
||||
usePartnerPageView('partner_assoc_qrcode_view');
|
||||
const navigate = useNavigate();
|
||||
const [summary, setSummary] = useState<PartnerAssocSummary | null>(null);
|
||||
const [previewUrl, setPreviewUrl] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -21,11 +21,12 @@ export default function AssocQrcodePage() {
|
||||
.finally(() => setLoading(false));
|
||||
}, []);
|
||||
|
||||
useEffect(() => () => {
|
||||
if (previewUrl) URL.revokeObjectURL(previewUrl);
|
||||
}, [previewUrl]);
|
||||
|
||||
async function downloadQr() {
|
||||
const publicUrl = summary?.qrcodeUrl;
|
||||
if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
|
||||
await previewSaveableImage(publicUrl);
|
||||
return;
|
||||
}
|
||||
const token = localStorage.getItem('accessToken');
|
||||
try {
|
||||
const res = await fetch('/api/v1/partner/assoc/qrcode', {
|
||||
@@ -37,11 +38,6 @@ export default function AssocQrcodePage() {
|
||||
if (!res.ok) throw new Error('下载失败');
|
||||
const blob = await res.blob();
|
||||
const url = URL.createObjectURL(blob);
|
||||
if (isWechatEnv()) {
|
||||
setPreviewUrl(url);
|
||||
toastSuccess('请长按图片保存到相册');
|
||||
return;
|
||||
}
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = `partner-assoc-${summary?.partnerId || 'qr'}.png`;
|
||||
@@ -49,9 +45,8 @@ export default function AssocQrcodePage() {
|
||||
URL.revokeObjectURL(url);
|
||||
toastSuccess('已开始下载');
|
||||
} catch (e) {
|
||||
if (summary?.qrcodeUrl) {
|
||||
setPreviewUrl(summary.qrcodeUrl);
|
||||
toastSuccess('请长按图片保存到相册');
|
||||
if (isWechatEnv() && isHttpImageUrl(publicUrl)) {
|
||||
await previewSaveableImage(publicUrl);
|
||||
return;
|
||||
}
|
||||
toastError(e instanceof Error ? e.message : '下载失败');
|
||||
@@ -70,7 +65,8 @@ export default function AssocQrcodePage() {
|
||||
</p>
|
||||
{summary?.qrcodeUrl ? (
|
||||
<img
|
||||
src={previewUrl || summary.qrcodeUrl}
|
||||
className="partner-longpress-img"
|
||||
src={summary.qrcodeUrl}
|
||||
alt="关联码"
|
||||
style={{ width: 220, height: 220, background: '#fff' }}
|
||||
/>
|
||||
@@ -83,11 +79,11 @@ export default function AssocQrcodePage() {
|
||||
<button type="button" className="partner-btn-primary" style={{ marginTop: 20 }} onClick={() => void downloadQr()}>
|
||||
下载二维码
|
||||
</button>
|
||||
{previewUrl && isWechatEnv() && (
|
||||
{isWechatEnv() && summary?.qrcodeUrl ? (
|
||||
<p className="label-md text-muted" style={{ marginTop: 12 }}>
|
||||
微信内请长按上方图片保存
|
||||
微信内请点「下载二维码」后长按保存
|
||||
</p>
|
||||
)}
|
||||
) : null}
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
|
||||
@@ -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<FieldErrors>({});
|
||||
|
||||
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<PartnerMe>('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 (
|
||||
<div className="partner-page-sticky">
|
||||
<PageHeader title="收款账户" onBack={() => navigate('/center')} />
|
||||
|
||||
<section className="partner-form-card">
|
||||
<div className="partner-section-title">
|
||||
<div className="partner-section-bar" />
|
||||
<h2 className="headline-md">银行账号</h2>
|
||||
</div>
|
||||
<p className="label-md text-muted" style={{ marginBottom: 16, lineHeight: 1.5 }}>
|
||||
用于总部打款。请填写与合同一致的对公或对私账户。
|
||||
</p>
|
||||
|
||||
<div className="partner-field">
|
||||
<label>收款人 <span className="text-primary">*</span></label>
|
||||
<div className="partner-field-input">
|
||||
<span className="material-symbols-outlined">person</span>
|
||||
<input
|
||||
placeholder="户名 / 收款人姓名"
|
||||
value={bankAccountName}
|
||||
maxLength={64}
|
||||
onChange={(e) => setBankAccountName(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{fieldErrors.bankAccountName && (
|
||||
<p className="partner-field-error" role="alert">{fieldErrors.bankAccountName}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="partner-field">
|
||||
<label>银行账号 <span className="text-primary">*</span></label>
|
||||
<div className="partner-field-input">
|
||||
<span className="material-symbols-outlined">credit_card</span>
|
||||
<input
|
||||
inputMode="numeric"
|
||||
placeholder="请输入银行账号"
|
||||
value={bankAccountNo}
|
||||
maxLength={32}
|
||||
onChange={(e) => setBankAccountNo(e.target.value.replace(/[^\d]/g, ''))}
|
||||
/>
|
||||
</div>
|
||||
{fieldErrors.bankAccountNo && (
|
||||
<p className="partner-field-error" role="alert">{fieldErrors.bankAccountNo}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="partner-field">
|
||||
<label>开户行名称 <span className="text-primary">*</span></label>
|
||||
<div className="partner-field-input">
|
||||
<span className="material-symbols-outlined">account_balance</span>
|
||||
<input
|
||||
placeholder="如 中国工商银行洛阳分行"
|
||||
value={bankBranch}
|
||||
maxLength={128}
|
||||
onChange={(e) => setBankBranch(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{fieldErrors.bankBranch && (
|
||||
<p className="partner-field-error" role="alert">{fieldErrors.bankBranch}</p>
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<footer className="partner-sticky-footer">
|
||||
<button
|
||||
type="button"
|
||||
className="partner-btn-primary"
|
||||
disabled={submitting}
|
||||
onClick={() => void submit()}
|
||||
>
|
||||
{submitting ? '保存中…' : '保存'}
|
||||
</button>
|
||||
</footer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -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() {
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', marginBottom: 24 }}>
|
||||
<div>
|
||||
<p className="label-md text-muted" style={{ textTransform: 'uppercase', letterSpacing: '0.1em', marginBottom: 4 }}>SETTLEMENT PERIOD</p>
|
||||
<h2 className="headline-lg" style={{ fontSize: 20 }}>{String(bill.billNo || '月度结算账单')}</h2>
|
||||
<h2 className="headline-lg" style={{ fontSize: 20 }}>{String(bill.billNo || '周结算账单')}</h2>
|
||||
<p className="label-md text-muted" style={{ marginTop: 4 }}>{formatBillPeriod(bill.periodStart, bill.periodEnd)}</p>
|
||||
</div>
|
||||
<span className={`partner-status-pill${isRejected ? ' partner-status-pill--closed' : isUnpaid ? ' partner-status-pill--paused' : isPaid ? ' partner-status-pill--open' : ' partner-status-pill--paused'}`}>
|
||||
{billStatusLabel(status)}
|
||||
@@ -271,7 +273,7 @@ export default function BillsPage() {
|
||||
<div className="partner-store-card-header" style={{ marginBottom: 0 }}>
|
||||
<div>
|
||||
<p className="body-md">{b.billNo}</p>
|
||||
<p className="label-md text-muted">{billStatusLabel(b.status)}</p>
|
||||
<p className="label-md text-muted">{formatBillPeriod(b.periodStart, b.periodEnd)} · {billStatusLabel(b.status)}</p>
|
||||
{b.status === 'REJECTED' && b.rejectReason ? (
|
||||
<p className="label-md text-primary" style={{ marginTop: 4 }}>驳回：{b.rejectReason}</p>
|
||||
) : null}
|
||||
|
||||
@@ -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<PartnerBillDto[]>([]);
|
||||
const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
|
||||
const [staffCount, setStaffCount] = useState(0);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -44,6 +46,9 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
|
||||
request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills')
|
||||
.then(setBills)
|
||||
.catch(() => setBills([])),
|
||||
request<PartnerSettlementPreviewDto>('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
|
||||
<p className="partner-finance-hero-label">账户余额 (元)</p>
|
||||
<p className="partner-finance-hero-amount">{fmtMoney(finance.balance)}</p>
|
||||
</div>
|
||||
<div className="partner-finance-card">
|
||||
<p className="label-md text-muted">预付款</p>
|
||||
<p className="partner-finance-value text-primary">¥ {fmtMoney(preview?.prepaymentAmount ?? 0)}</p>
|
||||
<p className="label-md text-muted" style={{ marginTop: 6, lineHeight: 1.4 }}>
|
||||
{formatBillPeriod(preview?.periodStart, preview?.periodEnd)}
|
||||
<br />
|
||||
{formatIssueLabel(preview)}
|
||||
</p>
|
||||
</div>
|
||||
<Link to="/center/settlement" className="partner-finance-card">
|
||||
<p className="label-md text-muted">待结算</p>
|
||||
<p className="partner-finance-value text-primary">¥ {fmtMoney(finance.pendingTotal)}</p>
|
||||
@@ -219,6 +233,22 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
|
||||
<span className="material-symbols-outlined text-muted">chevron_right</span>
|
||||
</div>
|
||||
</Link>
|
||||
<Link to="/center/bank" className="partner-menu-item">
|
||||
<div className="partner-menu-item-left">
|
||||
<div className="partner-menu-icon">
|
||||
<span className="material-symbols-outlined">account_balance</span>
|
||||
</div>
|
||||
<span className="body-md" style={{ fontSize: 16 }}>收款账户</span>
|
||||
</div>
|
||||
<div className="partner-menu-item-right">
|
||||
{account?.bankAccount?.bankAccountNo ? (
|
||||
<span className="label-md text-muted">{account.bankAccount.bankAccountNo.slice(-4)}</span>
|
||||
) : (
|
||||
<span className="partner-menu-status">未填写</span>
|
||||
)}
|
||||
<span className="material-symbols-outlined text-muted">chevron_right</span>
|
||||
</div>
|
||||
</Link>
|
||||
<Link to="/center/activity-posters" className="partner-menu-item">
|
||||
<div className="partner-menu-item-left">
|
||||
<div className="partner-menu-icon">
|
||||
|
||||
@@ -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<Array<Record<string, unknown>>>([]);
|
||||
const [leaderboardEntries, setLeaderboardEntries] = useState<PartnerLeaderboardEntry[]>([]);
|
||||
const [assocStats, setAssocStats] = useState<PartnerAssocStats | null>(null);
|
||||
const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
document.title = '工作台';
|
||||
@@ -203,9 +205,13 @@ export default function HomePage() {
|
||||
request<PartnerAssocStats>('PARTNER_H5', '/partner/assoc/stats', { silent: true })
|
||||
.then(setAssocStats)
|
||||
.catch(() => setAssocStats(null)),
|
||||
request<PartnerSettlementPreviewDto>('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 (
|
||||
<PullToRefresh onRefresh={loadHome} className="page partner-home partner-home--flush-top">
|
||||
<main className="partner-home-body">
|
||||
{isPrimary && (
|
||||
<>
|
||||
<section className="partner-revenue-card">
|
||||
<p className="partner-revenue-label">
|
||||
实时营业额 (CNY)
|
||||
<span className="material-symbols-outlined" style={{ fontSize: 14 }}>info</span>
|
||||
<p className="partner-revenue-label">预付款金额 (CNY)</p>
|
||||
<div className="partner-revenue-amount">{fmtMoney(preview?.prepaymentAmount ?? 0)}</div>
|
||||
<p className="partner-revenue-label" style={{ marginTop: 8, opacity: 0.85, lineHeight: 1.5 }}>
|
||||
账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)}
|
||||
</p>
|
||||
<p className="partner-revenue-label" style={{ marginTop: 6, opacity: 0.75 }}>
|
||||
本周酒单与核销预估佣金，实际以账单为准
|
||||
</p>
|
||||
<div className="partner-revenue-amount">{fmtMoney(revenue)}</div>
|
||||
<div className="partner-revenue-grid">
|
||||
<div>
|
||||
<p className="partner-revenue-label">预计利润</p>
|
||||
<p className="headline-md" style={{ color: '#fff', marginTop: 4 }}>¥ {fmtMoney(profit)}</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section className="partner-bento-card" style={{ marginBottom: 16 }}>
|
||||
<div className="partner-quick-actions">
|
||||
|
||||
@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
|
||||
import QRCode from 'qrcode';
|
||||
import PageHeader from '@dukang/shared-ui/PageHeader';
|
||||
import { invokeWechatPay } from '@dukang/weixin-sdk';
|
||||
import { validateShippingAddress } from '@dukang/domain';
|
||||
import ChinaRegionPicker from '../components/ChinaRegionPicker';
|
||||
import { getToken, request } from '../lib/api';
|
||||
import { formatRegionLabel, parseRegionCodes } from '../lib/china-region';
|
||||
@@ -243,6 +244,13 @@ export default function ProxyOrderPage() {
|
||||
if (!allowOnline) return '该商品不支持线上购买';
|
||||
if (!region?.province || !region?.city || !region?.district) return '请选择省市区';
|
||||
if (!addressDetail.trim()) return '请填写详细地址';
|
||||
const shipping = validateShippingAddress({
|
||||
province: region.province,
|
||||
city: region.city,
|
||||
district: region.district,
|
||||
detail: addressDetail,
|
||||
});
|
||||
if (!shipping.ok) return shipping.message || '请完善收货地址';
|
||||
if (!autoReceive) return '配送到址须勾选同意自动收货';
|
||||
} else if (!allowOnSite) {
|
||||
return '该商品不支持现场提货';
|
||||
|
||||
@@ -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<PartnerBillDto[]>([]);
|
||||
const now = new Date();
|
||||
const [month, setMonth] = useState({ year: now.getFullYear(), month: now.getMonth() + 1 });
|
||||
const [preview, setPreview] = useState<PartnerSettlementPreviewDto | null>(null);
|
||||
const [statusFilter, setStatusFilter] = useState<StatusFilter>('all');
|
||||
|
||||
const loadBills = useCallback(() => {
|
||||
return request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills').then(setBills);
|
||||
return Promise.all([
|
||||
request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills').then(setBills),
|
||||
request<PartnerSettlementPreviewDto>('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() {
|
||||
</div>
|
||||
<div className="partner-settlement-summary-divider" />
|
||||
<div>
|
||||
<p className="partner-settlement-summary-sub">本月预估收益</p>
|
||||
<p className="partner-settlement-summary-sub">本周预付款</p>
|
||||
<p className="partner-settlement-summary-value partner-settlement-summary-value--accent">
|
||||
¥{fmtMoney(summary.monthEstimate)}
|
||||
¥{fmtMoney(preview?.prepaymentAmount ?? 0)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="partner-settlement-filters">
|
||||
<select
|
||||
className="partner-settlement-month"
|
||||
value={`${month.year}-${month.month}`}
|
||||
onChange={(e) => {
|
||||
const [y, m] = e.target.value.split('-').map(Number);
|
||||
setMonth({ year: y, month: m });
|
||||
}}
|
||||
>
|
||||
{monthOptions.map((opt) => (
|
||||
<option key={`${opt.year}-${opt.month}`} value={`${opt.year}-${opt.month}`}>
|
||||
{billMonthLabel(opt.year, opt.month)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<button type="button" className="partner-settlement-status-btn">
|
||||
<span className="material-symbols-outlined">filter_list</span>
|
||||
状态
|
||||
</button>
|
||||
<p className="label-md text-muted" style={{ margin: 0, lineHeight: 1.5 }}>
|
||||
账期 {formatBillPeriod(preview?.periodStart, preview?.periodEnd)} · {formatIssueLabel(preview)}
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<div className="partner-settlement-chips">
|
||||
@@ -193,7 +160,7 @@ export default function SettlementPage() {
|
||||
</div>
|
||||
<p className="partner-settlement-item-meta">
|
||||
<span className="material-symbols-outlined">event</span>
|
||||
{billPeriodLabel(bill.periodStart)}
|
||||
{billPeriodLabel(bill)}
|
||||
<span className="partner-settlement-dot" />
|
||||
订单分佣 ¥{fmtMoney(Number(bill.orderCommission || 0))}
|
||||
</p>
|
||||
|
||||
@@ -205,7 +205,7 @@ export default function StaffCreatePage() {
|
||||
<span className="material-symbols-outlined">info</span>
|
||||
</div>
|
||||
<p className="label-md text-variant" style={{ marginTop: 0, lineHeight: 1.5 }}>
|
||||
子账号创建后默认禁用，需在子账号列表中手动启用后方可登录。
|
||||
子账号创建后默认可登录，可在子账号列表中禁用。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -206,9 +206,9 @@ export default function StoreCreatePage() {
|
||||
.then((list) => {
|
||||
const tree = Array.isArray(list) ? list : [];
|
||||
setCategoryTree(tree);
|
||||
if (form.categoryId && !form.categoryParentId) {
|
||||
if (form.categoryIds.length && !form.categoryParentId) {
|
||||
const parent = tree.find((root) =>
|
||||
(root.children ?? []).some((child) => child.id === form.categoryId),
|
||||
(root.children ?? []).some((child) => form.categoryIds.includes(child.id)),
|
||||
);
|
||||
if (parent) patchForm({ categoryParentId: parent.id });
|
||||
}
|
||||
@@ -216,12 +216,6 @@ export default function StoreCreatePage() {
|
||||
.catch(() => setCategoryTree([]));
|
||||
}, []);
|
||||
|
||||
const categoryChildren = useMemo(() => {
|
||||
const parent = categoryTree.find((item) => item.id === form.categoryParentId);
|
||||
return Array.isArray(parent?.children) ? parent!.children! : [];
|
||||
}, [categoryTree, form.categoryParentId]);
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -523,7 +517,8 @@ export default function StoreCreatePage() {
|
||||
|
||||
...(form.avgPrice.trim() ? { avgPrice: Number(form.avgPrice) } : {}),
|
||||
|
||||
categoryId: form.categoryId.trim(),
|
||||
categoryIds: form.categoryIds,
|
||||
categoryId: form.categoryIds[0] || form.categoryId.trim(),
|
||||
|
||||
intro: form.intro.trim() || undefined,
|
||||
benefitUsageRule: form.benefitUsageRule.trim() || undefined,
|
||||
@@ -690,56 +685,40 @@ export default function StoreCreatePage() {
|
||||
|
||||
<div className="partner-field">
|
||||
|
||||
<label>店铺类型 <span className="text-primary">*</span></label>
|
||||
|
||||
<div className="partner-input-row" style={{ gap: 8 }}>
|
||||
|
||||
<select
|
||||
|
||||
className="partner-field-input partner-field-input--block"
|
||||
|
||||
value={form.categoryParentId}
|
||||
|
||||
onChange={(e) => patchForm({ categoryParentId: e.target.value, categoryId: '' })}
|
||||
|
||||
aria-label="一级店铺类型"
|
||||
|
||||
>
|
||||
|
||||
<option value="">选择大类</option>
|
||||
|
||||
{categoryTree.map((item) => (
|
||||
|
||||
<option key={item.id} value={item.id}>{item.name}</option>
|
||||
|
||||
))}
|
||||
|
||||
</select>
|
||||
|
||||
<select
|
||||
|
||||
className="partner-field-input partner-field-input--block"
|
||||
|
||||
value={form.categoryId}
|
||||
|
||||
onChange={(e) => patchForm({ categoryId: e.target.value })}
|
||||
|
||||
disabled={!form.categoryParentId}
|
||||
|
||||
aria-label="二级店铺类型"
|
||||
|
||||
>
|
||||
|
||||
<option value="">{form.categoryParentId ? '选择细类' : '请先选大类'}</option>
|
||||
|
||||
{categoryChildren.map((item) => (
|
||||
|
||||
<option key={item.id} value={item.id}>{item.name}</option>
|
||||
|
||||
))}
|
||||
|
||||
</select>
|
||||
<label>店铺类型 <span className="text-primary">*</span> <span className="label-md text-muted">（可多选）</span></label>
|
||||
|
||||
<div className="partner-category-multi">
|
||||
{categoryTree.map((parent) => (
|
||||
<div key={parent.id} className="partner-category-group">
|
||||
<div className="partner-category-group-title">{parent.name}</div>
|
||||
<div className="partner-category-options">
|
||||
{(parent.children ?? []).map((child) => {
|
||||
const checked = form.categoryIds.includes(child.id);
|
||||
return (
|
||||
<label key={child.id} className="partner-category-option">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={checked}
|
||||
onChange={() => {
|
||||
const next = checked
|
||||
? form.categoryIds.filter((id) => id !== child.id)
|
||||
: [...form.categoryIds, child.id];
|
||||
patchForm({
|
||||
categoryIds: next,
|
||||
categoryId: next[0] ?? '',
|
||||
categoryParentId: next.length
|
||||
? parent.id
|
||||
: form.categoryParentId,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
<span>{child.name}</span>
|
||||
</label>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -13,8 +13,11 @@ import {
|
||||
fetchAssocQrcodeImage,
|
||||
} from '../lib/activity-posters';
|
||||
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 };
|
||||
|
||||
@@ -37,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<PartnerAssocSummary | null>(null);
|
||||
@@ -58,11 +63,11 @@ export default function UsersManagePage() {
|
||||
}, []);
|
||||
|
||||
useEffect(() => () => {
|
||||
if (previewUrl) URL.revokeObjectURL(previewUrl);
|
||||
if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
|
||||
}, [previewUrl]);
|
||||
|
||||
useEffect(() => {
|
||||
const posterId = summary?.activityPosterId;
|
||||
const posterId = hidePoster ? null : summary?.activityPosterId;
|
||||
if (!posterId) {
|
||||
setHeroUrl(null);
|
||||
setHeroLoading(false);
|
||||
@@ -87,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<PartnerAssocSummary>('PARTNER_H5', '/partner/assoc');
|
||||
@@ -129,14 +134,19 @@ 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);
|
||||
return;
|
||||
}
|
||||
const blob = posterId
|
||||
? await fetchActivityPosterImage(posterId)
|
||||
: await fetchAssocQrcodeImage();
|
||||
if (isWechatEnv()) {
|
||||
setPreviewUrl(URL.createObjectURL(blob));
|
||||
toastSuccess('请长按图片保存到相册');
|
||||
if (previewUrl?.startsWith('blob:')) URL.revokeObjectURL(previewUrl);
|
||||
setPreviewUrl(await blobToDataUrl(blob));
|
||||
toastSuccess('请长按上方图片保存到相册');
|
||||
return;
|
||||
}
|
||||
downloadBlob(blob, posterId
|
||||
@@ -144,7 +154,11 @@ export default function UsersManagePage() {
|
||||
: `partner-assoc-${summary?.partnerId || 'qr'}.png`);
|
||||
toastSuccess('已开始下载');
|
||||
} catch (e) {
|
||||
if (!posterId && summary?.qrcodeUrl) {
|
||||
if (!posterId && isHttpImageUrl(summary?.qrcodeUrl)) {
|
||||
if (isWechatEnv()) {
|
||||
await previewSaveableImage(summary.qrcodeUrl);
|
||||
return;
|
||||
}
|
||||
setPreviewUrl(summary.qrcodeUrl);
|
||||
toastSuccess('请长按图片保存到相册');
|
||||
return;
|
||||
@@ -180,16 +194,18 @@ export default function UsersManagePage() {
|
||||
<p className="body-md text-muted" style={{ marginBottom: 12 }}>
|
||||
用户扫码后首次锁定，后续购酒计入关联订单
|
||||
</p>
|
||||
{summary?.activityPosterId && (previewUrl || heroUrl) ? (
|
||||
{summary?.activityPosterId && !hidePoster && (previewUrl || heroUrl) ? (
|
||||
<img
|
||||
className="partner-longpress-img"
|
||||
src={previewUrl || heroUrl || ''}
|
||||
alt="活动图"
|
||||
style={{ width: '100%', maxWidth: 360, background: '#f5f5f5' }}
|
||||
/>
|
||||
) : summary?.activityPosterId && heroLoading ? (
|
||||
) : summary?.activityPosterId && !hidePoster && heroLoading ? (
|
||||
<p className="body-md text-muted">正在生成活动图…</p>
|
||||
) : previewUrl || summary?.qrcodeUrl ? (
|
||||
<img
|
||||
className="partner-longpress-img"
|
||||
src={previewUrl || summary?.qrcodeUrl || ''}
|
||||
alt="关联码"
|
||||
style={{ width: 200, height: 200, background: '#fff' }}
|
||||
@@ -197,17 +213,27 @@ export default function UsersManagePage() {
|
||||
) : (
|
||||
<p className="body-md text-muted">{loading ? '加载中…' : '关联码尚未生成'}</p>
|
||||
)}
|
||||
<p className="label-md text-muted" style={{ marginTop: 8 }}>
|
||||
已关联 {summary?.userCount ?? total} 人
|
||||
</p>
|
||||
{(() => {
|
||||
const scanCount = summary?.scanCount ?? 0;
|
||||
const userCount = summary?.userCount ?? total;
|
||||
if (scanCount <= 0 && userCount <= 0) return null;
|
||||
return (
|
||||
<p className="label-md text-muted" style={{ marginTop: 8 }}>
|
||||
已扫码 {scanCount} 人 · 已关联 {userCount} 人
|
||||
</p>
|
||||
);
|
||||
})()}
|
||||
<button type="button" className="partner-btn-primary" style={{ marginTop: 16 }} onClick={() => void downloadMainImage()}>
|
||||
{summary?.activityPosterId ? '下载活动图' : '下载二维码'}
|
||||
{summary?.activityPosterId && !hidePoster ? '下载活动图' : '下载二维码'}
|
||||
</button>
|
||||
{previewUrl && isWechatEnv() && (
|
||||
<p className="label-md text-muted" style={{ marginTop: 8 }}>微信内请长按上方图片保存</p>
|
||||
)}
|
||||
{isWechatEnv() && (previewUrl || summary?.qrcodeUrl) ? (
|
||||
<p className="label-md text-muted" style={{ marginTop: 8 }}>
|
||||
微信内请点「{summary?.activityPosterId && !hidePoster ? '下载活动图' : '下载二维码'}」后长按保存
|
||||
</p>
|
||||
) : null}
|
||||
</section>
|
||||
|
||||
{!hidePoster && (
|
||||
<Link to="/center/activity-posters" className="partner-menu-card" style={{ display: 'block', marginBottom: 20, textDecoration: 'none', color: 'inherit' }}>
|
||||
<div className="partner-menu-item">
|
||||
<div className="partner-menu-item-left">
|
||||
@@ -219,6 +245,7 @@ export default function UsersManagePage() {
|
||||
<span className="material-symbols-outlined text-muted">chevron_right</span>
|
||||
</div>
|
||||
</Link>
|
||||
)}
|
||||
|
||||
<h2 className="headline-md" style={{ marginBottom: 12 }}>已关联用户</h2>
|
||||
<div className="partner-search">
|
||||
@@ -250,32 +277,40 @@ export default function UsersManagePage() {
|
||||
{!loading && items.length === 0 && <div className="empty">暂无关联用户</div>}
|
||||
{items.map((u) => (
|
||||
<div key={u.id} className="partner-store-card" style={{ marginBottom: 12 }}>
|
||||
<div className="partner-store-card-header" style={{ marginBottom: 8 }}>
|
||||
<div>
|
||||
<p className="body-md">{formatUserLabel(u)}</p>
|
||||
<p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
|
||||
<p className="label-md text-muted">注册 {fmtTime(u.createdAt)}</p>
|
||||
</div>
|
||||
<div className="partner-store-card-header" style={{ marginBottom: 4 }}>
|
||||
<p className="body-md">{formatUserLabel(u)}</p>
|
||||
<button
|
||||
type="button"
|
||||
className="label-md text-primary"
|
||||
style={{ background: 'none', border: 0, padding: 0 }}
|
||||
style={{ background: 'none', border: 0, padding: 0, flexShrink: 0 }}
|
||||
onClick={() => navigate(`/users/${u.id}/orders`)}
|
||||
>
|
||||
{u.orderCount} 单
|
||||
</button>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className="label-md text-primary"
|
||||
style={{ background: 'none', border: 0, padding: 0 }}
|
||||
onClick={() => {
|
||||
setEditing(u);
|
||||
setRemarkDraft(u.partnerRemark ?? '');
|
||||
<p className="label-md text-muted">{u.phone || '未绑定手机'}</p>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
gap: 12,
|
||||
marginTop: 4,
|
||||
}}
|
||||
>
|
||||
{u.partnerRemark ? '改备注' : '添加备注'}
|
||||
</button>
|
||||
<p className="label-md text-muted">注册 {fmtTime(u.createdAt)}</p>
|
||||
<button
|
||||
type="button"
|
||||
className="label-md text-primary"
|
||||
style={{ background: 'none', border: 0, padding: 0, flexShrink: 0 }}
|
||||
onClick={() => {
|
||||
setEditing(u);
|
||||
setRemarkDraft(u.partnerRemark ?? '');
|
||||
}}
|
||||
>
|
||||
{u.partnerRemark ? '改备注' : '添加备注'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -4087,3 +4087,11 @@ header:has(> .app-page-title:only-child),
|
||||
width: 200px;
|
||||
height: 200px;
|
||||
}
|
||||
|
||||
/* 微信内长按保存：不要禁用系统菜单 */
|
||||
img.partner-longpress-img {
|
||||
-webkit-touch-callout: default;
|
||||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<meta name="baiduspider" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<title>门店管理中心</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
User-agent: *
|
||||
Disallow: /
|
||||
Allow: /
|
||||
|
||||
@@ -14,6 +14,9 @@ const API_ORIGIN =
|
||||
(isDevMode ? 'http://192.168.1.10:3010' : 'https://api.dukanghaoke.com');
|
||||
|
||||
const requireFromApp = createRequire(path.resolve(__dirname, '../package.json'));
|
||||
const { version: APP_PKG_VERSION } = requireFromApp(path.resolve(__dirname, '../package.json')) as {
|
||||
version: string;
|
||||
};
|
||||
|
||||
/** 解析包目录/文件，避免 pnpm/Vite 把同一 runtime 打成两份 → useDidShow 读到空 reactMeta */
|
||||
function resolvePkgFile(id: string): string {
|
||||
@@ -54,6 +57,7 @@ export default defineConfig(async () => ({
|
||||
},
|
||||
defineConstants: {
|
||||
TARO_APP_API_ORIGIN: JSON.stringify(API_ORIGIN),
|
||||
TARO_APP_VERSION: JSON.stringify(APP_PKG_VERSION),
|
||||
},
|
||||
copy: {
|
||||
patterns: [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@dukang/mini-user",
|
||||
"version": "3.5.16",
|
||||
"version": "4.0.10",
|
||||
"private": true,
|
||||
"description": "杜康好客 · C 端用户微信小程序（Taro）",
|
||||
"scripts": {
|
||||
|
||||
@@ -4,6 +4,7 @@ export default defineAppConfig({
|
||||
'pages/stores/index',
|
||||
'pages/benefit/index',
|
||||
'pages/mine/index',
|
||||
'pages/open/index',
|
||||
],
|
||||
subPackages: [
|
||||
{ root: 'pages/product-detail', pages: ['index'] },
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Button, Text } from '@tarojs/components';
|
||||
import type { ReactNode } from 'react';
|
||||
import { toast } from '../lib/api';
|
||||
import { getBrandAssetsSync, loadBrandAssets } from '../lib/brand-assets';
|
||||
import { formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
|
||||
import { buildCsSharePath, buildCsShareTitle, formatOpenCsError, openWecomCustomerServiceChat } from '../lib/wecom-cs';
|
||||
|
||||
export type ContactCsSessionContext = {
|
||||
orderId?: string;
|
||||
@@ -91,6 +91,9 @@ export default function ContactCsButton({
|
||||
className={className}
|
||||
openType="contact"
|
||||
sessionFrom={buildCsSessionFrom(session)}
|
||||
showMessageCard
|
||||
sendMessageTitle={buildCsShareTitle(session?.orderNo)}
|
||||
sendMessagePath={buildCsSharePath(session?.orderId)}
|
||||
hoverClass="none"
|
||||
>
|
||||
{typeof children === 'string' ? <Text>{children}</Text> : children}
|
||||
|
||||
@@ -53,10 +53,10 @@ export default function OrderQtyControls({ value, unitLabel, onChange }: OrderQt
|
||||
onBlur={commit}
|
||||
onConfirm={commit}
|
||||
/>
|
||||
<Text className="order-qty-unit">{unitLabel}</Text>
|
||||
<View className="order-qty-btn" onClick={() => onChange(Math.min(MAX_QTY, current() + 1))}>
|
||||
<Text>＋</Text>
|
||||
</View>
|
||||
<Text className="order-qty-unit">{unitLabel}</Text>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -6,8 +6,10 @@ import {
|
||||
getCitiesForPicker,
|
||||
getDistricts,
|
||||
getDistrictsForPicker,
|
||||
getDistrictsForShippingPicker,
|
||||
getProvincesForPicker,
|
||||
normalizeRegionSelection,
|
||||
normalizeShippingRegionSelection,
|
||||
toCityLevelRegion,
|
||||
type RegionSelection,
|
||||
} from '../lib/region-data';
|
||||
@@ -18,6 +20,8 @@ type RegionPickerProps = {
|
||||
onClose: () => void;
|
||||
onConfirm: (region: RegionSelection) => void;
|
||||
levels?: 2 | 3;
|
||||
/** filter：门店筛选可「全市」；shipping：收货地址禁止伪区县 */
|
||||
mode?: 'filter' | 'shipping';
|
||||
};
|
||||
|
||||
type PickerLevel = 'province' | 'city' | 'district';
|
||||
@@ -28,8 +32,13 @@ const ALL_TABS: Array<{ key: PickerLevel; label: string }> = [
|
||||
{ key: 'district', label: '区县' },
|
||||
];
|
||||
|
||||
function initialTab(value: RegionSelection, levels: 2 | 3): PickerLevel {
|
||||
const normalized = levels === 2 ? toCityLevelRegion(value) : normalizeRegionSelection(value);
|
||||
function initialTab(value: RegionSelection, levels: 2 | 3, mode: 'filter' | 'shipping'): PickerLevel {
|
||||
const normalized =
|
||||
levels === 2
|
||||
? toCityLevelRegion(value)
|
||||
: mode === 'shipping'
|
||||
? normalizeShippingRegionSelection(value)
|
||||
: normalizeRegionSelection(value);
|
||||
if (levels === 2) {
|
||||
return normalized.province && normalized.province !== REGION_ALL ? 'city' : 'province';
|
||||
}
|
||||
@@ -54,24 +63,35 @@ export default function RegionPicker({
|
||||
onClose,
|
||||
onConfirm,
|
||||
levels = 3,
|
||||
mode = 'filter',
|
||||
}: RegionPickerProps) {
|
||||
const [draft, setDraft] = useState<RegionSelection>(value);
|
||||
const [activeTab, setActiveTab] = useState<PickerLevel>('province');
|
||||
|
||||
const tabs = levels === 2 ? ALL_TABS.slice(0, 2) : ALL_TABS;
|
||||
const shipping = mode === 'shipping';
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
const normalized = levels === 2 ? toCityLevelRegion(value) : normalizeRegionSelection(value);
|
||||
const normalized =
|
||||
levels === 2
|
||||
? toCityLevelRegion(value)
|
||||
: shipping
|
||||
? normalizeShippingRegionSelection(value)
|
||||
: normalizeRegionSelection(value);
|
||||
setDraft(normalized);
|
||||
setActiveTab(initialTab(value, levels));
|
||||
}, [open, value, levels]);
|
||||
setActiveTab(initialTab(value, levels, mode));
|
||||
}, [open, value, levels, mode, shipping]);
|
||||
|
||||
const listItems = useMemo(() => {
|
||||
if (activeTab === 'province') return getProvincesForPicker();
|
||||
if (activeTab === 'city') return getCitiesForPicker(draft.province);
|
||||
if (activeTab === 'city') {
|
||||
if (shipping) return getCities(draft.province);
|
||||
return getCitiesForPicker(draft.province);
|
||||
}
|
||||
if (shipping) return getDistrictsForShippingPicker(draft.province, draft.city);
|
||||
return getDistrictsForPicker(draft.province, draft.city);
|
||||
}, [activeTab, draft.province, draft.city]);
|
||||
}, [activeTab, draft.province, draft.city, shipping]);
|
||||
|
||||
const selectedValue =
|
||||
activeTab === 'province' ? draft.province : activeTab === 'city' ? draft.city : draft.district;
|
||||
@@ -79,12 +99,19 @@ export default function RegionPicker({
|
||||
const canConfirm =
|
||||
levels === 2
|
||||
? Boolean(draft.province && draft.city)
|
||||
: Boolean(draft.province && draft.city && draft.district);
|
||||
: shipping
|
||||
? Boolean(
|
||||
draft.province &&
|
||||
draft.city &&
|
||||
draft.district &&
|
||||
draft.district !== REGION_ALL,
|
||||
)
|
||||
: Boolean(draft.province && draft.city && draft.district);
|
||||
|
||||
if (!open) return null;
|
||||
|
||||
function selectProvince(province: string) {
|
||||
if (province === REGION_ALL) {
|
||||
if (!shipping && province === REGION_ALL) {
|
||||
setDraft({ province: REGION_ALL, city: REGION_ALL, district: REGION_ALL });
|
||||
setActiveTab('city');
|
||||
return;
|
||||
@@ -97,12 +124,16 @@ export default function RegionPicker({
|
||||
return;
|
||||
}
|
||||
const nextDistricts = getDistricts(province, city);
|
||||
setDraft({ province, city, district: nextDistricts[0] ?? '' });
|
||||
setDraft({
|
||||
province,
|
||||
city,
|
||||
district: shipping ? '' : (nextDistricts[0] ?? ''),
|
||||
});
|
||||
setActiveTab('city');
|
||||
}
|
||||
|
||||
function selectCity(city: string) {
|
||||
if (city === REGION_ALL) {
|
||||
if (!shipping && city === REGION_ALL) {
|
||||
setDraft({ ...draft, city: REGION_ALL, district: REGION_ALL });
|
||||
if (levels === 3) setActiveTab('district');
|
||||
return;
|
||||
@@ -112,11 +143,16 @@ export default function RegionPicker({
|
||||
return;
|
||||
}
|
||||
const nextDistricts = getDistricts(draft.province, city);
|
||||
setDraft({ ...draft, city, district: nextDistricts[0] ?? '' });
|
||||
setDraft({
|
||||
...draft,
|
||||
city,
|
||||
district: shipping ? '' : (nextDistricts[0] ?? ''),
|
||||
});
|
||||
setActiveTab('district');
|
||||
}
|
||||
|
||||
function selectDistrict(district: string) {
|
||||
if (shipping && district === REGION_ALL) return;
|
||||
setDraft({ ...draft, district });
|
||||
}
|
||||
|
||||
@@ -134,7 +170,13 @@ export default function RegionPicker({
|
||||
|
||||
function handleConfirm() {
|
||||
if (!canConfirm) return;
|
||||
const next = levels === 2 ? toCityLevelRegion(draft) : normalizeRegionSelection(draft);
|
||||
const next =
|
||||
levels === 2
|
||||
? toCityLevelRegion(draft)
|
||||
: shipping
|
||||
? normalizeShippingRegionSelection(draft)
|
||||
: normalizeRegionSelection(draft);
|
||||
if (shipping && (!next.district || next.district === REGION_ALL)) return;
|
||||
onConfirm(next);
|
||||
onClose();
|
||||
}
|
||||
|
||||
@@ -130,10 +130,12 @@ export function toast(title: string, icon: 'success' | 'error' | 'none' = 'none'
|
||||
const text = title.trim();
|
||||
if (!text) return;
|
||||
if (icon !== 'success' && showFloatingToast(text)) {
|
||||
void Taro.hideToast();
|
||||
void Promise.resolve(Taro.hideToast() as void | Promise<unknown>).catch(() => {});
|
||||
return;
|
||||
}
|
||||
Taro.showToast({ title: text, icon, duration: 1800 });
|
||||
void Promise.resolve(
|
||||
Taro.showToast({ title: text, icon, duration: 1800 }) as void | Promise<unknown>,
|
||||
).catch(() => {});
|
||||
}
|
||||
|
||||
export type SessionPayload = {
|
||||
|
||||
@@ -21,6 +21,14 @@ export type ClientErrorPayload = {
|
||||
extra?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
/** 微信预期失败，不应按 P1 未捕获上报 */
|
||||
const IGNORED_REJECTION =
|
||||
/getLocation:fail|hideToast:fail:toast can't be found|showToast:fail|authorize:fail auth deny/i;
|
||||
|
||||
function shouldIgnoreRejection(message: string): boolean {
|
||||
return IGNORED_REJECTION.test(message);
|
||||
}
|
||||
|
||||
function currentPagePath(): string | undefined {
|
||||
try {
|
||||
const pages = Taro.getCurrentPages();
|
||||
@@ -97,6 +105,7 @@ export function installClientErrorReporting(): void {
|
||||
: typeof reason === 'string'
|
||||
? reason
|
||||
: JSON.stringify(reason);
|
||||
if (shouldIgnoreRejection(message || '')) return;
|
||||
const stack = reason instanceof Error ? reason.stack : undefined;
|
||||
reportClientError({
|
||||
level: 'error',
|
||||
@@ -121,15 +130,17 @@ export function installClientErrorReporting(): void {
|
||||
});
|
||||
window.addEventListener('unhandledrejection', (ev) => {
|
||||
const reason = ev.reason;
|
||||
const message =
|
||||
reason instanceof Error
|
||||
? reason.message
|
||||
: typeof reason === 'string'
|
||||
? reason
|
||||
: 'unhandledrejection';
|
||||
if (shouldIgnoreRejection(message)) return;
|
||||
reportClientError({
|
||||
level: 'error',
|
||||
category: 'unhandled_rejection',
|
||||
message:
|
||||
reason instanceof Error
|
||||
? reason.message
|
||||
: typeof reason === 'string'
|
||||
? reason
|
||||
: 'unhandledrejection',
|
||||
message,
|
||||
stack: reason instanceof Error ? reason.stack : undefined,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -14,13 +14,7 @@ export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | nul
|
||||
if (process.env.TARO_ENV === 'weapp') {
|
||||
try {
|
||||
const Taro = (await import('@tarojs/taro')).default;
|
||||
const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
|
||||
Taro.getLocation({
|
||||
type: 'gcj02',
|
||||
success: resolve,
|
||||
fail: reject,
|
||||
});
|
||||
});
|
||||
const loc = await Taro.getLocation({ type: 'gcj02' });
|
||||
return { latitude: loc.latitude, longitude: loc.longitude };
|
||||
} catch {
|
||||
return null;
|
||||
|
||||
@@ -11,13 +11,7 @@ export type ClientGpsLocation = {
|
||||
|
||||
export async function tryGetClientGpsLocation(): Promise<ClientGpsLocation | null> {
|
||||
try {
|
||||
const loc = await new Promise<{ latitude: number; longitude: number }>((resolve, reject) => {
|
||||
Taro.getLocation({
|
||||
type: 'gcj02',
|
||||
success: resolve,
|
||||
fail: reject,
|
||||
});
|
||||
});
|
||||
const loc = await Taro.getLocation({ type: 'gcj02' });
|
||||
return { latitude: loc.latitude, longitude: loc.longitude };
|
||||
} catch {
|
||||
return null;
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
import Taro from '@tarojs/taro';
|
||||
import { fetchClientConfig } from './pay-wechat';
|
||||
|
||||
/** 与 package.json version 同步，供服务端 minClientVersion 比对 */
|
||||
export const APP_VERSION = '3.5.16';
|
||||
/** 与 package.json version 同步（Taro defineConstants 注入），供 minClientVersion 比对 */
|
||||
export const APP_VERSION =
|
||||
(typeof TARO_APP_VERSION !== 'undefined' && String(TARO_APP_VERSION).trim()) || '4.0.4';
|
||||
|
||||
export const APP_VERSION_LABEL = `v${APP_VERSION}`;
|
||||
export const APP_VERSION_LABEL = `v${APP_VERSION.replace(/^v/i, '')}`;
|
||||
|
||||
function normalizeVersion(v: string): string {
|
||||
return String(v || '').trim().replace(/^v/i, '');
|
||||
}
|
||||
|
||||
function parseSemver(v: string): number[] {
|
||||
return v.split('.').map((n) => parseInt(n, 10) || 0);
|
||||
return normalizeVersion(v).split('.').map((n) => parseInt(n, 10) || 0);
|
||||
}
|
||||
|
||||
export function compareSemver(a: string, b: string): number {
|
||||
@@ -89,7 +94,7 @@ async function enforceMinClientVersion(min: string) {
|
||||
export async function checkClientVersionGate() {
|
||||
try {
|
||||
const config = await fetchClientConfig();
|
||||
const min = config.minClientVersion?.trim();
|
||||
const min = normalizeVersion(config.minClientVersion ?? '');
|
||||
if (min && compareSemver(APP_VERSION, min) < 0) {
|
||||
await enforceMinClientVersion(min);
|
||||
}
|
||||
|
||||
@@ -162,6 +162,11 @@ export async function capturePromoSceneAndTouchScan(): Promise<void> {
|
||||
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<void> {
|
||||
// 无新 scene 时不重复扫码计数
|
||||
}
|
||||
|
||||
async function touchAssoc(input: { scene: string; countScan: boolean }): Promise<void> {
|
||||
try {
|
||||
await request('/user/partner-assoc/touch', {
|
||||
method: 'POST',
|
||||
data: {
|
||||
scene: input.scene,
|
||||
countScan: input.countScan,
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
/* 静默失败，不阻断浏览 */
|
||||
}
|
||||
}
|
||||
|
||||
/** 登录成功后：用已缓存的活动 ID 做归因（不重复加扫码次数） */
|
||||
export async function touchStoredPromoAfterLogin(): Promise<void> {
|
||||
await bindStoredAssocIfLoggedIn();
|
||||
|
||||
@@ -30,6 +30,12 @@ export function getDistrictsForPicker(province: string, city: string): string[]
|
||||
return [REGION_ALL, ...getDistricts(province, city)];
|
||||
}
|
||||
|
||||
/** 收货地址：不含「全市」 */
|
||||
export function getDistrictsForShippingPicker(province: string, city: string): string[] {
|
||||
if (province === REGION_ALL || city === REGION_ALL) return [];
|
||||
return [...getDistricts(province, city)];
|
||||
}
|
||||
|
||||
export function formatRegion(province: string, city: string, district: string): string {
|
||||
if (!province) return '';
|
||||
if (province === REGION_ALL) return REGION_ALL;
|
||||
@@ -96,6 +102,35 @@ export const DEFAULT_REGION: RegionSelection = {
|
||||
district: REGION_ALL,
|
||||
};
|
||||
|
||||
/** 收货地址默认：不预填伪区县，迫使用户选真实区县 */
|
||||
export const DEFAULT_SHIPPING_REGION: RegionSelection = {
|
||||
province: '河南省',
|
||||
city: '郑州市',
|
||||
district: '',
|
||||
};
|
||||
|
||||
/** 收货场景：区县必须在省市区树内且非全市 */
|
||||
export function normalizeShippingRegionSelection(selection: RegionSelection): RegionSelection {
|
||||
const province = PROVINCES.includes(selection.province)
|
||||
? selection.province
|
||||
: DEFAULT_SHIPPING_REGION.province;
|
||||
const cities = getCities(province);
|
||||
const city = cities.includes(selection.city) ? selection.city : (cities[0] ?? DEFAULT_SHIPPING_REGION.city);
|
||||
const districts = getDistricts(province, city);
|
||||
const district =
|
||||
selection.district &&
|
||||
selection.district !== REGION_ALL &&
|
||||
districts.includes(selection.district)
|
||||
? selection.district
|
||||
: '';
|
||||
return { province, city, district };
|
||||
}
|
||||
|
||||
export function isShippingRegionComplete(selection: RegionSelection): boolean {
|
||||
const n = normalizeShippingRegionSelection(selection);
|
||||
return Boolean(n.province && n.city && n.district && n.district !== REGION_ALL);
|
||||
}
|
||||
|
||||
export function regionFromGeo(province: string, city: string, district?: string): RegionSelection {
|
||||
const cityName = city.endsWith('市') ? city : `${city}市`;
|
||||
const provinceInTree = PROVINCES.includes(province) ? province : DEFAULT_REGION.province;
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import {
|
||||
REGION_ALL,
|
||||
isShippingRegionComplete,
|
||||
normalizeShippingRegionSelection,
|
||||
type RegionSelection,
|
||||
} from './region-data';
|
||||
|
||||
export const SHIPPING_DETAIL_MIN_LEN = 8;
|
||||
export const SHIPPING_REGION_REQUIRED_MSG = '请选择具体区县';
|
||||
export const SHIPPING_DETAIL_REQUIRED_MSG = '请填写详细地址';
|
||||
export const SHIPPING_DETAIL_TOO_SHORT_MSG = '请填写更详细的收货地址（含街道门牌）';
|
||||
|
||||
export type ShippingAddressLike = {
|
||||
province?: string | null;
|
||||
city?: string | null;
|
||||
district?: string | null;
|
||||
detail?: string | null;
|
||||
};
|
||||
|
||||
export function isDirtyShippingAddress(addr: ShippingAddressLike): boolean {
|
||||
return !validateClientShippingAddress(addr).ok;
|
||||
}
|
||||
|
||||
export function validateClientShippingAddress(addr: ShippingAddressLike): {
|
||||
ok: boolean;
|
||||
message?: string;
|
||||
} {
|
||||
const province = String(addr.province ?? '').trim();
|
||||
const city = String(addr.city ?? '').trim();
|
||||
const district = String(addr.district ?? '').trim();
|
||||
const detail = String(addr.detail ?? '').trim();
|
||||
|
||||
if (!province || !city) return { ok: false, message: '请选择所在地区' };
|
||||
if (!district || district === REGION_ALL || district === '全部') {
|
||||
return { ok: false, message: SHIPPING_REGION_REQUIRED_MSG };
|
||||
}
|
||||
const regionOk = isShippingRegionComplete({ province, city, district });
|
||||
if (!regionOk) {
|
||||
return { ok: false, message: SHIPPING_REGION_REQUIRED_MSG };
|
||||
}
|
||||
if (!detail) return { ok: false, message: SHIPPING_DETAIL_REQUIRED_MSG };
|
||||
if (detail.length < SHIPPING_DETAIL_MIN_LEN) {
|
||||
return { ok: false, message: SHIPPING_DETAIL_TOO_SHORT_MSG };
|
||||
}
|
||||
return { ok: true };
|
||||
}
|
||||
|
||||
export function shippingDetailCityWideHint(detail: string | null | undefined): string | null {
|
||||
const d = String(detail ?? '').trim();
|
||||
if (!d.includes('全市')) return null;
|
||||
if (/路|街|巷|号|大厦|广场|小区|村|镇|乡/.test(d)) return null;
|
||||
return '详细地址含「全市」，建议改为具体街道门牌，以免配送拒单';
|
||||
}
|
||||
|
||||
export function toShippingRegion(addr: ShippingAddressLike): RegionSelection {
|
||||
return normalizeShippingRegionSelection({
|
||||
province: String(addr.province ?? ''),
|
||||
city: String(addr.city ?? ''),
|
||||
district: String(addr.district ?? ''),
|
||||
});
|
||||
}
|
||||
@@ -22,6 +22,7 @@ export function storeCategoryTags(
|
||||
tags?: unknown;
|
||||
categoryId?: string | null;
|
||||
category?: StoreCategoryLike | null;
|
||||
categories?: StoreCategoryLike[] | null;
|
||||
},
|
||||
tree: StoreCategoryTreeNode[] = [],
|
||||
): string[] {
|
||||
@@ -30,24 +31,125 @@ export function storeCategoryTags(
|
||||
: [];
|
||||
if (fromJson.length) return fromJson;
|
||||
|
||||
const names: string[] = [];
|
||||
const childName = String(store.category?.name || '').trim();
|
||||
const parentName = String(store.category?.parent?.name || '').trim();
|
||||
if (parentName) names.push(parentName);
|
||||
if (childName && childName !== parentName) names.push(childName);
|
||||
const multi = Array.isArray(store.categories) ? store.categories : [];
|
||||
if (multi.length) {
|
||||
return groupCategoryTags(multi, tree);
|
||||
}
|
||||
|
||||
const storeCatId = String(store.categoryId || store.category?.id || '');
|
||||
const storeParentId = String(store.category?.parentId || '');
|
||||
for (const root of tree) {
|
||||
if (root.id === storeParentId || root.id === storeCatId) {
|
||||
if (root.name && !names.includes(root.name)) names.unshift(root.name);
|
||||
}
|
||||
for (const child of root.children ?? []) {
|
||||
if (child.id === storeCatId) {
|
||||
if (root.name && !names.includes(root.name)) names.unshift(root.name);
|
||||
if (child.name && !names.includes(child.name)) names.push(child.name);
|
||||
if (store.category || store.categoryId) {
|
||||
const grouped = groupCategoryTags(
|
||||
store.category ? [store.category] : [],
|
||||
tree,
|
||||
store.categoryId,
|
||||
);
|
||||
if (grouped.length) return grouped;
|
||||
}
|
||||
|
||||
const storeCatId = String(store.categoryId || '');
|
||||
if (storeCatId) {
|
||||
for (const root of tree) {
|
||||
for (const child of root.children ?? []) {
|
||||
if (child.id === storeCatId) {
|
||||
return [`${root.name}|${child.name}`];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return names;
|
||||
return [];
|
||||
}
|
||||
|
||||
/** 按大类分组：餐饮|火锅·江浙菜、娱乐|KTV */
|
||||
function groupCategoryTags(
|
||||
categories: StoreCategoryLike[],
|
||||
tree: StoreCategoryTreeNode[] = [],
|
||||
fallbackCategoryId?: string | null,
|
||||
): string[] {
|
||||
if (!categories.length && fallbackCategoryId) {
|
||||
return groupCategoryTags([{ id: String(fallbackCategoryId) }], tree);
|
||||
}
|
||||
|
||||
const groups = new Map<string, { parentName: string; children: string[] }>();
|
||||
const order: string[] = [];
|
||||
|
||||
for (const cat of categories) {
|
||||
const resolved = resolveCategoryParts(cat, tree);
|
||||
if (!resolved) continue;
|
||||
const { parentKey, parentName, childName } = resolved;
|
||||
if (!groups.has(parentKey)) {
|
||||
groups.set(parentKey, { parentName, children: [] });
|
||||
order.push(parentKey);
|
||||
}
|
||||
const group = groups.get(parentKey)!;
|
||||
if (childName && childName !== parentName && !group.children.includes(childName)) {
|
||||
group.children.push(childName);
|
||||
}
|
||||
}
|
||||
|
||||
return order
|
||||
.map((key) => {
|
||||
const group = groups.get(key)!;
|
||||
if (group.parentName && group.children.length) {
|
||||
return `${group.parentName}|${group.children.join('·')}`;
|
||||
}
|
||||
if (group.children.length) return group.children.join('·');
|
||||
return group.parentName;
|
||||
})
|
||||
.filter(Boolean);
|
||||
}
|
||||
|
||||
function resolveCategoryParts(
|
||||
cat: StoreCategoryLike,
|
||||
tree: StoreCategoryTreeNode[] = [],
|
||||
): { parentKey: string; parentName: string; childName: string } | null {
|
||||
const childName = String(cat.name || '').trim();
|
||||
let parentName = String(cat.parent?.name || '').trim();
|
||||
const catId = String(cat.id || '');
|
||||
const parentId = String(cat.parentId || '');
|
||||
|
||||
if (!parentName && (parentId || catId)) {
|
||||
for (const root of tree) {
|
||||
if (parentId && root.id === parentId) {
|
||||
parentName = root.name;
|
||||
break;
|
||||
}
|
||||
for (const child of root.children ?? []) {
|
||||
if (catId && child.id === catId) {
|
||||
parentName = root.name;
|
||||
if (!childName) return { parentKey: root.id, parentName, childName: child.name };
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!childName && !parentName) return null;
|
||||
|
||||
const parentKey = parentId || parentName || catId;
|
||||
if (!parentName && catId) {
|
||||
for (const root of tree) {
|
||||
for (const child of root.children ?? []) {
|
||||
if (child.id === catId) {
|
||||
return { parentKey: root.id, parentName: root.name, childName: child.name };
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
parentKey,
|
||||
parentName: parentName || childName,
|
||||
childName: childName || parentName,
|
||||
};
|
||||
}
|
||||
|
||||
export function storeLeafCategoryIds(store: {
|
||||
categoryId?: string | null;
|
||||
category?: StoreCategoryLike | null;
|
||||
categories?: StoreCategoryLike[] | null;
|
||||
}): string[] {
|
||||
if (Array.isArray(store.categories) && store.categories.length) {
|
||||
return store.categories.map((c) => String(c.id || '')).filter(Boolean);
|
||||
}
|
||||
const id = String(store.categoryId || store.category?.id || '');
|
||||
return id ? [id] : [];
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ type StoresSession = {
|
||||
cache: StoresListCache | null;
|
||||
};
|
||||
|
||||
const STORAGE_KEY = 'dukang_stores_session_v2';
|
||||
const STORAGE_KEY = 'dukang_stores_session_v3';
|
||||
|
||||
let memory: StoresSession | null = null;
|
||||
|
||||
|
||||
@@ -59,6 +59,23 @@ function clearLocationDenied() {
|
||||
}
|
||||
}
|
||||
|
||||
function wxErrorMessage(err: unknown): string {
|
||||
if (!err) return '';
|
||||
if (typeof err === 'string') return err;
|
||||
if (err instanceof Error) return err.message;
|
||||
if (typeof err === 'object') {
|
||||
const o = err as { errMsg?: unknown; message?: unknown };
|
||||
if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
|
||||
if (typeof o.message === 'string' && o.message) return o.message;
|
||||
try {
|
||||
return JSON.stringify(err);
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
return String(err);
|
||||
}
|
||||
|
||||
function isDenyMessage(errMsg?: string): boolean {
|
||||
return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
|
||||
errMsg || '',
|
||||
@@ -179,14 +196,13 @@ async function promptLocationAuthOnce() {
|
||||
}).catch(() => {});
|
||||
}
|
||||
|
||||
function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
|
||||
return new Promise((resolve, reject) => {
|
||||
Taro.getLocation({
|
||||
type: 'gcj02',
|
||||
success: resolve,
|
||||
fail: reject,
|
||||
});
|
||||
});
|
||||
async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
|
||||
const setting = await Taro.getSetting().catch(() => null);
|
||||
if (setting?.authSetting?.['scope.userLocation'] === false) {
|
||||
throw new Error('getLocation:fail auth deny');
|
||||
}
|
||||
// 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
|
||||
return Taro.getLocation({ type: 'gcj02' });
|
||||
}
|
||||
|
||||
async function resolveViaH5Jssdk(): Promise<ResolvedUserCity | null> {
|
||||
@@ -263,7 +279,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
|
||||
return resolved;
|
||||
}
|
||||
} catch (err) {
|
||||
const errMsg = err instanceof Error ? err.message : String(err);
|
||||
const errMsg = wxErrorMessage(err);
|
||||
const denied = isDenyMessage(errMsg);
|
||||
if (denied && !isLocationDenied()) {
|
||||
await promptLocationAuthOnce();
|
||||
|
||||
@@ -57,6 +57,23 @@ function clearLocationDenied() {
|
||||
}
|
||||
}
|
||||
|
||||
function wxErrorMessage(err: unknown): string {
|
||||
if (!err) return '';
|
||||
if (typeof err === 'string') return err;
|
||||
if (err instanceof Error) return err.message;
|
||||
if (typeof err === 'object') {
|
||||
const o = err as { errMsg?: unknown; message?: unknown };
|
||||
if (typeof o.errMsg === 'string' && o.errMsg) return o.errMsg;
|
||||
if (typeof o.message === 'string' && o.message) return o.message;
|
||||
try {
|
||||
return JSON.stringify(err);
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
return String(err);
|
||||
}
|
||||
|
||||
function isDenyMessage(errMsg?: string): boolean {
|
||||
return /auth deny|authorize|permission|denied|拒绝|用户拒绝|getLocation:fail/i.test(
|
||||
errMsg || '',
|
||||
@@ -175,14 +192,13 @@ async function promptLocationAuthOnce() {
|
||||
}).catch(() => {});
|
||||
}
|
||||
|
||||
function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
|
||||
return new Promise((resolve, reject) => {
|
||||
Taro.getLocation({
|
||||
type: 'gcj02',
|
||||
success: resolve,
|
||||
fail: reject,
|
||||
});
|
||||
});
|
||||
async function getMiniLocation(): Promise<Taro.getLocation.SuccessCallbackResult> {
|
||||
const setting = await Taro.getSetting().catch(() => null);
|
||||
if (setting?.authSetting?.['scope.userLocation'] === false) {
|
||||
throw new Error('getLocation:fail auth deny');
|
||||
}
|
||||
// 只用返回的 Promise，避免 callback + Promise 双重 reject 变成未捕获
|
||||
return Taro.getLocation({ type: 'gcj02' });
|
||||
}
|
||||
|
||||
export async function resolveUserCity(force = false): Promise<ResolvedUserCity> {
|
||||
@@ -211,7 +227,7 @@ export async function resolveUserCity(force = false): Promise<ResolvedUserCity>
|
||||
return resolved;
|
||||
}
|
||||
} catch (err) {
|
||||
const errMsg = err instanceof Error ? err.message : String(err);
|
||||
const errMsg = wxErrorMessage(err);
|
||||
const denied = isDenyMessage(errMsg);
|
||||
if (denied && !isLocationDenied()) {
|
||||
await promptLocationAuthOnce();
|
||||
|
||||
@@ -4,6 +4,17 @@ export type WecomCsSessionContext = {
|
||||
from?: string;
|
||||
};
|
||||
|
||||
/** 客服消息卡片必须落主包页；分包（订单详情）作启动页会白屏 */
|
||||
export function buildCsSharePath(orderId?: string): string {
|
||||
const id = (orderId || '').trim();
|
||||
return id ? `pages/open/index?id=${encodeURIComponent(id)}` : 'pages/home/index';
|
||||
}
|
||||
|
||||
export function buildCsShareTitle(orderNo?: string): string {
|
||||
const no = (orderNo || '').trim();
|
||||
return no ? `订单 ${no}` : '杜康好客';
|
||||
}
|
||||
|
||||
type OpenCsChatOption = {
|
||||
extInfo: { url: string };
|
||||
corpId: string;
|
||||
@@ -97,16 +108,10 @@ export async function openWecomCustomerServiceChat(params: {
|
||||
const option: OpenCsChatOption = {
|
||||
extInfo: { url },
|
||||
corpId,
|
||||
showMessageCard: true,
|
||||
sendMessageTitle: buildCsShareTitle(params.session?.orderNo),
|
||||
sendMessagePath: buildCsSharePath(params.session?.orderId),
|
||||
};
|
||||
if (params.session?.orderNo || params.session?.orderId) {
|
||||
option.showMessageCard = true;
|
||||
option.sendMessageTitle = params.session.orderNo
|
||||
? `订单 ${params.session.orderNo}`
|
||||
: '订单咨询';
|
||||
if (params.session.orderId) {
|
||||
option.sendMessagePath = `pages/order-detail/index?id=${params.session.orderId}`;
|
||||
}
|
||||
}
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
wxApi({
|
||||
|
||||
@@ -7,12 +7,16 @@ import SubPageHeader from '../../components/SubPageHeader';
|
||||
import RegionPicker from '../../components/RegionPicker';
|
||||
import { buildAddressListUrl, readCheckoutContext } from '../../lib/checkout-nav';
|
||||
import {
|
||||
DEFAULT_REGION,
|
||||
DEFAULT_SHIPPING_REGION,
|
||||
REGION_ALL,
|
||||
formatRegion,
|
||||
type RegionSelection,
|
||||
} from '../../lib/region-data';
|
||||
import { normalizePhoneInput, validateMobilePhone } from '../../lib/phone';
|
||||
import {
|
||||
shippingDetailCityWideHint,
|
||||
validateClientShippingAddress,
|
||||
} from '../../lib/shipping-address';
|
||||
import { getStoredUserPhone, resolveDefaultUserPhone } from '../../lib/user-phone';
|
||||
import { resolveUserCity } from '../../lib/user-location';
|
||||
import { request, toast, type UserProfile } from '../../lib/api';
|
||||
@@ -36,12 +40,13 @@ export default function AddressEditPage() {
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [locating, setLocating] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
const [hint, setHint] = useState('');
|
||||
const [form, setForm] = useState<AddressForm>(() => ({
|
||||
receiverName: '',
|
||||
phone: id ? '' : getStoredUserPhone(),
|
||||
province: DEFAULT_REGION.province,
|
||||
city: DEFAULT_REGION.city,
|
||||
district: DEFAULT_REGION.district,
|
||||
province: DEFAULT_SHIPPING_REGION.province,
|
||||
city: DEFAULT_SHIPPING_REGION.city,
|
||||
district: DEFAULT_SHIPPING_REGION.district,
|
||||
detail: '',
|
||||
isDefault: true,
|
||||
}));
|
||||
@@ -69,7 +74,7 @@ export default function AddressEditPage() {
|
||||
? resolved.region.district
|
||||
: resolved.district && resolved.district !== REGION_ALL
|
||||
? resolved.district
|
||||
: DEFAULT_REGION.district;
|
||||
: '';
|
||||
setForm((prev) => ({
|
||||
...prev,
|
||||
province: resolved.region.province || prev.province,
|
||||
@@ -91,12 +96,13 @@ export default function AddressEditPage() {
|
||||
request<Array<Record<string, unknown>>>('/user/addresses').then((list) => {
|
||||
const found = list.find((a) => String(a.id) === id);
|
||||
if (found) {
|
||||
const district = String(found.district ?? '');
|
||||
setForm({
|
||||
receiverName: String(found.receiverName ?? ''),
|
||||
phone: String(found.phone ?? ''),
|
||||
province: String(found.province ?? DEFAULT_REGION.province),
|
||||
city: String(found.city ?? DEFAULT_REGION.city),
|
||||
district: String(found.district ?? DEFAULT_REGION.district),
|
||||
province: String(found.province ?? DEFAULT_SHIPPING_REGION.province),
|
||||
city: String(found.city ?? DEFAULT_SHIPPING_REGION.city),
|
||||
district: district === REGION_ALL ? '' : district,
|
||||
detail: String(found.detail ?? ''),
|
||||
isDefault: found.isDefault === 1 || found.isDefault === true,
|
||||
});
|
||||
@@ -104,14 +110,21 @@ export default function AddressEditPage() {
|
||||
}).catch(() => {});
|
||||
}, [id]);
|
||||
|
||||
const regionText = formatRegion(form.province, form.city, form.district);
|
||||
useEffect(() => {
|
||||
setHint(shippingDetailCityWideHint(form.detail) ?? '');
|
||||
}, [form.detail]);
|
||||
|
||||
const regionText =
|
||||
form.province && form.city && form.district
|
||||
? formatRegion(form.province, form.city, form.district)
|
||||
: '';
|
||||
|
||||
function validateForm(): string | null {
|
||||
if (!form.receiverName.trim()) return '请输入收货人姓名';
|
||||
const phoneCheck = validateMobilePhone(form.phone);
|
||||
if (!phoneCheck.ok) return phoneCheck.message ?? '请输入正确的手机号码';
|
||||
if (!form.province || !form.city || !form.district) return '请选择所在地区';
|
||||
if (!form.detail.trim()) return '请输入详细地址';
|
||||
const shipping = validateClientShippingAddress(form);
|
||||
if (!shipping.ok) return shipping.message ?? '请完善收货地址';
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -201,7 +214,7 @@ export default function AddressEditPage() {
|
||||
<Text>
|
||||
{locating && !isEdit
|
||||
? '定位中…'
|
||||
: regionText || '请选择省市区'}
|
||||
: regionText || '请选择省 / 市 / 区县'}
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
@@ -228,6 +241,7 @@ export default function AddressEditPage() {
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
{hint ? <Text className="address-form-hint">{hint}</Text> : null}
|
||||
<View className="address-form-row">
|
||||
<Text>设为默认地址</Text>
|
||||
<Switch
|
||||
@@ -248,6 +262,7 @@ export default function AddressEditPage() {
|
||||
onClose={() => setPickerOpen(false)}
|
||||
onConfirm={onRegionConfirm}
|
||||
levels={3}
|
||||
mode="shipping"
|
||||
/>
|
||||
</PageShell>
|
||||
);
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
buildOrderConfirmUrl,
|
||||
readCheckoutContext,
|
||||
} from '../../lib/checkout-nav';
|
||||
import { isDirtyShippingAddress } from '../../lib/shipping-address';
|
||||
import { request, toast } from '../../lib/api';
|
||||
|
||||
type Address = {
|
||||
@@ -51,6 +52,11 @@ export default function AddressesPage() {
|
||||
|
||||
function selectAddress(addr: Address) {
|
||||
if (!selectMode) return;
|
||||
if (isDirtyShippingAddress(addr)) {
|
||||
toast('该地址缺少具体区县，请先完善');
|
||||
Taro.navigateTo({ url: buildAddressEditUrl(addr.id, checkoutCtx) }).catch(() => {});
|
||||
return;
|
||||
}
|
||||
Taro.redirectTo({
|
||||
url: buildOrderConfirmUrl({
|
||||
productId: checkoutCtx.productId,
|
||||
@@ -76,6 +82,12 @@ export default function AddressesPage() {
|
||||
}
|
||||
}
|
||||
|
||||
const sorted = [...list].sort((a, b) => {
|
||||
const da = isDirtyShippingAddress(a) ? 0 : 1;
|
||||
const db = isDirtyShippingAddress(b) ? 0 : 1;
|
||||
return da - db;
|
||||
});
|
||||
|
||||
return (
|
||||
<PageShell variant="sub" className="address-page" hasFixedFooter>
|
||||
<SubPageHeader title={selectMode ? '选择收货地址' : '地址管理'} />
|
||||
@@ -84,46 +96,55 @@ export default function AddressesPage() {
|
||||
{!loading && list.length === 0 ? (
|
||||
<View className="u-empty">暂无收货地址</View>
|
||||
) : null}
|
||||
{list.map((a) => (
|
||||
<View
|
||||
key={a.id}
|
||||
className="address-item"
|
||||
onClick={() => selectAddress(a)}
|
||||
>
|
||||
<View className="address-item-head">
|
||||
<Text className="address-item-name">{a.receiverName}</Text>
|
||||
<Text className="address-item-phone">{a.phone}</Text>
|
||||
{a.isDefault === 1 || a.isDefault === true ? (
|
||||
<Text className="address-default-tag">默认</Text>
|
||||
{sorted.map((a) => {
|
||||
const dirty = isDirtyShippingAddress(a);
|
||||
return (
|
||||
<View
|
||||
key={a.id}
|
||||
className={`address-item${dirty ? ' address-item--dirty' : ''}`}
|
||||
onClick={() => selectAddress(a)}
|
||||
>
|
||||
<View className="address-item-head">
|
||||
<Text className="address-item-name">{a.receiverName}</Text>
|
||||
<Text className="address-item-phone">{a.phone}</Text>
|
||||
{dirty ? <Text className="address-need-fix-tag">需完善</Text> : null}
|
||||
{a.isDefault === 1 || a.isDefault === true ? (
|
||||
<Text className="address-default-tag">默认</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<Text className="address-item-detail">{formatAddress(a)}</Text>
|
||||
{dirty ? (
|
||||
<Text className="address-item-warn">缺少具体区县，同城配送可能失败，请编辑完善</Text>
|
||||
) : null}
|
||||
{!selectMode || dirty ? (
|
||||
<View className="address-item-actions">
|
||||
<Text
|
||||
className="address-action"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
Taro.navigateTo({ url: buildAddressEditUrl(a.id, checkoutCtx) }).catch((err) => {
|
||||
toast(err instanceof Error ? err.message : '无法打开编辑页');
|
||||
});
|
||||
}}
|
||||
>
|
||||
{dirty ? '去完善' : '编辑'}
|
||||
</Text>
|
||||
{!selectMode ? (
|
||||
<Text
|
||||
className="address-action"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
void removeAddress(a.id);
|
||||
}}
|
||||
>
|
||||
删除
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
<Text className="address-item-detail">{formatAddress(a)}</Text>
|
||||
{!selectMode ? (
|
||||
<View className="address-item-actions">
|
||||
<Text
|
||||
className="address-action"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
Taro.navigateTo({ url: buildAddressEditUrl(a.id, checkoutCtx) }).catch((err) => {
|
||||
toast(err instanceof Error ? err.message : '无法打开编辑页');
|
||||
});
|
||||
}}
|
||||
>
|
||||
编辑
|
||||
</Text>
|
||||
<Text
|
||||
className="address-action"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
void removeAddress(a.id);
|
||||
}}
|
||||
>
|
||||
删除
|
||||
</Text>
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
<View
|
||||
className="address-fab"
|
||||
|
||||
@@ -196,6 +196,17 @@ export default function HomePage() {
|
||||
Taro.navigateTo({ url: `/pages/product-detail/index?id=${id}` });
|
||||
}
|
||||
|
||||
async function goBuyOnline(productId: string) {
|
||||
const returnPath = `/pages/order-confirm/index?productId=${productId}&qty=2`;
|
||||
if (!isLoggedIn()) {
|
||||
goLogin(returnPath);
|
||||
return;
|
||||
}
|
||||
const ready = await ensurePayReady(returnPath);
|
||||
if (!ready) return;
|
||||
Taro.navigateTo({ url: returnPath });
|
||||
}
|
||||
|
||||
async function goOnSitePickup(productId: string) {
|
||||
const returnPath = `/pages/order-confirm-pickup/index?productId=${productId}&qty=2`;
|
||||
if (!isLoggedIn()) {
|
||||
@@ -348,7 +359,7 @@ export default function HomePage() {
|
||||
className="home-buy-btn"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation?.();
|
||||
openProductDetail(p.id);
|
||||
void goBuyOnline(p.id);
|
||||
}}
|
||||
>
|
||||
立即购买
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
export default definePageConfig({
|
||||
navigationBarTitleText: '杜康好客',
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import { View, Text } from '@tarojs/components';
|
||||
import Taro, { useLoad } from '@tarojs/taro';
|
||||
import PageShell from '../../components/PageShell';
|
||||
import { goLogin } from '../../lib/auth-nav';
|
||||
import { isLoggedIn } from '../../lib/api';
|
||||
|
||||
function goHome() {
|
||||
Taro.switchTab({ url: '/pages/home/index' }).catch(() => {
|
||||
Taro.reLaunch({ url: '/pages/home/index' });
|
||||
});
|
||||
}
|
||||
|
||||
function openOrder(orderId: string) {
|
||||
const detail = `/pages/order-detail/index?id=${encodeURIComponent(orderId)}`;
|
||||
if (!isLoggedIn()) {
|
||||
goLogin(detail);
|
||||
return;
|
||||
}
|
||||
Taro.redirectTo({ url: detail }).catch(() => {
|
||||
Taro.reLaunch({ url: detail });
|
||||
});
|
||||
}
|
||||
|
||||
/** 主包落地：客服卡片 / 外链打开分包页（订单详情）前先落到这里，避免白屏 */
|
||||
export default function OpenPage() {
|
||||
useLoad((query?: Record<string, string | undefined>) => {
|
||||
const orderId = String(query?.id || query?.orderId || '').trim();
|
||||
if (!orderId) {
|
||||
goHome();
|
||||
return;
|
||||
}
|
||||
openOrder(orderId);
|
||||
});
|
||||
|
||||
return (
|
||||
<PageShell variant="plain">
|
||||
<View className="u-empty">
|
||||
<Text>正在打开…</Text>
|
||||
</View>
|
||||
</PageShell>
|
||||
);
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import DeliveryHintHtml from '../../components/DeliveryHintHtml';
|
||||
import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
|
||||
import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
|
||||
import { getProductMainImage } from '../../lib/product-images';
|
||||
import { isDirtyShippingAddress } from '../../lib/shipping-address';
|
||||
import BenefitFigure from '../../components/BenefitFigure';
|
||||
import OrderQtyControls from '../../components/OrderQtyControls';
|
||||
|
||||
@@ -177,7 +178,12 @@ export default function OrderConfirmPage() {
|
||||
const isCross =
|
||||
forceCross || preview?.deliveryType === 'CROSS_CITY' || localCross;
|
||||
const crossBlocked = isCross && !allowCross;
|
||||
const addressOk = preview ? preview.addressOk !== false && !crossBlocked : !crossBlocked;
|
||||
const dirtyAddress = !!selectedAddress && isDirtyShippingAddress(selectedAddress);
|
||||
const addressOk = dirtyAddress
|
||||
? false
|
||||
: preview
|
||||
? preview.addressOk !== false && !crossBlocked
|
||||
: !crossBlocked;
|
||||
const unitLabel = preview?.saleUnit === 'BOX' ? '箱' : '瓶';
|
||||
const minQty =
|
||||
preview?.minQty ??
|
||||
@@ -186,9 +192,11 @@ export default function OrderConfirmPage() {
|
||||
const canSubmit =
|
||||
!!addressId && !!preview && quantityOk && addressOk && !loading && !previewLoading;
|
||||
|
||||
const addressHint = !addressOk
|
||||
? preview?.addressMessage || CROSS_CITY_BLOCK_MSG
|
||||
: '';
|
||||
const addressHint = dirtyAddress
|
||||
? '请完善收货地址（需选择具体区县）'
|
||||
: !addressOk
|
||||
? preview?.addressMessage || CROSS_CITY_BLOCK_MSG
|
||||
: '';
|
||||
|
||||
function updateQuantity(next: number) {
|
||||
if (next < minQty) {
|
||||
|
||||
@@ -116,6 +116,7 @@ export default function OrderDetailPage() {
|
||||
const orderId = router.params.id ?? '';
|
||||
usePageView('order_detail_view', orderId ? { orderId } : undefined);
|
||||
const [order, setOrder] = useState<OrderDetail | null>(null);
|
||||
const [loadError, setLoadError] = useState('');
|
||||
const [confirming, setConfirming] = useState(false);
|
||||
const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
|
||||
const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
|
||||
@@ -147,14 +148,18 @@ export default function OrderDetailPage() {
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!orderId) return;
|
||||
if (!orderId) {
|
||||
setLoadError('订单信息缺失');
|
||||
return;
|
||||
}
|
||||
request<OrderDetail>(`/trade/orders/${orderId}`)
|
||||
.then((data) => {
|
||||
setOrder(data);
|
||||
setLoadError('');
|
||||
void loadOrderTrack(data.delivery, data.status);
|
||||
applyLocalDeliveryHint(data, setLocalHintHtml);
|
||||
})
|
||||
.catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
|
||||
.catch((e) => setLoadError(e instanceof Error ? e.message : '加载失败'));
|
||||
}, [orderId]);
|
||||
|
||||
useDidShow(() => {
|
||||
@@ -293,7 +298,9 @@ export default function OrderDetailPage() {
|
||||
/>
|
||||
<View className="sub-page-body">
|
||||
{!order ? (
|
||||
<View className="u-empty">加载中…</View>
|
||||
<View className="u-empty" onClick={loadError ? () => Taro.switchTab({ url: '/pages/home/index' }) : undefined}>
|
||||
<Text>{loadError || '加载中…'}</Text>
|
||||
</View>
|
||||
) : (
|
||||
<>
|
||||
<View className="order-card">
|
||||
|
||||
@@ -79,6 +79,12 @@ type Store = {
|
||||
parentId?: string | null;
|
||||
parent?: { name?: string } | null;
|
||||
} | null;
|
||||
categories?: {
|
||||
id?: string;
|
||||
name?: string;
|
||||
parentId?: string | null;
|
||||
parent?: { name?: string } | null;
|
||||
}[] | null;
|
||||
};
|
||||
|
||||
type RecentRedeem = {
|
||||
@@ -406,12 +412,15 @@ export default function StoreDetailPage() {
|
||||
|
||||
<View className="store-detail-title-row">
|
||||
<Text className="store-detail-name">{store.name}</Text>
|
||||
{storeCategoryTags(store, categoryTree).map((tag) => (
|
||||
<Text key={tag} className="store-detail-tag">
|
||||
{tag}
|
||||
</Text>
|
||||
))}
|
||||
</View>
|
||||
{(() => {
|
||||
const categoryLabels = storeCategoryTags(store, categoryTree);
|
||||
return categoryLabels.length ? (
|
||||
<View className="store-detail-tags-row">
|
||||
<Text className="store-detail-category-line">{categoryLabels.join('、')}</Text>
|
||||
</View>
|
||||
) : null;
|
||||
})()}
|
||||
<View className="store-detail-rating-row">
|
||||
<View className="store-detail-stars">
|
||||
{[1, 2, 3, 4, 5].map((n) => (
|
||||
|
||||
@@ -42,7 +42,7 @@ import {
|
||||
toWeappShareTimeline,
|
||||
} from '../../lib/wechat-share';
|
||||
import BenefitSloganBar from '../../components/BenefitSloganBar';
|
||||
import { storeCategoryTags, storeStarCount } from '../../lib/store-display';
|
||||
import { storeCategoryTags, storeLeafCategoryIds, storeStarCount } from '../../lib/store-display';
|
||||
import openBadgeImg from '../../assets/icons/store-open-badge.png';
|
||||
|
||||
type Store = {
|
||||
@@ -66,6 +66,12 @@ type Store = {
|
||||
parentId?: string | null;
|
||||
parent?: { name?: string } | null;
|
||||
} | null;
|
||||
categories?: {
|
||||
id?: string;
|
||||
name?: string;
|
||||
parentId?: string | null;
|
||||
parent?: { name?: string } | null;
|
||||
}[] | null;
|
||||
tags?: unknown;
|
||||
rating?: number | string | null;
|
||||
latitude?: number | string | null;
|
||||
@@ -288,14 +294,21 @@ export default function StoresPage() {
|
||||
|
||||
function matchesCategory(store: Store): boolean {
|
||||
if (!category.parentId) return true;
|
||||
const storeCatId = String(store.categoryId || store.category?.id || '');
|
||||
const storeParentId = String(store.category?.parentId || '');
|
||||
if (category.childId) {
|
||||
return storeCatId === category.childId;
|
||||
const leafIds = storeLeafCategoryIds(store);
|
||||
const parentIds = new Set<string>();
|
||||
if (Array.isArray(store.categories)) {
|
||||
for (const cat of store.categories) {
|
||||
if (cat.parentId) parentIds.add(String(cat.parentId));
|
||||
}
|
||||
}
|
||||
if (storeParentId && storeParentId === category.parentId) return true;
|
||||
const legacyParent = String(store.category?.parentId || '');
|
||||
if (legacyParent) parentIds.add(legacyParent);
|
||||
if (category.childId) {
|
||||
return leafIds.includes(category.childId);
|
||||
}
|
||||
if ([...parentIds].some((id) => id === category.parentId)) return true;
|
||||
const siblings = childIdsByParent.get(category.parentId) ?? [];
|
||||
return siblings.includes(storeCatId);
|
||||
return leafIds.some((id) => siblings.includes(id));
|
||||
}
|
||||
|
||||
const filtered = useMemo(() => {
|
||||
@@ -461,14 +474,10 @@ export default function StoresPage() {
|
||||
<Text className="store-card-name">{s.name}</Text>
|
||||
</View>
|
||||
{(() => {
|
||||
const tags = storeCategoryTags(s, categoryTree);
|
||||
return tags.length ? (
|
||||
<View className="store-card-tags">
|
||||
{tags.map((tag) => (
|
||||
<Text key={tag} className="store-card-tag">
|
||||
{tag}
|
||||
</Text>
|
||||
))}
|
||||
const categoryLabels = storeCategoryTags(s, categoryTree);
|
||||
return categoryLabels.length ? (
|
||||
<View className="store-card-category-wrap">
|
||||
<Text className="store-card-category-text">{categoryLabels.join('、')}</Text>
|
||||
</View>
|
||||
) : null;
|
||||
})()}
|
||||
|
||||
@@ -38,6 +38,34 @@
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.address-need-fix-tag {
|
||||
margin-left: 8px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
background: rgba(200, 120, 20, 0.12);
|
||||
color: #b36b00;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.address-item--dirty {
|
||||
border: 1px solid rgba(200, 120, 20, 0.35);
|
||||
}
|
||||
|
||||
.address-item-warn {
|
||||
display: block;
|
||||
margin-top: 6px;
|
||||
font-size: 12px;
|
||||
color: #b36b00;
|
||||
}
|
||||
|
||||
.address-form-hint {
|
||||
display: block;
|
||||
margin: 0 var(--space-page) 8px;
|
||||
font-size: 12px;
|
||||
color: #b36b00;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.address-item-detail {
|
||||
display: block;
|
||||
font-size: 13px;
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
}
|
||||
|
||||
.order-qty-unit {
|
||||
margin-right: 8px;
|
||||
margin-left: 8px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: var(--color-on-surface);
|
||||
|
||||
@@ -100,6 +100,12 @@
|
||||
}
|
||||
|
||||
.store-detail-title-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.store-detail-tags-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
@@ -107,6 +113,20 @@
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.store-detail-category-line {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
padding: 2px 8px;
|
||||
border-radius: 6px;
|
||||
background: rgba(166, 29, 36, 0.1);
|
||||
box-sizing: border-box;
|
||||
font-size: 11px;
|
||||
font-weight: 500;
|
||||
line-height: 16px;
|
||||
color: var(--color-heritage-red);
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.store-detail-name {
|
||||
font-family: var(--font-headline);
|
||||
font-size: 20px;
|
||||
|
||||
@@ -215,13 +215,32 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.store-card-category-wrap {
|
||||
align-self: flex-start;
|
||||
max-width: 100%;
|
||||
padding: 0 6px;
|
||||
border-radius: 4px;
|
||||
background: rgba(166, 29, 36, 0.1);
|
||||
box-sizing: border-box;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.store-card-category-text {
|
||||
font-size: 10px;
|
||||
font-weight: 500;
|
||||
line-height: 14px;
|
||||
color: var(--color-heritage-red);
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.store-card-tags {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.store-card-tag {
|
||||
|
||||
Vendored
+1
@@ -13,6 +13,7 @@ declare const defineAppConfig: (config: Record<string, unknown>) => Record<strin
|
||||
declare const definePageConfig: (config: Record<string, unknown>) => Record<string, unknown>;
|
||||
|
||||
declare const TARO_APP_API_ORIGIN: string;
|
||||
declare const TARO_APP_VERSION: string;
|
||||
|
||||
/** 微信小程序全局（Taro 未封装的 API 如 openBusinessView 需直接调用） */
|
||||
declare const wx: {
|
||||
|
||||
@@ -46,10 +46,11 @@ module.exports = {
|
||||
exec_mode: 'fork',
|
||||
},
|
||||
{
|
||||
// cleanUrls:false 见 apps/admin-web/serve.json；否则百度校验 .html 会被 301 去后缀
|
||||
name: 'dukang-admin-web',
|
||||
cwd: `${APP_ROOT}/apps/admin-web`,
|
||||
script: 'npx',
|
||||
args: 'serve -s dist -l 8094',
|
||||
args: 'serve dist -l 8094 -c serve.json',
|
||||
interpreter: 'none',
|
||||
instances: 1,
|
||||
exec_mode: 'fork',
|
||||
|
||||
@@ -46,7 +46,7 @@ module.exports = {
|
||||
name: 'dukang-stg-admin-web',
|
||||
cwd: `${APP_ROOT}/apps/admin-web`,
|
||||
script: 'npx',
|
||||
args: 'serve -s dist -l 8194',
|
||||
args: 'serve dist -l 8194 -c serve.json',
|
||||
interpreter: 'none',
|
||||
instances: 1,
|
||||
exec_mode: 'fork',
|
||||
|
||||
@@ -33,6 +33,19 @@ server {
|
||||
|
||||
client_max_body_size 50m;
|
||||
|
||||
location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
|
||||
proxy_pass http://127.0.0.1:8190;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Connection "";
|
||||
proxy_buffering off;
|
||||
proxy_read_timeout 120s;
|
||||
proxy_send_timeout 120s;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:8190;
|
||||
proxy_http_version 1.1;
|
||||
@@ -183,6 +196,19 @@ server {
|
||||
|
||||
include /opt/dukang-staging/deploy/nginx-no-crawler.conf;
|
||||
|
||||
location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
|
||||
proxy_pass http://127.0.0.1:8190;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Connection "";
|
||||
proxy_buffering off;
|
||||
proxy_read_timeout 120s;
|
||||
proxy_send_timeout 120s;
|
||||
}
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8190;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -31,6 +31,19 @@ server {
|
||||
|
||||
include /opt/dukang/deploy/nginx-deploy-webhook.conf;
|
||||
|
||||
location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
|
||||
proxy_pass http://127.0.0.1:8090;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Connection "";
|
||||
proxy_buffering off;
|
||||
proxy_read_timeout 120s;
|
||||
proxy_send_timeout 120s;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:8090;
|
||||
proxy_http_version 1.1;
|
||||
@@ -173,6 +186,19 @@ server {
|
||||
|
||||
include /opt/dukang/deploy/nginx-no-crawler.conf;
|
||||
|
||||
location ~ ^/api/v1/admin/activity-posters/[^/]+/partner-pack$ {
|
||||
proxy_pass http://127.0.0.1:8090;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Connection "";
|
||||
proxy_buffering off;
|
||||
proxy_read_timeout 120s;
|
||||
proxy_send_timeout 120s;
|
||||
}
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8090;
|
||||
proxy_http_version 1.1;
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
# 禁止搜索引擎抓取（shop / partner / admin，含测试域）
|
||||
# 合规爬虫读 robots.txt；X-Robots-Tag 覆盖不先读 robots.txt 的抓取器
|
||||
# 禁止搜索引擎收录（shop / partner / admin，含测试域）
|
||||
# 必须允许抓取页面：Disallow:/ 会让百度无法读到 noindex，旧标题会一直留在 SERP。
|
||||
# X-Robots-Tag 覆盖不先读 robots.txt / 不执行 JS 的抓取器。
|
||||
|
||||
add_header X-Robots-Tag "noindex, nofollow, noarchive" always;
|
||||
add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
|
||||
|
||||
location = /robots.txt {
|
||||
default_type text/plain;
|
||||
charset utf-8;
|
||||
add_header X-Robots-Tag "noindex, nofollow, noarchive" always;
|
||||
return 200 "User-agent: *\nDisallow: /\n";
|
||||
add_header X-Robots-Tag "noindex, nofollow, noarchive, nosnippet" always;
|
||||
return 200 "User-agent: *\nAllow: /\n";
|
||||
}
|
||||
|
||||
@@ -138,19 +138,26 @@ if [[ "$SKIP_BUILD" == false ]]; then
|
||||
if [[ -f "$APP_ROOT/apps/mini-user/serve.json" ]]; then
|
||||
cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
|
||||
fi
|
||||
if [[ -f "$APP_ROOT/apps/admin-web/serve.json" ]]; then
|
||||
cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
|
||||
fi
|
||||
else
|
||||
echo "==> 4. 跳过构建"
|
||||
if [[ -f "$APP_ROOT/apps/mini-user/serve.json" && -d "$APP_ROOT/apps/mini-user/dist" ]]; then
|
||||
cp -f "$APP_ROOT/apps/mini-user/serve.json" "$APP_ROOT/apps/mini-user/dist/serve.json"
|
||||
fi
|
||||
if [[ -f "$APP_ROOT/apps/admin-web/serve.json" && -d "$APP_ROOT/apps/admin-web/dist" ]]; then
|
||||
cp -f "$APP_ROOT/apps/admin-web/serve.json" "$APP_ROOT/apps/admin-web/dist/serve.json"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "==> 5. 重启 PM2 ($ECOSYSTEM_FILE)"
|
||||
if pm2 describe "$PM2_API" &>/dev/null; then
|
||||
pm2 delete "$PM2_USER" 2>/dev/null || true
|
||||
pm2 delete "$PM2_ADMIN" 2>/dev/null || true
|
||||
pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_USER"
|
||||
pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" "$PM2_ADMIN" 2>/dev/null \
|
||||
|| pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER"
|
||||
pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE" --only "$PM2_ADMIN"
|
||||
pm2 restart "$PM2_API" "$PM2_SHOP" "$PM2_PARTNER" 2>/dev/null || true
|
||||
else
|
||||
pm2 start "$DEPLOY_DIR/$ECOSYSTEM_FILE"
|
||||
fi
|
||||
@@ -173,11 +180,9 @@ APP_ROOT="$APP_ROOT" DEPLOY_TRIGGER="${DEPLOY_TRIGGER:-manual}" DUKANG_ENV_FILE=
|
||||
|
||||
echo "==> 发版完成 ($DUKANG_DEPLOY_ENV)"
|
||||
|
||||
if [[ "$DUKANG_DEPLOY_ENV" == "staging" ]]; then
|
||||
echo "==> 8. 重载 nginx（staging）"
|
||||
if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
|
||||
systemctl reload nginx || echo "WARN: nginx reload failed"
|
||||
else
|
||||
echo "WARN: nginx 未安装或配置校验失败，跳过重载"
|
||||
fi
|
||||
echo "==> 8. 重载 nginx（robots.txt / 校验文件等 include 配置）"
|
||||
if command -v nginx >/dev/null 2>&1 && nginx -t 2>/dev/null; then
|
||||
systemctl reload nginx || echo "WARN: nginx reload failed"
|
||||
else
|
||||
echo "WARN: nginx 未安装或配置校验失败，跳过重载"
|
||||
fi
|
||||
|
||||
@@ -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[@]} 张配置/日志表保留本地）。"
|
||||
|
||||
+2
-1
@@ -116,7 +116,8 @@
|
||||
- 确认打款时可填写打款凭证号（`paymentRef`），并可上传凭证照片（`paymentProofUrls`，最多 9 张）；已打款后在详情与导出中展示
|
||||
- 门店账单统一列表：T+1 终态「已打款」、手动提现终态「已结算」（均为 `PAID`，文案区分业务类型）
|
||||
- 门店 T+1「出账日」= 出账当天（核销窗口「昨日 00:00–今日 00:00」中的今天）
|
||||
- **账单日一律为出账当天的北京日历日**（Asia/Shanghai）：门店 T+1、酒厂 T+3 日账单的 `billDate`；合伙人/物流月账的账期按北京自然月。酒厂 T+3 只决定纳入哪天完成的订单，账单日不是完成日。
|
||||
- **账单日一律为出账当天的北京日历日**（Asia/Shanghai）：门店 T+1、酒厂 T+3 期账单的 `billDate`；合伙人/物流月账的账期按北京自然月。酒厂 T+3 = **每 3 天出一期**，纳入上期 3 天完成订单。
|
||||
- **酒厂账单与订单完全比对**（v4.0.6）：全部已完成已付订单均入账（含现场提货）；出账日无单或应付为 0 仍生成账单，业务状态展示「无需打款」（DB 仍为 `UNPAID`）；支持按出账周期核对补生成漏账。
|
||||
- 核销详情展示核销门店主账户收款信息
|
||||
|
||||
### 3.4~3.8 Wave 能力
|
||||
|
||||
+7
-5
@@ -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-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.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` 已上线；任务列表「来源工单」链到 `/tickets/support?id=`。
|
||||
**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；合伙人/物流账期按北京自然月）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。
|
||||
**开发计划任务**：状态 `TODO` 待开发 / `IN_PROGRESS` 开发中 / `DEVELOPED` 已开发 / `RELEASED` 已上线 / `STOPPED` 已停止；版本状态含 `STOPPED` 已停止，关联任务随版本同步（仅当全部关联版本已停止时任务才为已停止）。任务列表「来源工单」链到 `/tickets/support?id=`。
|
||||
**财务账单日**：出账当天北京日历日（门店/酒厂 `billDate`；物流账期按北京自然月；合伙人周账按北京自然周，周一 08:00 出上周）。禁止 `toISOString().slice(0,10)` 或服务器本地 `Date` 午夜当账单日。酒厂应付为 0 仍出账（展示无需打款）。合伙人零元账单不同步给合伙人端。
|
||||
|
||||
## 6. 技术债（摘要）
|
||||
|
||||
|
||||
+27
-7
@@ -1,8 +1,8 @@
|
||||
# 杜康好客 · V4 PRD
|
||||
|
||||
> **v4.0**（2026-08-29）· 关联码与分佣事实源
|
||||
> 未改规则仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md)。**冲突时 V4 > V3**（本主题：订单佣金归属、关联码、合伙人账单明细、活动图）。
|
||||
> 实现：[`v4.0.1 开发文档`](./杜康好客-v4.0.1-开发文档.md) · [`v4.0.2 开发文档`](./杜康好客-v4.0.2-开发文档.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. 版本
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
|----|------|------|----------|
|
||||
| 4.0.1 | 08-29 / 08-30 | 合伙人关联码；订单佣金只认关联；账单酒单/核销分列；去掉区县酒单佣金；HQ 关联筛选与快链；合伙人 H5 用户管理与首页统计 | [`v4.0.1`](./杜康好客-v4.0.1-开发文档.md) |
|
||||
| 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，佣金归属改写）
|
||||
|
||||
@@ -28,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. 订单佣金
|
||||
@@ -53,7 +60,7 @@
|
||||
|
||||
## 5. 合伙人账单
|
||||
|
||||
月账（T+30）表头：`orderCommission` + `redeemCommission` = `totalAmount`。
|
||||
**周账**：每周一北京时间 **08:00** 出具上一完整自然周（周一 00:00 ～ 周日 23:59:59.999）账单。表头：`orderCommission` + `redeemCommission` = `totalAmount`。
|
||||
|
||||
明细两段：
|
||||
|
||||
@@ -64,17 +71,30 @@
|
||||
|
||||
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`；下架后列表不再出现。无关联码则不可下载并明确报错。
|
||||
- HQ 持权限 `activity_posters`（默认超管 + 运营）可增删改、上下架。
|
||||
- HQ 城市合伙人页提供活动图快链（列表列 / 详情 / 顶栏，进入 `/activity-posters?partnerId=`）。可指定一张已上架活动图：**单个下载**合成 PNG，或 **勾选主合伙人导出 zip**（仅已勾选，不做隐式全量）。合入码为已有 OSS 关联码；无码则单张报错、zip 记入跳过清单。不在本路径批量调微信补码，不预生成每人缓存图。
|
||||
|
||||
## 7. 不做
|
||||
## 7. 酒厂对账（v4.0.6）
|
||||
|
||||
- 口径：T+3 = **每 3 个自然日出具一张账单**（对齐起点 `2026-08-01`，出账日如 8/4、8/7、8/10…）；纳入窗口为上一期 3 天 `[出账日−3, 出账日)` 内全部 **COMPLETED + PAID** 订单（含现场提货）；`billDate` = 出账当天北京日历日；应付 = 实付合计 × 30%。
|
||||
- **与订单完全比对**：上述订单均须进入对应出账日账单明细；漏账可通过 HQ「核对补生成」或每日任务回扫补齐。
|
||||
- **应付为 0 仍出账**：出账日无订单或应付为 0 仍生成账单；业务状态展示「无需打款」（DB 仍为 `UNPAID`，不可确认打款）。
|
||||
- **已打款不回刷**；未打款账单可重算；明细 `orderId` 冲突时从其他未打款账单迁入。
|
||||
|
||||
## 8. 不做
|
||||
|
||||
改推广码体系；改核销归属；子账号自己的码；回刷已打款账单；区县佣金双轨；AI 出图/出文案；C 端/门店端活动图；预生成每人缓存图。
|
||||
|
||||
+12
-4
@@ -3,14 +3,14 @@
|
||||
> 基准：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md)
|
||||
> V3 进度仍见 [`杜康好客-v3-现状对照.md`](./杜康好客-v3-现状对照.md)，不混表。
|
||||
|
||||
## 0. 总览（2026-08-30）
|
||||
## 0. 总览（2026-09-02）
|
||||
|
||||
| 维度 | 结论 |
|
||||
|------|------|
|
||||
| 版本线 | **v4.0.2** 活动图模板 + 关联码合成 |
|
||||
| 版本线 | **v4.0.13** 收货地址禁「全市」+ 小飞侠拒单履约可感知 |
|
||||
| 订单佣金 | 区县归属已删除；只认关联 / 代下单选择 |
|
||||
| 账单 | 酒订单 / 核销订单分列 |
|
||||
| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；用户管理主图跟选择走 |
|
||||
| 账单 | 酒订单 / 核销订单分列；合伙人改为周账（周一 08:00）；零元不同步合伙人；酒厂含现场提货，零应付仍出账（无需打款） |
|
||||
| 活动图 | HQ 上传底图/码栏/文案；合伙人选择写入库；HQ 可指定一张图为勾选主合伙人合成下载；子账号不可看活动图 |
|
||||
|
||||
## 1. 版本交付
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
|------|------|------|
|
||||
| 4.0.1 | [`关联码与分佣账单`](./杜康好客-v4.0.1-开发文档.md) | ✅ 已实现 |
|
||||
| 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) | ✅ 已实现 |
|
||||
| 4.0.13 | [`收货地址把关与拒单可感知`](./杜康好客-v4.0.13-开发文档.md) | ✅ 已实现 |
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
@@ -25,3 +29,7 @@
|
||||
| 2026-08-30 | HQ 订单/用户详情展示关联合伙人；改绑权限 `users_partner_assoc`；用户/订单筛选关联合伙人；开城关联用户快链 |
|
||||
| 2026-08-30 | 合伙人 H5：首页关联用户/关联用户订单统计；用户管理 Tab（关联码+列表+备注）；`partner_user_note` 与 HQ `hqRemark` 隔离 |
|
||||
| 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；预付款预估；子账号用户管理无活动图 |
|
||||
| 2026-09-02 | v4.0.13：收货禁「全市」；脏地址下单拦截；小飞侠超区/推单失败挂 `fulfillmentHold`（不做仓/收件坐标） |
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
# 杜康好客 · v4.0.13 开发文档
|
||||
|
||||
> **2026-09-02** · mini-user / iam / trade / fulfillment / admin-web / h5-partner / domain
|
||||
> **主题**：收货地址严格把关（禁「全市」）+ 小飞侠拒单履约可感知
|
||||
|
||||
需求背景：订单 `DK2026090220803` 自动推小飞侠失败，原因 `超出服务区`；收货区县为门店筛选用伪值「全市」。
|
||||
|
||||
**不做（本版明确排除）**：仓坐标补全、收件 `chooseLocation` / `toCoordinate` 坐标链路。
|
||||
|
||||
---
|
||||
|
||||
## 1. 版本目标
|
||||
|
||||
| # | 任务 | 类型 | 交付 |
|
||||
|---|------|------|------|
|
||||
| 1 | 收货选区与门店筛选语义拆分 | 缺陷/体验 | `RegionPicker mode=shipping` 无「全市」 |
|
||||
| 2 | 地址保存硬闸 | 缺陷 | 前后端拒伪区县；详细地址最短 8 字 |
|
||||
| 3 | 下单/预览拦截脏地址 | 缺陷 | preview `addressOk=false`；确认页不可提交 |
|
||||
| 4 | 地址簿存量提示 | 体验 | 「需完善」置顶；结账选址强制去编辑 |
|
||||
| 5 | 推单失败可感知 | 缺陷 | `fulfillmentHold` + 原因码；HQ 标签/发货弹窗 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 规则
|
||||
|
||||
### 2.1 收货地址
|
||||
|
||||
- 伪区县：`全市`、`全部`、空 —— **禁止**写入 `user_address` / 下单快照 / 合伙人代下单。
|
||||
- 详细地址：必填且长度 ≥ 8；含「全市」且无街道路牌关键词时前端软提示（不单独硬失败）。
|
||||
- 门店列表筛选仍可使用「全市」（`mode=filter`）。
|
||||
- 现场取货地址快照（`现场/现场/取货`）不走本校验。
|
||||
|
||||
### 2.2 履约拦截（推单失败）
|
||||
|
||||
| `fulfillment_hold_reason` | 含义 | HQ 展示 |
|
||||
|---------------------------|------|---------|
|
||||
| `LARGE_ORDER_GE_10_BOXES` | 大单≥10箱 | 大单 |
|
||||
| `COURIER_OUT_OF_SERVICE` | 小飞侠返回超出服务区 | 超区 |
|
||||
| `COURIER_DISPATCH_FAILED` | 其它自动推单失败 | 推单失败 |
|
||||
|
||||
- 失败后仍写 `MANUAL` 配送记录（待发货），**同时**挂 `fulfillmentHold`，避免静默像「没推过」。
|
||||
- HQ 手动推小飞侠或填快递成功后仍清 hold（既有逻辑）。
|
||||
|
||||
---
|
||||
|
||||
## 3. 变更面
|
||||
|
||||
| 层 | 路径 |
|
||||
|----|------|
|
||||
| domain | `packages/domain/src/shipping-address.ts` |
|
||||
| shared-types | `FULFILLMENT_HOLD_REASON_LABELS` + 常量 |
|
||||
| API | `UserAddressService`；`TradeService` preview/create/代下单；`FulfillmentService.markCourierDispatchHold` |
|
||||
| C 端 | `RegionPicker`、`address-edit`、`addresses`、`order-confirm`、`shipping-address.ts` |
|
||||
| 合伙人 | `ProxyOrderPage` 校验 |
|
||||
| HQ | `OrdersPage` 拦截筛选文案与标签 |
|
||||
|
||||
---
|
||||
|
||||
## 4. API 行为变化
|
||||
|
||||
| 接口 | 变化 |
|
||||
|------|------|
|
||||
| `POST/PUT /user/addresses` | 伪区县 / 详情过短 → `400` |
|
||||
| `POST /trade/orders/preview` | 脏地址 → `addressOk=false` + message |
|
||||
| `POST /trade/orders` | 脏地址 → `400` |
|
||||
| 合伙人代下单 | 同上校验 |
|
||||
| 支付后自动推单 | 失败写 hold reason（库字段，无新 path） |
|
||||
|
||||
---
|
||||
|
||||
## 5. 验收
|
||||
|
||||
- [ ] 新增/编辑地址：区县列表无「全市」；选真实区县 + 足够详细地址可保存
|
||||
- [ ] 保存「全市」或过短详情被拒（前端 toast + 后端 400）
|
||||
- [ ] 历史脏地址在地址簿标「需完善」；结账选择时跳转编辑
|
||||
- [ ] 确认订单页脏地址不可提交；preview 提示完善区县
|
||||
- [ ] 合伙人代下单伪区县/过短详情被拒
|
||||
- [ ] 模拟小飞侠「超出服务区」后：订单 `fulfillment_hold=1`、`reason=COURIER_OUT_OF_SERVICE`；HQ 列表「超区」、发货弹窗有说明
|
||||
- [ ] 门店列表筛选「全市」行为不变
|
||||
|
||||
---
|
||||
|
||||
## 6. 存量建议（运维，非代码）
|
||||
|
||||
```sql
|
||||
-- 生产排查脏地址（只读）
|
||||
SELECT id, user_id, province, city, district, detail, updated_at
|
||||
FROM user_address
|
||||
WHERE district IN ('全市','全部','') OR district IS NULL
|
||||
ORDER BY id DESC LIMIT 100;
|
||||
```
|
||||
|
||||
可选：运营通知用户进「地址管理」完善；本版不自动改写历史行。
|
||||
@@ -0,0 +1,63 @@
|
||||
# 杜康好客 · v4.0.6 开发文档
|
||||
|
||||
> **2026-08-31** · settlement / admin-web
|
||||
> **主题**：酒厂 T+3 = 每 3 天出一期；与全部已完成已付订单完全比对（含现场提货）；应付为 0 仍出账（无需打款）；核对补生成
|
||||
|
||||
需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §7 · V3 财务锚点仍见 [`杜康好客-v3-PRD.md`](./杜康好客-v3-PRD.md) §3.3
|
||||
|
||||
---
|
||||
|
||||
## 1. 版本目标
|
||||
|
||||
| # | 任务 | 类型 | 交付 |
|
||||
|---|------|------|------|
|
||||
| 1 | T+3 出账节奏 | 修 | **每 3 天一张账单**（非每日）；纳入上期 3 个自然日全部已付已完成订单 |
|
||||
| 2 | 含现场提货 | 修 | 不限配送类型 |
|
||||
| 3 | 零应付 / 无单仍出账 | 修 | 出账日仍生成账单，展示「无需打款」 |
|
||||
| 4 | 核对补生成 | 需求 | HQ 按区间重算周期出账日；清理旧「每日一账」空账单 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 规则
|
||||
|
||||
对齐起点 `WINERY_BILL_EPOCH_YMD = 2026-08-01`，周期 `WINERY_SETTLEMENT_PERIOD_DAYS = 3`。
|
||||
|
||||
| 出账日 | 纳入完成日窗口 |
|
||||
|--------|----------------|
|
||||
| 8/4 | [8/1, 8/4) |
|
||||
| 8/7 | [8/4, 8/7) |
|
||||
| 8/28 | [8/25, 8/28) |
|
||||
| 8/31 | [8/28, 8/31) |
|
||||
|
||||
- 应付 = `round2(Σ payAmount × 0.3)`
|
||||
- `wineryAmount === 0` → UI/导出「无需打款」；确认打款拒绝
|
||||
- 非周期日不生成；每日 cron 仅在出账日真正落账
|
||||
|
||||
### 旧逻辑为何对不上
|
||||
|
||||
旧实现是「**每天**出账，只收 **3 天前那一天** 的订单」：当天窗口无完成单就 skip → 8/4～8/28 大量空白；8/28、8/29 连着出是因为两天各自都有「D−3」完成单。
|
||||
|
||||
---
|
||||
|
||||
## 3. 变更面
|
||||
|
||||
| 位置 | 说明 |
|
||||
|------|------|
|
||||
| `packages/domain` | `isWineryIssueDay` / `shanghaiWineryPeriodWindow` / `wineryIssueDateFromCompletedAt` / `listWineryIssueDays` |
|
||||
| `shared-types` | `WINERY_SETTLEMENT_PERIOD_DAYS`、`WINERY_BILL_EPOCH_YMD` |
|
||||
| `settlement.service` | 周期出账；`reconcileWineryBills` 只跑周期日并清理非周期空账单 |
|
||||
| `settlement.scheduler` | 每日尝试出账（非周期日 skip）+ 近 45 日核对 |
|
||||
| `admin-web` | 文案 + 核对补生成 |
|
||||
|
||||
无 Prisma 迁移。线上历史账单一次性修复：`server/dukang-api/prisma/sql/fix-winery-bills-v406.sql`（补现场提货入账、中间 0 账、迁错期明细）。
|
||||
|
||||
---
|
||||
|
||||
## 4. 验收
|
||||
|
||||
- [ ] 账单日仅为 8/4、8/7、8/10… 这类周期日，不会连续两天各出一张（除非跨期）
|
||||
- [ ] 核对补生成后，同城配送与现场提货订单均出现在对应期账单明细（历史现场单缺 `completedAt` 会自动用 `paidAt` 补齐）
|
||||
- [ ] 每张账单明细覆盖上期 3 天全部已付已完成订单（含现场提货/同城/跨城）
|
||||
- [ ] 出账日无单仍有账单，「无需打款」
|
||||
- [ ] HQ「核对补生成」可选 8/4～今天，补齐中间漏期并清理误生成的每日账单
|
||||
- [ ] 已打款账单不回刷
|
||||
@@ -0,0 +1,49 @@
|
||||
# 杜康好客 · v4.0.7 开发文档
|
||||
|
||||
> **2026-09-01** · ops / store / admin-web
|
||||
> **主题**：HQ 城市合伙人页活动图快链；指定一张活动图为单个或勾选的主合伙人合成关联码并下载（单张 PNG / zip）
|
||||
|
||||
需求事实源：[`杜康好客-v4-PRD.md`](./杜康好客-v4-PRD.md) §6
|
||||
|
||||
---
|
||||
|
||||
## 1. 版本目标
|
||||
|
||||
| # | 任务 | 类型 | 交付 |
|
||||
|---|------|------|------|
|
||||
| 1 | 快链 | 需求 | 城市合伙人列表/详情/顶栏跳转活动图页（`?partnerId=`） |
|
||||
| 2 | 单个下载 | 需求 | 行操作、详情抽屉、活动图页「为该合伙人下载」；弹窗选已上架活动图 → PNG |
|
||||
| 3 | 勾选导出 | 需求 | 列表勾选主合伙人 → 选活动图 → zip（仅已勾选，非隐式全量） |
|
||||
|
||||
**不做**：预生成每人缓存图；批量调微信补码；按每人当前所选活动图分别出图；BullMQ 异步包。
|
||||
|
||||
---
|
||||
|
||||
## 2. 规则
|
||||
|
||||
- 合入码 = 主合伙人已有 OSS 关联码。无码则单张报错、zip 写入 `_skipped.txt`。不在本路径调用 `getwxacodeunlimit`。
|
||||
- HQ 指定 **一张** 已上架活动图，贴进所有目标合伙人。
|
||||
- zip 仅含请求体 `partnerIds`；测试号（`isTest`）跳过。
|
||||
- 底图最长边 ≤ 2500 且宽×高 ≤ 4e6，超限报错。
|
||||
- Sharp 合成并发 1；底图只下载一次；zip 流式写出。
|
||||
|
||||
---
|
||||
|
||||
## 3. 变更面
|
||||
|
||||
- HQ：`GET /admin/activity-posters/:id/image?partnerId=` · `POST /admin/activity-posters/:id/partner-pack` `{ partnerIds }`；权限 `activity_posters`
|
||||
- admin-web：城市合伙人快链 / 勾选导出 / 弹窗选图；活动图页 `?partnerId=` 上下文下载
|
||||
- nginx：partner-pack 路径 `proxy_buffering off` + `proxy_read_timeout 120s`
|
||||
- `archiver` 依赖
|
||||
|
||||
无 Prisma 迁移。
|
||||
|
||||
---
|
||||
|
||||
## 4. 验收
|
||||
|
||||
- [ ] 城市合伙人「活动图」列、详情、顶栏快链进入活动图页；带 `partnerId` 时可「为该合伙人下载」
|
||||
- [ ] 行内/详情「下载活动图」弹窗选已上架图，得到该人合成 PNG；无关联码明确报错
|
||||
- [ ] 勾选 N 人导出 zip，文件名含城市/公司或姓名/id；缺码与测试号进 `_skipped.txt`
|
||||
- [ ] 未勾选时导出按钮禁用；不做隐式全量
|
||||
- [ ] 底图过大被拒绝；打包期间不调用微信补码
|
||||
@@ -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 有用户管理；可下载二维码；无活动图入口/主图；主账号功能不变
|
||||
@@ -10,6 +10,7 @@ describe('taskStatusFromVersionStatus', () => {
|
||||
expect(taskStatusFromVersionStatus('IN_PROGRESS')).toBe('IN_PROGRESS');
|
||||
expect(taskStatusFromVersionStatus('TESTING')).toBe('DEVELOPED');
|
||||
expect(taskStatusFromVersionStatus('RELEASED')).toBe('RELEASED');
|
||||
expect(taskStatusFromVersionStatus('STOPPED')).toBe('STOPPED');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -22,4 +23,11 @@ describe('resolveTaskStatusFromVersions', () => {
|
||||
expect(resolveTaskStatusFromVersions(['PENDING', 'TESTING'])).toBe('DEVELOPED');
|
||||
expect(resolveTaskStatusFromVersions(['IN_PROGRESS', 'RELEASED'])).toBe('RELEASED');
|
||||
});
|
||||
|
||||
it('syncs STOPPED only when every linked version is stopped', () => {
|
||||
expect(resolveTaskStatusFromVersions(['STOPPED'])).toBe('STOPPED');
|
||||
expect(resolveTaskStatusFromVersions(['STOPPED', 'STOPPED'])).toBe('STOPPED');
|
||||
expect(resolveTaskStatusFromVersions(['STOPPED', 'IN_PROGRESS'])).toBe('IN_PROGRESS');
|
||||
expect(resolveTaskStatusFromVersions(['STOPPED', 'RELEASED'])).toBe('RELEASED');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export type DevPlanTaskStatus = 'TODO' | 'IN_PROGRESS' | 'DEVELOPED' | 'RELEASED';
|
||||
export type DevPlanVersionStatus = 'PENDING' | 'IN_PROGRESS' | 'TESTING' | 'RELEASED';
|
||||
export type DevPlanTaskStatus = 'TODO' | 'IN_PROGRESS' | 'DEVELOPED' | 'RELEASED' | 'STOPPED';
|
||||
export type DevPlanVersionStatus = 'PENDING' | 'IN_PROGRESS' | 'TESTING' | 'RELEASED' | 'STOPPED';
|
||||
|
||||
export function computeDurationMinutes(
|
||||
devStartedAt: Date | null | undefined,
|
||||
@@ -63,13 +63,14 @@ export function taskCompletedAtOnStatus(
|
||||
}
|
||||
|
||||
const TASK_STATUS_RANK: Record<DevPlanTaskStatus, number> = {
|
||||
STOPPED: -1,
|
||||
TODO: 0,
|
||||
IN_PROGRESS: 1,
|
||||
DEVELOPED: 2,
|
||||
RELEASED: 3,
|
||||
};
|
||||
|
||||
/** 版本状态 → 任务状态：待开始/开发中/测试中/已发布 ↔ 待处理/进行中/已开发/已发布 */
|
||||
/** 版本状态 → 任务状态：待开始/开发中/测试中/已发布/已停止 ↔ 待处理/进行中/已开发/已发布/已停止 */
|
||||
export function taskStatusFromVersionStatus(status: DevPlanVersionStatus): DevPlanTaskStatus {
|
||||
switch (status) {
|
||||
case 'PENDING':
|
||||
@@ -80,15 +81,19 @@ export function taskStatusFromVersionStatus(status: DevPlanVersionStatus): DevPl
|
||||
return 'DEVELOPED';
|
||||
case 'RELEASED':
|
||||
return 'RELEASED';
|
||||
case 'STOPPED':
|
||||
return 'STOPPED';
|
||||
}
|
||||
}
|
||||
|
||||
/** 任务挂多个版本时取进度最高的对应状态 */
|
||||
/** 任务挂多个版本时取进度最高的对应状态；仅当全部版本已停止时任务才为已停止 */
|
||||
export function resolveTaskStatusFromVersions(
|
||||
versionStatuses: DevPlanVersionStatus[],
|
||||
): DevPlanTaskStatus | null {
|
||||
if (!versionStatuses.length) return null;
|
||||
return versionStatuses
|
||||
const active = versionStatuses.filter((s) => s !== 'STOPPED');
|
||||
if (!active.length) return 'STOPPED';
|
||||
return active
|
||||
.map(taskStatusFromVersionStatus)
|
||||
.reduce((highest, current) =>
|
||||
TASK_STATUS_RANK[current] > TASK_STATUS_RANK[highest] ? current : highest,
|
||||
|
||||
@@ -410,3 +410,4 @@ export * from './dev-plan';
|
||||
export * from './support-ticket';
|
||||
export * from './phone';
|
||||
export * from './shanghai-date';
|
||||
export * from './shipping-address';
|
||||
|
||||
@@ -1,14 +1,22 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import {
|
||||
addShanghaiDays,
|
||||
isWineryIssueDay,
|
||||
listWineryIssueDays,
|
||||
nextPartnerBillIssueAt,
|
||||
previousShanghaiMonth,
|
||||
previousShanghaiWeek,
|
||||
shanghaiBillPeriodYmds,
|
||||
shanghaiLaggedIssueWindow,
|
||||
shanghaiMonthLastInstant,
|
||||
shanghaiMonthRange,
|
||||
shanghaiPeriodYmds,
|
||||
shanghaiT1DayWindow,
|
||||
shanghaiWeekRange,
|
||||
shanghaiWineryPeriodWindow,
|
||||
shanghaiYmd,
|
||||
startOfShanghaiDay,
|
||||
wineryIssueDateFromCompletedAt,
|
||||
} from './shanghai-date';
|
||||
|
||||
describe('shanghaiYmd / startOfShanghaiDay', () => {
|
||||
@@ -46,7 +54,7 @@ describe('shanghaiT1DayWindow', () => {
|
||||
});
|
||||
|
||||
describe('shanghaiLaggedIssueWindow', () => {
|
||||
it('酒厂 T+3：出账日是今天，纳入 3 天前完成的订单', () => {
|
||||
it('旧日滞后：出账日是今天，纳入 3 天前完成的订单', () => {
|
||||
const { start, end, billDate } = shanghaiLaggedIssueWindow(
|
||||
new Date('2026-08-31T00:00:00.000Z'),
|
||||
3,
|
||||
@@ -57,6 +65,55 @@ describe('shanghaiLaggedIssueWindow', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('酒厂 T+3 每 3 天一期', () => {
|
||||
const epoch = '2026-08-01';
|
||||
const period = 3;
|
||||
|
||||
it('出账日：8/4、8/7、8/28；非 8/5、8/29', () => {
|
||||
expect(isWineryIssueDay(new Date('2026-08-04T00:00:00+08:00'), period, epoch)).toBe(true);
|
||||
expect(isWineryIssueDay(new Date('2026-08-07T00:00:00+08:00'), period, epoch)).toBe(true);
|
||||
expect(isWineryIssueDay(new Date('2026-08-28T00:00:00+08:00'), period, epoch)).toBe(true);
|
||||
expect(isWineryIssueDay(new Date('2026-08-01T00:00:00+08:00'), period, epoch)).toBe(false);
|
||||
expect(isWineryIssueDay(new Date('2026-08-05T00:00:00+08:00'), period, epoch)).toBe(false);
|
||||
expect(isWineryIssueDay(new Date('2026-08-29T00:00:00+08:00'), period, epoch)).toBe(false);
|
||||
});
|
||||
|
||||
it('窗口：出账日 8/28 → 完成日 [8/25, 8/28)', () => {
|
||||
const { start, end, billDate } = shanghaiWineryPeriodWindow(
|
||||
new Date('2026-08-28T00:00:00+08:00'),
|
||||
period,
|
||||
);
|
||||
expect(shanghaiYmd(billDate)).toBe('2026-08-28');
|
||||
expect(shanghaiYmd(start)).toBe('2026-08-25');
|
||||
expect(shanghaiYmd(end)).toBe('2026-08-28');
|
||||
});
|
||||
|
||||
it('完成日归属出账日', () => {
|
||||
expect(
|
||||
shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-01T04:00:00.000Z'), period, epoch)),
|
||||
).toBe('2026-08-04');
|
||||
expect(
|
||||
shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-03T04:00:00.000Z'), period, epoch)),
|
||||
).toBe('2026-08-04');
|
||||
expect(
|
||||
shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-04T04:00:00.000Z'), period, epoch)),
|
||||
).toBe('2026-08-07');
|
||||
expect(
|
||||
shanghaiYmd(wineryIssueDateFromCompletedAt(new Date('2026-08-27T04:00:00.000Z'), period, epoch)),
|
||||
).toBe('2026-08-28');
|
||||
});
|
||||
|
||||
it('listWineryIssueDays 只返回周期日', () => {
|
||||
const days = listWineryIssueDays(
|
||||
new Date('2026-08-01T00:00:00+08:00'),
|
||||
new Date('2026-08-10T00:00:00+08:00'),
|
||||
period,
|
||||
epoch,
|
||||
).map(shanghaiYmd);
|
||||
expect(days).toEqual(['2026-08-04', '2026-08-07', '2026-08-10']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('addShanghaiDays', () => {
|
||||
it('跨月跨年按北京日历加减', () => {
|
||||
expect(shanghaiYmd(addShanghaiDays(new Date('2026-08-31T16:00:00.000Z'), 1))).toBe(
|
||||
@@ -78,25 +135,68 @@ describe('shanghaiMonthRange', () => {
|
||||
|
||||
it('UTC 月末 23:59:59 不会把账期止日滚成下月', () => {
|
||||
const periodStart = new Date('2026-08-01T00:00:00.000Z');
|
||||
expect(shanghaiPeriodYmds(periodStart)).toEqual({
|
||||
const ymds = shanghaiPeriodYmds(periodStart);
|
||||
expect(ymds.periodStart).toBe('2026-08-01');
|
||||
expect(ymds.periodEnd).toBe('2026-08-31');
|
||||
});
|
||||
});
|
||||
|
||||
describe('previousShanghaiMonth', () => {
|
||||
it('北京 9 月 1 日取上月为 8 月', () => {
|
||||
expect(previousShanghaiMonth(new Date('2026-08-31T16:00:00.000Z'))).toEqual({
|
||||
year: 2026,
|
||||
month: 8,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
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',
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('previousShanghaiMonth', () => {
|
||||
it('北京 9 月 1 日 08:00（UTC 9/1 00:00）取 8 月', () => {
|
||||
expect(previousShanghaiMonth(new Date('2026-09-01T00:00:00.000Z'))).toEqual({
|
||||
year: 2026,
|
||||
month: 8,
|
||||
});
|
||||
});
|
||||
|
||||
it('北京 9 月 1 日 00:30（UTC 8/31 16:30）取 8 月，不因 UTC 仍是 8 月而错到 7 月', () => {
|
||||
expect(previousShanghaiMonth(new Date('2026-08-31T16:30:00.000Z'))).toEqual({
|
||||
year: 2026,
|
||||
month: 8,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -33,7 +33,8 @@ export function shanghaiT1DayWindow(anchor = new Date()) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 酒厂 T+N：出账日 = 今天；纳入窗口为「今天 − lagDays」当天完成的订单
|
||||
* 酒厂日滞后窗口（旧：每天出账只收 lagDays 前那一天）。
|
||||
* 现网酒厂已改为「每 periodDays 天出一期」，见 shanghaiWineryPeriodWindow。
|
||||
*/
|
||||
export function shanghaiLaggedIssueWindow(anchor = new Date(), lagDays: number) {
|
||||
const billDate = startOfShanghaiDay(anchor);
|
||||
@@ -42,6 +43,58 @@ export function shanghaiLaggedIssueWindow(anchor = new Date(), lagDays: number)
|
||||
return { start, end, billDate };
|
||||
}
|
||||
|
||||
/** 两个北京自然日之间相差天数（b − a；可为负） */
|
||||
export function shanghaiCalendarDaysBetween(a: Date, b: Date): number {
|
||||
const sa = startOfShanghaiDay(a).getTime();
|
||||
const sb = startOfShanghaiDay(b).getTime();
|
||||
return Math.round((sb - sa) / (24 * 60 * 60 * 1000));
|
||||
}
|
||||
|
||||
/** 是否酒厂出账日：相对 epoch，每 periodDays 天一次（首张 = epoch + periodDays） */
|
||||
export function isWineryIssueDay(anchor: Date, periodDays: number, epochYmd: string): boolean {
|
||||
const billDate = startOfShanghaiDay(anchor);
|
||||
const epoch = parseShanghaiYmd(epochYmd);
|
||||
const diff = shanghaiCalendarDaysBetween(epoch, billDate);
|
||||
return diff >= periodDays && diff % periodDays === 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 酒厂 T+N 期账单窗口：出账日 = anchor 当天；纳入 [出账日 − periodDays, 出账日) 内完成的订单。
|
||||
* 调用方应先用 isWineryIssueDay 判断是否出账日。
|
||||
*/
|
||||
export function shanghaiWineryPeriodWindow(anchor = new Date(), periodDays: number) {
|
||||
const billDate = startOfShanghaiDay(anchor);
|
||||
const start = addShanghaiDays(billDate, -periodDays);
|
||||
return { start, end: billDate, billDate };
|
||||
}
|
||||
|
||||
/** 订单完成日 → 所属酒厂出账日（落入下一期出账日） */
|
||||
export function wineryIssueDateFromCompletedAt(
|
||||
completedAt: Date,
|
||||
periodDays: number,
|
||||
epochYmd: string,
|
||||
) {
|
||||
const c = startOfShanghaiDay(completedAt);
|
||||
const epoch = parseShanghaiYmd(epochYmd);
|
||||
const daysFromEpoch = shanghaiCalendarDaysBetween(epoch, c);
|
||||
if (daysFromEpoch < 0) {
|
||||
return addShanghaiDays(epoch, periodDays);
|
||||
}
|
||||
const k = Math.floor(daysFromEpoch / periodDays) + 1;
|
||||
return addShanghaiDays(epoch, k * periodDays);
|
||||
}
|
||||
|
||||
/** 枚举 [from, to] 内（含）的全部酒厂出账日 */
|
||||
export function listWineryIssueDays(from: Date, to: Date, periodDays: number, epochYmd: string): Date[] {
|
||||
const start = startOfShanghaiDay(from);
|
||||
const end = startOfShanghaiDay(to);
|
||||
const out: Date[] = [];
|
||||
for (let d = start; d.getTime() <= end.getTime(); d = addShanghaiDays(d, 1)) {
|
||||
if (isWineryIssueDay(d, periodDays, epochYmd)) out.push(d);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
export function shanghaiMonthRange(year: number, month: number): { start: Date; endExclusive: Date } {
|
||||
const start = new Date(`${year}-${pad2(month)}-01T00:00:00+08:00`);
|
||||
const endMonth = month === 12 ? 1 : month + 1;
|
||||
@@ -74,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);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import {
|
||||
isConcreteShippingDistrict,
|
||||
isPseudoShippingDistrict,
|
||||
shippingDetailCityWideHint,
|
||||
validateShippingAddress,
|
||||
} from './shipping-address';
|
||||
|
||||
describe('shipping address', () => {
|
||||
it('rejects pseudo districts', () => {
|
||||
expect(isPseudoShippingDistrict('全市')).toBe(true);
|
||||
expect(isPseudoShippingDistrict('全部')).toBe(true);
|
||||
expect(isPseudoShippingDistrict('')).toBe(true);
|
||||
expect(isConcreteShippingDistrict('金水区')).toBe(true);
|
||||
});
|
||||
|
||||
it('requires concrete district and detail length', () => {
|
||||
expect(
|
||||
validateShippingAddress({
|
||||
province: '河南省',
|
||||
city: '郑州市',
|
||||
district: '全市',
|
||||
detail: '上馆子信阳菜尚购生活广场店',
|
||||
}).ok,
|
||||
).toBe(false);
|
||||
|
||||
expect(
|
||||
validateShippingAddress({
|
||||
province: '河南省',
|
||||
city: '郑州市',
|
||||
district: '金水区',
|
||||
detail: '短',
|
||||
}).message,
|
||||
).toMatch(/详细/);
|
||||
|
||||
expect(
|
||||
validateShippingAddress({
|
||||
province: '河南省',
|
||||
city: '郑州市',
|
||||
district: '金水区',
|
||||
detail: '沙口路8号院尚购生活广场',
|
||||
}).ok,
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it('soft-hints bare 全市 in detail', () => {
|
||||
expect(shippingDetailCityWideHint('河南省郑州市全市上馆子')).toBeTruthy();
|
||||
expect(shippingDetailCityWideHint('金水区沙口路8号')).toBeNull();
|
||||
});
|
||||
});
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user