Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 51304d782a | |||
| 6e81a7eb36 | |||
| 8bee570cb2 | |||
| ed06d269c6 | |||
| 0214253b48 | |||
| afced01ba6 | |||
| 8812e5f5e3 | |||
| 01055ded02 | |||
| 01593dcbdc | |||
| afdd26cb59 | |||
| 4b4758a60f | |||
| f9360c15e3 | |||
| f382c27200 | |||
| a36700076e | |||
| 4a693c8fe9 |
@@ -5,9 +5,20 @@ import ProductList from "./components/ProductList";
|
||||
import ProductDetail from "./components/ProductDetail";
|
||||
import SubmissionsPage from "./components/SubmissionsPage";
|
||||
import ApiKeysPage from "./components/ApiKeysPage";
|
||||
import { Inbox, KeyRound, LogOut, Package } from "lucide-react";
|
||||
import CategoriesPage from "./components/CategoriesPage";
|
||||
import BrandsPage from "./components/BrandsPage";
|
||||
import StatsPage from "./components/StatsPage";
|
||||
import AuditLogPage from "./components/AuditLogPage";
|
||||
import { BarChart3, FolderTree, Inbox, KeyRound, LogOut, Package, ScrollText, Tag } from "lucide-react";
|
||||
|
||||
type Tab = "products" | "submissions" | "keys";
|
||||
type Tab =
|
||||
| "overview"
|
||||
| "products"
|
||||
| "submissions"
|
||||
| "categories"
|
||||
| "brands"
|
||||
| "audit"
|
||||
| "keys";
|
||||
type View = { name: "list" } | { name: "detail"; id: string };
|
||||
|
||||
export default function App() {
|
||||
@@ -17,6 +28,7 @@ export default function App() {
|
||||
const [tab, setTab] = useState<Tab>("products");
|
||||
const [pending, setPending] = useState<number | null>(null);
|
||||
const [view, setView] = useState<View>({ name: "list" });
|
||||
const [navIds, setNavIds] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!authed) return;
|
||||
@@ -72,6 +84,16 @@ export default function App() {
|
||||
天工商品档案公共仓 · 后台
|
||||
</div>
|
||||
<nav className="flex items-center gap-1 text-sm">
|
||||
<button
|
||||
onClick={() => setTab("overview")}
|
||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||
tab === "overview"
|
||||
? "bg-emerald-50 text-emerald-700"
|
||||
: "text-gray-600 hover:bg-gray-100"
|
||||
}`}
|
||||
>
|
||||
<BarChart3 className="h-4 w-4" /> 数据概览
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setTab("products");
|
||||
@@ -100,6 +122,39 @@ export default function App() {
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setTab("categories");
|
||||
setView({ name: "list" });
|
||||
}}
|
||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||
tab === "categories"
|
||||
? "bg-emerald-50 text-emerald-700"
|
||||
: "text-gray-600 hover:bg-gray-100"
|
||||
}`}
|
||||
>
|
||||
<FolderTree className="h-4 w-4" /> 分类管理
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setTab("brands")}
|
||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||
tab === "brands"
|
||||
? "bg-emerald-50 text-emerald-700"
|
||||
: "text-gray-600 hover:bg-gray-100"
|
||||
}`}
|
||||
>
|
||||
<Tag className="h-4 w-4" /> 品牌管理
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setTab("audit")}
|
||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||
tab === "audit"
|
||||
? "bg-emerald-50 text-emerald-700"
|
||||
: "text-gray-600 hover:bg-gray-100"
|
||||
}`}
|
||||
>
|
||||
<ScrollText className="h-4 w-4" /> 操作日志
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setTab("keys")}
|
||||
className={`px-3 py-1.5 rounded-md flex items-center gap-1.5 ${
|
||||
@@ -123,14 +178,32 @@ export default function App() {
|
||||
</div>
|
||||
</header>
|
||||
<main className="flex-1 overflow-auto p-6">
|
||||
{tab === "keys" ? (
|
||||
{tab === "overview" ? (
|
||||
<StatsPage />
|
||||
) : tab === "audit" ? (
|
||||
<AuditLogPage />
|
||||
) : tab === "keys" ? (
|
||||
<ApiKeysPage />
|
||||
) : tab === "categories" ? (
|
||||
<CategoriesPage />
|
||||
) : tab === "brands" ? (
|
||||
<BrandsPage />
|
||||
) : tab === "submissions" ? (
|
||||
<SubmissionsPage onPending={setPending} />
|
||||
) : view.name === "list" ? (
|
||||
<ProductList onOpen={(id) => setView({ name: "detail", id })} />
|
||||
<ProductList
|
||||
onOpen={(id, ids) => {
|
||||
setNavIds(ids);
|
||||
setView({ name: "detail", id });
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<ProductDetail id={view.id} onBack={() => setView({ name: "list" })} />
|
||||
<ProductDetail
|
||||
id={view.id}
|
||||
ids={navIds}
|
||||
onNavigate={(id) => setView({ name: "detail", id })}
|
||||
onBack={() => setView({ name: "list" })}
|
||||
/>
|
||||
)}
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -61,6 +61,11 @@ export const api = {
|
||||
}>(`/products?q=${encodeURIComponent(q)}&page=${page}&size=${size}`),
|
||||
getProduct: (id: string) =>
|
||||
request<import("./types").ProductDetail>(`/products/${id}`),
|
||||
createProduct: (body: unknown) =>
|
||||
request<import("./types").ProductDetail>("/products", {
|
||||
method: "POST",
|
||||
body: JSON.stringify(body),
|
||||
}),
|
||||
updateProduct: (id: string, body: unknown) =>
|
||||
request<import("./types").ProductDetail>(`/products/${id}`, {
|
||||
method: "PUT",
|
||||
@@ -102,8 +107,37 @@ export const api = {
|
||||
),
|
||||
listBrands: () =>
|
||||
request<{ items: import("./types").Brand[] }>("/brands"),
|
||||
createBrand: (name: string) =>
|
||||
request<import("./types").Brand>("/brands", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ name }),
|
||||
}),
|
||||
updateBrand: (id: string, name: string) =>
|
||||
request<import("./types").Brand>(`/brands/${id}`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify({ name }),
|
||||
}),
|
||||
mergeBrands: (id: string, targetId: string) =>
|
||||
request<import("./types").Brand>(`/brands/${id}/merge`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ target_id: targetId }),
|
||||
}),
|
||||
deleteBrand: (id: string) =>
|
||||
request<{ status: string }>(`/brands/${id}`, { method: "DELETE" }),
|
||||
listCategories: () =>
|
||||
request<{ items: import("./types").Category[] }>("/categories"),
|
||||
createCategory: (body: import("./types").CategoryInput) =>
|
||||
request<import("./types").Category>("/categories", {
|
||||
method: "POST",
|
||||
body: JSON.stringify(body),
|
||||
}),
|
||||
updateCategory: (id: string, body: import("./types").CategoryInput) =>
|
||||
request<import("./types").Category>(`/categories/${id}`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(body),
|
||||
}),
|
||||
deleteCategory: (id: string) =>
|
||||
request<{ status: string }>(`/categories/${id}`, { method: "DELETE" }),
|
||||
listSubmissions: (status: string, page: number, size: number) =>
|
||||
request<{
|
||||
items: import("./types").SubmissionRow[];
|
||||
@@ -137,4 +171,22 @@ export const api = {
|
||||
),
|
||||
revokeApiKey: (id: string) =>
|
||||
request<{ status: string }>(`/keys/${id}`, { method: "DELETE" }),
|
||||
stats: () => request<import("./types").AdminStats>("/stats"),
|
||||
auditLog: (page: number, size: number) =>
|
||||
request<{
|
||||
items: import("./types").AuditLogRow[];
|
||||
page: number;
|
||||
size: number;
|
||||
total: number;
|
||||
}>(`/audit?page=${page}&size=${size}`),
|
||||
bulkProducts: (body: {
|
||||
ids: string[];
|
||||
action: "status" | "category";
|
||||
status?: string;
|
||||
category_id?: string | null;
|
||||
}) =>
|
||||
request<{ status: string; affected: number }>("/products/bulk", {
|
||||
method: "POST",
|
||||
body: JSON.stringify(body),
|
||||
}),
|
||||
};
|
||||
|
||||
@@ -44,7 +44,7 @@ export default function ApiKeysPage() {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="max-w-4xl">
|
||||
<div className="mx-auto max-w-4xl">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<div>
|
||||
<h2 className="text-lg font-semibold text-gray-800 flex items-center gap-2">
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { api, ApiError } from "../api";
|
||||
import type { AuditLogRow } from "../types";
|
||||
import { ScrollText } from "lucide-react";
|
||||
|
||||
const ACTION_LABEL: Record<string, string> = {
|
||||
create: "新建",
|
||||
update: "修改",
|
||||
delete: "删除",
|
||||
add_image: "添加图片",
|
||||
delete_image: "删除图片",
|
||||
bulk_status: "批量改状态",
|
||||
bulk_category: "批量改分类",
|
||||
};
|
||||
|
||||
const ENTITY_LABEL: Record<string, string> = {
|
||||
product: "商品",
|
||||
category: "分类",
|
||||
brand: "品牌",
|
||||
};
|
||||
|
||||
export default function AuditLogPage() {
|
||||
const [rows, setRows] = useState<AuditLogRow[]>([]);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [page, setPage] = useState(1);
|
||||
const size = 30;
|
||||
const [error, setError] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
setError("");
|
||||
api
|
||||
.auditLog(page, size)
|
||||
.then((r) => {
|
||||
setRows(r.items);
|
||||
setTotal(r.total);
|
||||
})
|
||||
.catch((e) => setError(e instanceof ApiError ? e.message : "加载失败"));
|
||||
}, [page]);
|
||||
|
||||
const pages = Math.max(1, Math.ceil(total / size));
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-5xl">
|
||||
<h2 className="mb-4 flex items-center gap-2 text-lg font-semibold text-gray-800">
|
||||
<ScrollText className="h-5 w-5 text-emerald-600" /> 操作日志
|
||||
<span className="text-sm font-normal text-gray-400">共 {total} 条</span>
|
||||
</h2>
|
||||
|
||||
{error && (
|
||||
<div className="mb-3 rounded bg-red-50 px-4 py-2 text-sm text-red-700">{error}</div>
|
||||
)}
|
||||
|
||||
<div className="overflow-hidden rounded-lg border bg-white">
|
||||
<table className="w-full text-sm">
|
||||
<thead className="bg-gray-50 text-left text-xs uppercase text-gray-500">
|
||||
<tr>
|
||||
<th className="px-4 py-2 font-medium">时间</th>
|
||||
<th className="px-4 py-2 font-medium">操作人</th>
|
||||
<th className="px-4 py-2 font-medium">动作</th>
|
||||
<th className="px-4 py-2 font-medium">对象</th>
|
||||
<th className="px-4 py-2 font-medium">字段</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y">
|
||||
{rows.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={5} className="px-4 py-8 text-center text-gray-400">
|
||||
暂无记录
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
rows.map((e) => (
|
||||
<tr key={e.id} className="hover:bg-gray-50">
|
||||
<td className="whitespace-nowrap px-4 py-2 text-gray-500">
|
||||
{new Date(e.created_at).toLocaleString()}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-gray-700">{e.actor}</td>
|
||||
<td className="px-4 py-2 text-gray-700">
|
||||
{ACTION_LABEL[e.action] || e.action}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-gray-600">
|
||||
{ENTITY_LABEL[e.entity] || e.entity}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-xs text-gray-400">
|
||||
{e.fields.length ? e.fields.join(", ") : "—"}
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div className="mt-4 flex items-center justify-end gap-2 text-sm text-gray-600">
|
||||
<button
|
||||
disabled={page <= 1}
|
||||
onClick={() => setPage((p) => p - 1)}
|
||||
className="rounded border border-gray-300 px-3 py-1 disabled:opacity-50"
|
||||
>
|
||||
上一页
|
||||
</button>
|
||||
<span>
|
||||
{page} / {pages}
|
||||
</span>
|
||||
<button
|
||||
disabled={page >= pages}
|
||||
onClick={() => setPage((p) => p + 1)}
|
||||
className="rounded border border-gray-300 px-3 py-1 disabled:opacity-50"
|
||||
>
|
||||
下一页
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,305 @@
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { api, ApiError } from "../api";
|
||||
import type { Brand } from "../types";
|
||||
import { Tag, Pencil, Plus, Trash2, GitMerge, Search } from "lucide-react";
|
||||
|
||||
type EditState = { id: string; name: string };
|
||||
type MergeState = { source: Brand; targetId: string };
|
||||
|
||||
export default function BrandsPage() {
|
||||
const [rows, setRows] = useState<Brand[]>([]);
|
||||
const [error, setError] = useState("");
|
||||
const [query, setQuery] = useState("");
|
||||
const [creating, setCreating] = useState(false);
|
||||
const [newName, setNewName] = useState("");
|
||||
const [edit, setEdit] = useState<EditState | null>(null);
|
||||
const [merge, setMerge] = useState<MergeState | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
async function load() {
|
||||
setError("");
|
||||
try {
|
||||
const res = await api.listBrands();
|
||||
setRows(res.items);
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "加载失败");
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
}, []);
|
||||
|
||||
const filtered = useMemo(() => {
|
||||
const q = query.trim().toLowerCase();
|
||||
if (!q) return rows;
|
||||
return rows.filter((b) => b.name.toLowerCase().includes(q));
|
||||
}, [rows, query]);
|
||||
|
||||
function fail(e: unknown, fallback: string) {
|
||||
setError(e instanceof ApiError ? e.message : fallback);
|
||||
}
|
||||
|
||||
async function create() {
|
||||
if (!newName.trim()) return;
|
||||
setBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
await api.createBrand(newName.trim());
|
||||
setNewName("");
|
||||
setCreating(false);
|
||||
await load();
|
||||
} catch (e) {
|
||||
fail(e, "新建失败");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function saveEdit() {
|
||||
if (!edit || !edit.name.trim()) return;
|
||||
setBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
await api.updateBrand(edit.id, edit.name.trim());
|
||||
setEdit(null);
|
||||
await load();
|
||||
} catch (e) {
|
||||
fail(e, "保存失败");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function remove(b: Brand) {
|
||||
if (!confirm(`确认删除品牌「${b.name}」?`)) return;
|
||||
setError("");
|
||||
try {
|
||||
await api.deleteBrand(b.id);
|
||||
await load();
|
||||
} catch (e) {
|
||||
fail(e, "删除失败");
|
||||
}
|
||||
}
|
||||
|
||||
async function doMerge() {
|
||||
if (!merge || !merge.targetId) return;
|
||||
const target = rows.find((b) => b.id === merge.targetId);
|
||||
if (
|
||||
!confirm(
|
||||
`将「${merge.source.name}」的 ${merge.source.product_count} 个商品并入「${target?.name}」,并删除「${merge.source.name}」?`,
|
||||
)
|
||||
)
|
||||
return;
|
||||
setBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
await api.mergeBrands(merge.source.id, merge.targetId);
|
||||
setMerge(null);
|
||||
await load();
|
||||
} catch (e) {
|
||||
fail(e, "合并失败");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-4xl">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<div>
|
||||
<h2 className="text-lg font-semibold text-gray-800 flex items-center gap-2">
|
||||
<Tag className="h-5 w-5 text-emerald-600" /> 品牌管理
|
||||
</h2>
|
||||
<p className="text-sm text-gray-500 mt-1">
|
||||
维护品牌名录。可重命名、删除未被引用的品牌,或将重复品牌合并到一起。
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => {
|
||||
setCreating(true);
|
||||
setNewName("");
|
||||
}}
|
||||
className="px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 flex items-center gap-1.5"
|
||||
>
|
||||
<Plus className="h-4 w-4" /> 新建品牌
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-3 bg-red-50 text-red-700 text-sm rounded px-4 py-2">{error}</div>
|
||||
)}
|
||||
|
||||
<div className="mb-3 relative w-72">
|
||||
<Search className="absolute left-2 top-2.5 h-4 w-4 text-gray-400" />
|
||||
<input
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
placeholder="筛选品牌名"
|
||||
className="w-full rounded border border-gray-300 py-2 pl-8 pr-3 text-sm focus:border-emerald-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{creating && (
|
||||
<div className="mb-4 bg-white border rounded-lg p-5">
|
||||
<h3 className="font-medium text-gray-700 mb-3">新建品牌</h3>
|
||||
<div className="flex items-end gap-2">
|
||||
<label className="block flex-1">
|
||||
<span className="text-xs text-gray-500">品牌名称 *</span>
|
||||
<input
|
||||
autoFocus
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||
value={newName}
|
||||
onChange={(e) => setNewName(e.target.value)}
|
||||
onKeyDown={(e) => e.key === "Enter" && create()}
|
||||
placeholder="例如:可口可乐"
|
||||
/>
|
||||
</label>
|
||||
<button
|
||||
onClick={create}
|
||||
disabled={busy}
|
||||
className="px-4 py-2 rounded bg-emerald-600 text-white text-sm hover:bg-emerald-700 disabled:opacity-60"
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setCreating(false)}
|
||||
className="px-4 py-2 rounded border text-sm text-gray-600"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{merge && (
|
||||
<div className="mb-4 bg-white border rounded-lg p-5">
|
||||
<h3 className="font-medium text-gray-700 mb-3 flex items-center gap-1.5">
|
||||
<GitMerge className="h-4 w-4 text-emerald-600" /> 合并品牌
|
||||
</h3>
|
||||
<p className="text-sm text-gray-500 mb-3">
|
||||
把「{merge.source.name}」({merge.source.product_count} 个商品)合并到下面选择的品牌,源品牌将被删除。
|
||||
</p>
|
||||
<div className="flex items-end gap-2">
|
||||
<label className="block flex-1">
|
||||
<span className="text-xs text-gray-500">合并到</span>
|
||||
<select
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1 bg-white"
|
||||
value={merge.targetId}
|
||||
onChange={(e) => setMerge({ ...merge, targetId: e.target.value })}
|
||||
>
|
||||
<option value="">(请选择目标品牌)</option>
|
||||
{rows
|
||||
.filter((b) => b.id !== merge.source.id)
|
||||
.map((b) => (
|
||||
<option key={b.id} value={b.id}>
|
||||
{b.name}({b.product_count})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
<button
|
||||
onClick={doMerge}
|
||||
disabled={busy || !merge.targetId}
|
||||
className="px-4 py-2 rounded bg-emerald-600 text-white text-sm hover:bg-emerald-700 disabled:opacity-60"
|
||||
>
|
||||
合并
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setMerge(null)}
|
||||
className="px-4 py-2 rounded border text-sm text-gray-600"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="bg-white border rounded-lg overflow-hidden">
|
||||
<table className="w-full text-sm">
|
||||
<thead className="bg-gray-50 text-gray-500 text-left">
|
||||
<tr>
|
||||
<th className="px-4 py-2 font-medium">品牌</th>
|
||||
<th className="px-4 py-2 font-medium">商品数</th>
|
||||
<th className="px-4 py-2 font-medium"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y">
|
||||
{filtered.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={3} className="px-4 py-8 text-center text-gray-400">
|
||||
{rows.length === 0 ? "暂无品牌" : "无匹配品牌"}
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
filtered.map((b) => (
|
||||
<tr key={b.id} className="hover:bg-gray-50">
|
||||
<td className="px-4 py-2 text-gray-800">
|
||||
{edit && edit.id === b.id ? (
|
||||
<input
|
||||
autoFocus
|
||||
className="border rounded px-2 py-1 text-sm w-64"
|
||||
value={edit.name}
|
||||
onChange={(e) => setEdit({ ...edit, name: e.target.value })}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter") saveEdit();
|
||||
if (e.key === "Escape") setEdit(null);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<span className="font-medium">{b.name}</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-gray-600">{b.product_count}</td>
|
||||
<td className="px-4 py-2 text-right whitespace-nowrap">
|
||||
{edit && edit.id === b.id ? (
|
||||
<>
|
||||
<button
|
||||
onClick={saveEdit}
|
||||
disabled={busy}
|
||||
className="text-emerald-600 hover:text-emerald-700 text-xs mr-3"
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setEdit(null)}
|
||||
className="text-gray-400 hover:text-gray-600 text-xs"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<button
|
||||
onClick={() => setEdit({ id: b.id, name: b.name })}
|
||||
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||
title="重命名"
|
||||
>
|
||||
<Pencil className="h-4 w-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setMerge({ source: b, targetId: "" })}
|
||||
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||
title="合并到其它品牌"
|
||||
>
|
||||
<GitMerge className="h-4 w-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => remove(b)}
|
||||
className="text-gray-400 hover:text-red-600"
|
||||
title="删除"
|
||||
>
|
||||
<Trash2 className="h-4 w-4" />
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,311 @@
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { api, ApiError } from "../api";
|
||||
import type { Category, CategoryInput } from "../types";
|
||||
import { FolderTree, Pencil, Plus, Trash2 } from "lucide-react";
|
||||
|
||||
type FormState = {
|
||||
mode: "create" | "edit";
|
||||
id?: string;
|
||||
name_zh: string;
|
||||
name_en: string;
|
||||
slug: string;
|
||||
parent_id: string; // "" = top level
|
||||
gpc_brick_code: string;
|
||||
};
|
||||
|
||||
function emptyForm(parentId = ""): FormState {
|
||||
return {
|
||||
mode: "create",
|
||||
name_zh: "",
|
||||
name_en: "",
|
||||
slug: "",
|
||||
parent_id: parentId,
|
||||
gpc_brick_code: "",
|
||||
};
|
||||
}
|
||||
|
||||
export default function CategoriesPage() {
|
||||
const [rows, setRows] = useState<Category[]>([]);
|
||||
const [error, setError] = useState("");
|
||||
const [form, setForm] = useState<FormState | null>(null);
|
||||
|
||||
async function load() {
|
||||
setError("");
|
||||
try {
|
||||
const res = await api.listCategories();
|
||||
setRows(res.items);
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "加载失败");
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
}, []);
|
||||
|
||||
async function remove(c: Category) {
|
||||
if (!confirm(`确认删除分类「${c.name_zh}」(${c.path})?`)) return;
|
||||
setError("");
|
||||
try {
|
||||
await api.deleteCategory(c.id);
|
||||
await load();
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "删除失败");
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-5xl">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<div>
|
||||
<h2 className="text-lg font-semibold text-gray-800 flex items-center gap-2">
|
||||
<FolderTree className="h-5 w-5 text-emerald-600" /> 分类管理
|
||||
</h2>
|
||||
<p className="text-sm text-gray-500 mt-1">
|
||||
维护商品分类树。英文标识(slug)用于分类路径,新建后不可修改;可重命名、移动层级、删除空分类。
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => setForm(emptyForm())}
|
||||
className="px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 flex items-center gap-1.5"
|
||||
>
|
||||
<Plus className="h-4 w-4" /> 新建顶级分类
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-3 bg-red-50 text-red-700 text-sm rounded px-4 py-2">{error}</div>
|
||||
)}
|
||||
|
||||
{form && (
|
||||
<CategoryForm
|
||||
form={form}
|
||||
categories={rows}
|
||||
onClose={() => setForm(null)}
|
||||
onSaved={() => {
|
||||
setForm(null);
|
||||
load();
|
||||
}}
|
||||
onError={setError}
|
||||
/>
|
||||
)}
|
||||
|
||||
<div className="bg-white border rounded-lg overflow-hidden">
|
||||
<table className="w-full text-sm">
|
||||
<thead className="bg-gray-50 text-gray-500 text-left">
|
||||
<tr>
|
||||
<th className="px-4 py-2 font-medium">名称</th>
|
||||
<th className="px-4 py-2 font-medium">路径</th>
|
||||
<th className="px-4 py-2 font-medium">GPC</th>
|
||||
<th className="px-4 py-2 font-medium">商品数</th>
|
||||
<th className="px-4 py-2 font-medium"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y">
|
||||
{rows.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={5} className="px-4 py-8 text-center text-gray-400">
|
||||
暂无分类
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
rows.map((c) => (
|
||||
<tr key={c.id} className="hover:bg-gray-50">
|
||||
<td className="px-4 py-2 text-gray-800">
|
||||
<span style={{ paddingLeft: `${c.level * 18}px` }} className="inline-flex items-center gap-2">
|
||||
{c.level > 0 && <span className="text-gray-300">└</span>}
|
||||
<span className="font-medium">{c.name_zh}</span>
|
||||
{c.name_en && <span className="text-xs text-gray-400">{c.name_en}</span>}
|
||||
</span>
|
||||
</td>
|
||||
<td className="px-4 py-2 text-gray-500">
|
||||
<code className="text-xs">{c.path}</code>
|
||||
</td>
|
||||
<td className="px-4 py-2 text-gray-500 text-xs">{c.gpc_brick_code || "—"}</td>
|
||||
<td className="px-4 py-2 text-gray-600">{c.product_count}</td>
|
||||
<td className="px-4 py-2 text-right whitespace-nowrap">
|
||||
<button
|
||||
onClick={() => setForm(emptyForm(c.id))}
|
||||
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||
title="新增子分类"
|
||||
>
|
||||
<Plus className="h-4 w-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() =>
|
||||
setForm({
|
||||
mode: "edit",
|
||||
id: c.id,
|
||||
name_zh: c.name_zh,
|
||||
name_en: c.name_en ?? "",
|
||||
slug: c.path,
|
||||
parent_id: c.parent_id ?? "",
|
||||
gpc_brick_code: c.gpc_brick_code ?? "",
|
||||
})
|
||||
}
|
||||
className="text-gray-400 hover:text-emerald-600 mr-3"
|
||||
title="编辑"
|
||||
>
|
||||
<Pencil className="h-4 w-4" />
|
||||
</button>
|
||||
<button
|
||||
onClick={() => remove(c)}
|
||||
className="text-gray-400 hover:text-red-600"
|
||||
title="删除"
|
||||
>
|
||||
<Trash2 className="h-4 w-4" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function CategoryForm({
|
||||
form,
|
||||
categories,
|
||||
onClose,
|
||||
onSaved,
|
||||
onError,
|
||||
}: {
|
||||
form: FormState;
|
||||
categories: Category[];
|
||||
onClose: () => void;
|
||||
onSaved: () => void;
|
||||
onError: (msg: string) => void;
|
||||
}) {
|
||||
const [state, setState] = useState<FormState>(form);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
// When editing, the node itself and its descendants are not valid parents.
|
||||
const parentOptions = useMemo(() => {
|
||||
if (state.mode === "create") return categories;
|
||||
const self = categories.find((c) => c.id === state.id);
|
||||
if (!self) return categories;
|
||||
return categories.filter(
|
||||
(c) => c.id !== self.id && !c.path.startsWith(self.path + "."),
|
||||
);
|
||||
}, [categories, state.mode, state.id]);
|
||||
|
||||
function set<K extends keyof FormState>(key: K, value: FormState[K]) {
|
||||
setState((s) => ({ ...s, [key]: value }));
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (!state.name_zh.trim()) {
|
||||
onError("分类名称不能为空");
|
||||
return;
|
||||
}
|
||||
setBusy(true);
|
||||
onError("");
|
||||
const body: CategoryInput = {
|
||||
name_zh: state.name_zh.trim(),
|
||||
name_en: state.name_en.trim() || null,
|
||||
parent_id: state.parent_id || null,
|
||||
gpc_brick_code: state.gpc_brick_code.trim() || null,
|
||||
};
|
||||
if (state.mode === "create") body.slug = state.slug.trim() || null;
|
||||
try {
|
||||
if (state.mode === "create") {
|
||||
await api.createCategory(body);
|
||||
} else if (state.id) {
|
||||
await api.updateCategory(state.id, body);
|
||||
}
|
||||
onSaved();
|
||||
} catch (e) {
|
||||
onError(e instanceof ApiError ? e.message : "保存失败");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mb-4 bg-white border rounded-lg p-5">
|
||||
<h3 className="font-medium text-gray-700 mb-3">
|
||||
{state.mode === "create" ? "新建分类" : "编辑分类"}
|
||||
</h3>
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">中文名称 *</span>
|
||||
<input
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||
value={state.name_zh}
|
||||
onChange={(e) => set("name_zh", e.target.value)}
|
||||
placeholder="例如:饮料"
|
||||
/>
|
||||
</label>
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">英文名称(可选)</span>
|
||||
<input
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||
value={state.name_en}
|
||||
onChange={(e) => set("name_en", e.target.value)}
|
||||
placeholder="Beverages"
|
||||
/>
|
||||
</label>
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">上级分类</span>
|
||||
<select
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1 bg-white"
|
||||
value={state.parent_id}
|
||||
onChange={(e) => set("parent_id", e.target.value)}
|
||||
>
|
||||
<option value="">(顶级分类)</option>
|
||||
{parentOptions.map((c) => (
|
||||
<option key={c.id} value={c.id}>
|
||||
{"\u00A0".repeat(c.level * 2)}
|
||||
{c.name_zh} ({c.path})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
{state.mode === "create" ? (
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">英文标识 slug(可选,留空自动生成)</span>
|
||||
<input
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||
value={state.slug}
|
||||
onChange={(e) => set("slug", e.target.value)}
|
||||
placeholder="beverages"
|
||||
/>
|
||||
</label>
|
||||
) : (
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">路径(不可修改)</span>
|
||||
<input
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1 bg-gray-50 text-gray-400"
|
||||
value={state.slug}
|
||||
disabled
|
||||
/>
|
||||
</label>
|
||||
)}
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">GPC Brick 编码(可选)</span>
|
||||
<input
|
||||
className="w-full border rounded-md px-3 py-2 text-sm mt-1"
|
||||
value={state.gpc_brick_code}
|
||||
onChange={(e) => set("gpc_brick_code", e.target.value)}
|
||||
placeholder="10000224"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<div className="mt-4 flex gap-2">
|
||||
<button
|
||||
onClick={submit}
|
||||
disabled={busy}
|
||||
className="px-4 py-2 rounded bg-emerald-600 text-white text-sm hover:bg-emerald-700 disabled:opacity-60"
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
<button onClick={onClose} className="px-4 py-2 rounded border text-sm text-gray-600">
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -9,6 +9,8 @@ import {
|
||||
} from "../types";
|
||||
import {
|
||||
ArrowLeft,
|
||||
ChevronLeft,
|
||||
ChevronRight,
|
||||
Plus,
|
||||
Save,
|
||||
Trash2,
|
||||
@@ -88,10 +90,18 @@ const inputCls =
|
||||
export default function ProductDetail({
|
||||
id,
|
||||
onBack,
|
||||
ids = [],
|
||||
onNavigate,
|
||||
}: {
|
||||
id: string;
|
||||
onBack: () => void;
|
||||
ids?: string[];
|
||||
onNavigate?: (id: string) => void;
|
||||
}) {
|
||||
const navIndex = ids.indexOf(id);
|
||||
const prevId = navIndex > 0 ? ids[navIndex - 1] : null;
|
||||
const nextId =
|
||||
navIndex >= 0 && navIndex < ids.length - 1 ? ids[navIndex + 1] : null;
|
||||
const [d, setD] = useState<Detail | null>(null);
|
||||
const [brands, setBrands] = useState<Brand[]>([]);
|
||||
const [categories, setCategories] = useState<Category[]>([]);
|
||||
@@ -226,12 +236,35 @@ export default function ProductDetail({
|
||||
return (
|
||||
<div className="mx-auto max-w-5xl space-y-5">
|
||||
<div className="flex items-center justify-between">
|
||||
<button
|
||||
onClick={onBack}
|
||||
className="flex items-center gap-1 text-sm text-gray-600 hover:text-gray-900"
|
||||
>
|
||||
<ArrowLeft className="h-4 w-4" /> 返回列表
|
||||
</button>
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={onBack}
|
||||
className="flex items-center gap-1 text-sm text-gray-600 hover:text-gray-900"
|
||||
>
|
||||
<ArrowLeft className="h-4 w-4" /> 返回列表
|
||||
</button>
|
||||
{ids.length > 1 && navIndex >= 0 && (
|
||||
<div className="ml-2 flex items-center gap-1 text-sm">
|
||||
<button
|
||||
onClick={() => prevId && onNavigate?.(prevId)}
|
||||
disabled={!prevId}
|
||||
className="flex items-center gap-1 rounded border border-gray-300 px-2 py-1 text-gray-600 hover:bg-gray-50 disabled:opacity-40"
|
||||
>
|
||||
<ChevronLeft className="h-4 w-4" /> 上一个
|
||||
</button>
|
||||
<span className="text-xs text-gray-400">
|
||||
{navIndex + 1} / {ids.length}
|
||||
</span>
|
||||
<button
|
||||
onClick={() => nextId && onNavigate?.(nextId)}
|
||||
disabled={!nextId}
|
||||
className="flex items-center gap-1 rounded border border-gray-300 px-2 py-1 text-gray-600 hover:bg-gray-50 disabled:opacity-40"
|
||||
>
|
||||
下一个 <ChevronRight className="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
{msg && <span className="text-sm text-emerald-600">{msg}</span>}
|
||||
{error && <span className="text-sm text-red-600">{error}</span>}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { api } from "../api";
|
||||
import { FIELD_LABELS, ProductRow } from "../types";
|
||||
import { Search, AlertCircle } from "lucide-react";
|
||||
import { api, ApiError } from "../api";
|
||||
import { Brand, Category, FIELD_LABELS, ProductRow } from "../types";
|
||||
import { Search, AlertCircle, Plus } from "lucide-react";
|
||||
|
||||
const STATUS_LABEL: Record<string, string> = {
|
||||
active: "在用",
|
||||
@@ -27,18 +27,25 @@ function QualityBadge({ score }: { score: number }) {
|
||||
export default function ProductList({
|
||||
onOpen,
|
||||
}: {
|
||||
onOpen: (id: string) => void;
|
||||
onOpen: (id: string, ids: string[]) => void;
|
||||
}) {
|
||||
const [q, setQ] = useState("");
|
||||
const [input, setInput] = useState("");
|
||||
const [page, setPage] = useState(1);
|
||||
const [size] = useState(20);
|
||||
const [size, setSize] = useState(20);
|
||||
const [jump, setJump] = useState("");
|
||||
const [rows, setRows] = useState<ProductRow[]>([]);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
const [creating, setCreating] = useState(false);
|
||||
const [selected, setSelected] = useState<Set<string>>(new Set());
|
||||
const [categories, setCategories] = useState<Category[]>([]);
|
||||
const [bulkStatus, setBulkStatus] = useState("");
|
||||
const [bulkCategory, setBulkCategory] = useState("");
|
||||
const [bulkBusy, setBulkBusy] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
function reload() {
|
||||
setLoading(true);
|
||||
setError("");
|
||||
api
|
||||
@@ -49,8 +56,72 @@ export default function ProductList({
|
||||
})
|
||||
.catch((e) => setError(e.message))
|
||||
.finally(() => setLoading(false));
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
setSelected(new Set());
|
||||
reload();
|
||||
}, [q, page, size]);
|
||||
|
||||
useEffect(() => {
|
||||
api.listCategories().then((r) => setCategories(r.items)).catch(() => {});
|
||||
}, []);
|
||||
|
||||
function toggle(id: string) {
|
||||
setSelected((prev) => {
|
||||
const next = new Set(prev);
|
||||
if (next.has(id)) next.delete(id);
|
||||
else next.add(id);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
|
||||
function toggleAll() {
|
||||
setSelected((prev) =>
|
||||
prev.size === rows.length ? new Set() : new Set(rows.map((r) => r.id)),
|
||||
);
|
||||
}
|
||||
|
||||
async function applyBulkStatus() {
|
||||
if (!bulkStatus || selected.size === 0) return;
|
||||
setBulkBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
await api.bulkProducts({
|
||||
ids: [...selected],
|
||||
action: "status",
|
||||
status: bulkStatus,
|
||||
});
|
||||
setSelected(new Set());
|
||||
setBulkStatus("");
|
||||
reload();
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "批量操作失败");
|
||||
} finally {
|
||||
setBulkBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function applyBulkCategory() {
|
||||
if (selected.size === 0) return;
|
||||
setBulkBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
await api.bulkProducts({
|
||||
ids: [...selected],
|
||||
action: "category",
|
||||
category_id: bulkCategory || null,
|
||||
});
|
||||
setSelected(new Set());
|
||||
setBulkCategory("");
|
||||
reload();
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "批量操作失败");
|
||||
} finally {
|
||||
setBulkBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
const pages = Math.max(1, Math.ceil(total / size));
|
||||
|
||||
return (
|
||||
@@ -79,19 +150,101 @@ export default function ProductList({
|
||||
<button className="rounded bg-emerald-600 px-3 py-2 text-sm text-white hover:bg-emerald-700">
|
||||
搜索
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setCreating(true)}
|
||||
className="flex items-center gap-1 rounded bg-gray-700 px-3 py-2 text-sm text-white hover:bg-gray-800"
|
||||
>
|
||||
<Plus className="h-4 w-4" /> 新建商品
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{creating && (
|
||||
<CreateProductModal
|
||||
onClose={() => setCreating(false)}
|
||||
onCreated={(id) => {
|
||||
setCreating(false);
|
||||
onOpen(id, [id]);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<div className="mb-3 rounded bg-red-50 px-3 py-2 text-sm text-red-600">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{selected.size > 0 && (
|
||||
<div className="mb-3 flex flex-wrap items-center gap-3 rounded-lg border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm">
|
||||
<span className="font-medium text-emerald-800">
|
||||
已选 {selected.size} 项
|
||||
</span>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-gray-500">改状态</span>
|
||||
<select
|
||||
value={bulkStatus}
|
||||
onChange={(e) => setBulkStatus(e.target.value)}
|
||||
className="rounded border border-gray-300 bg-white px-2 py-1"
|
||||
>
|
||||
<option value="">选择</option>
|
||||
<option value="active">在用</option>
|
||||
<option value="deprecated">已停用</option>
|
||||
<option value="merged">已合并</option>
|
||||
</select>
|
||||
<button
|
||||
onClick={applyBulkStatus}
|
||||
disabled={bulkBusy || !bulkStatus}
|
||||
className="rounded bg-emerald-600 px-3 py-1 text-white hover:bg-emerald-700 disabled:opacity-50"
|
||||
>
|
||||
应用
|
||||
</button>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="text-gray-500">改分类</span>
|
||||
<select
|
||||
value={bulkCategory}
|
||||
onChange={(e) => setBulkCategory(e.target.value)}
|
||||
className="rounded border border-gray-300 bg-white px-2 py-1"
|
||||
>
|
||||
<option value="">(未分类)</option>
|
||||
{categories.map((c) => (
|
||||
<option key={c.id} value={c.id}>
|
||||
{"\u00A0".repeat(c.level * 2)}
|
||||
{c.name_zh}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<button
|
||||
onClick={applyBulkCategory}
|
||||
disabled={bulkBusy}
|
||||
className="rounded bg-emerald-600 px-3 py-1 text-white hover:bg-emerald-700 disabled:opacity-50"
|
||||
>
|
||||
应用
|
||||
</button>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => setSelected(new Set())}
|
||||
className="text-gray-500 hover:text-gray-700"
|
||||
>
|
||||
取消选择
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="overflow-hidden rounded-lg border border-gray-200 bg-white">
|
||||
<table className="w-full text-sm">
|
||||
<thead className="bg-gray-50 text-left text-xs uppercase text-gray-500">
|
||||
<tr>
|
||||
<th className="w-10 px-4 py-3">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={rows.length > 0 && selected.size === rows.length}
|
||||
onChange={toggleAll}
|
||||
aria-label="全选"
|
||||
/>
|
||||
</th>
|
||||
<th className="px-4 py-3">名称</th>
|
||||
<th className="px-4 py-3">品牌</th>
|
||||
<th className="px-4 py-3">条码</th>
|
||||
@@ -104,13 +257,13 @@ export default function ProductList({
|
||||
<tbody className="divide-y divide-gray-100">
|
||||
{loading ? (
|
||||
<tr>
|
||||
<td colSpan={7} className="px-4 py-8 text-center text-gray-400">
|
||||
<td colSpan={8} className="px-4 py-8 text-center text-gray-400">
|
||||
加载中…
|
||||
</td>
|
||||
</tr>
|
||||
) : rows.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={7} className="px-4 py-8 text-center text-gray-400">
|
||||
<td colSpan={8} className="px-4 py-8 text-center text-gray-400">
|
||||
暂无数据
|
||||
</td>
|
||||
</tr>
|
||||
@@ -118,9 +271,22 @@ export default function ProductList({
|
||||
rows.map((r) => (
|
||||
<tr
|
||||
key={r.id}
|
||||
onClick={() => onOpen(r.id)}
|
||||
className="cursor-pointer hover:bg-emerald-50/50"
|
||||
onClick={() => onOpen(r.id, rows.map((x) => x.id))}
|
||||
className={`cursor-pointer hover:bg-emerald-50/50 ${
|
||||
selected.has(r.id) ? "bg-emerald-50/60" : ""
|
||||
}`}
|
||||
>
|
||||
<td
|
||||
className="px-4 py-3"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={selected.has(r.id)}
|
||||
onChange={() => toggle(r.id)}
|
||||
aria-label="选择"
|
||||
/>
|
||||
</td>
|
||||
<td className="px-4 py-3 font-medium text-gray-800">{r.name}</td>
|
||||
<td className="px-4 py-3 text-gray-600">{r.brand || "—"}</td>
|
||||
<td className="px-4 py-3 font-mono text-xs text-gray-500">
|
||||
@@ -154,7 +320,25 @@ export default function ProductList({
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div className="mt-4 flex items-center justify-end gap-2 text-sm text-gray-600">
|
||||
<div className="mt-4 flex flex-wrap items-center justify-end gap-2 text-sm text-gray-600">
|
||||
<div className="mr-auto flex items-center gap-1">
|
||||
<span>每页</span>
|
||||
<select
|
||||
value={size}
|
||||
onChange={(e) => {
|
||||
setSize(Number(e.target.value));
|
||||
setPage(1);
|
||||
}}
|
||||
className="rounded border border-gray-300 px-2 py-1"
|
||||
>
|
||||
{[20, 50, 100].map((n) => (
|
||||
<option key={n} value={n}>
|
||||
{n}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<span>条 · 共 {total} 条</span>
|
||||
</div>
|
||||
<button
|
||||
disabled={page <= 1}
|
||||
onClick={() => setPage((p) => p - 1)}
|
||||
@@ -172,6 +356,159 @@ export default function ProductList({
|
||||
>
|
||||
下一页
|
||||
</button>
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
const n = Number(jump);
|
||||
if (Number.isFinite(n) && n >= 1) {
|
||||
setPage(Math.min(Math.max(1, Math.trunc(n)), pages));
|
||||
setJump("");
|
||||
}
|
||||
}}
|
||||
className="flex items-center gap-1"
|
||||
>
|
||||
<span>跳至</span>
|
||||
<input
|
||||
value={jump}
|
||||
onChange={(e) => setJump(e.target.value.replace(/[^0-9]/g, ""))}
|
||||
placeholder={String(page)}
|
||||
className="w-14 rounded border border-gray-300 px-2 py-1 text-center"
|
||||
aria-label="跳转页码"
|
||||
/>
|
||||
<button
|
||||
type="submit"
|
||||
className="rounded border border-gray-300 px-3 py-1 hover:bg-gray-50"
|
||||
>
|
||||
前往
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function CreateProductModal({
|
||||
onClose,
|
||||
onCreated,
|
||||
}: {
|
||||
onClose: () => void;
|
||||
onCreated: (id: string) => void;
|
||||
}) {
|
||||
const [name, setName] = useState("");
|
||||
const [gtin, setGtin] = useState("");
|
||||
const [brand, setBrand] = useState("");
|
||||
const [categoryId, setCategoryId] = useState("");
|
||||
const [brands, setBrands] = useState<Brand[]>([]);
|
||||
const [categories, setCategories] = useState<Category[]>([]);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
api.listBrands().then((r) => setBrands(r.items)).catch(() => {});
|
||||
api.listCategories().then((r) => setCategories(r.items)).catch(() => {});
|
||||
}, []);
|
||||
|
||||
async function submit() {
|
||||
if (!name.trim()) {
|
||||
setError("名称不能为空");
|
||||
return;
|
||||
}
|
||||
setBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
const created = await api.createProduct({
|
||||
name: name.trim(),
|
||||
gtin: gtin.trim() || null,
|
||||
brand_name: brand.trim() || null,
|
||||
category_id: categoryId || null,
|
||||
status: "active",
|
||||
});
|
||||
onCreated(created.id);
|
||||
} catch (e) {
|
||||
setError(e instanceof ApiError ? e.message : "新建失败");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-20 flex items-center justify-center bg-black/30">
|
||||
<div className="w-full max-w-md rounded-lg bg-white p-6 shadow-lg">
|
||||
<h3 className="mb-4 text-base font-semibold text-gray-800">新建商品</h3>
|
||||
{error && (
|
||||
<div className="mb-3 rounded bg-red-50 px-3 py-2 text-sm text-red-600">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
<div className="space-y-3">
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">名称 *</span>
|
||||
<input
|
||||
autoFocus
|
||||
className="mt-1 w-full rounded border border-gray-300 px-3 py-2 text-sm"
|
||||
value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
placeholder="商品名称"
|
||||
/>
|
||||
</label>
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">条码 (GTIN,可选)</span>
|
||||
<input
|
||||
className="mt-1 w-full rounded border border-gray-300 px-3 py-2 text-sm"
|
||||
value={gtin}
|
||||
onChange={(e) => setGtin(e.target.value)}
|
||||
placeholder="8/12/13/14 位"
|
||||
/>
|
||||
</label>
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">品牌(不存在将自动创建,可选)</span>
|
||||
<input
|
||||
list="create-brand-list"
|
||||
className="mt-1 w-full rounded border border-gray-300 px-3 py-2 text-sm"
|
||||
value={brand}
|
||||
onChange={(e) => setBrand(e.target.value)}
|
||||
/>
|
||||
<datalist id="create-brand-list">
|
||||
{brands.map((b) => (
|
||||
<option key={b.id} value={b.name} />
|
||||
))}
|
||||
</datalist>
|
||||
</label>
|
||||
<label className="block">
|
||||
<span className="text-xs text-gray-500">品类(可选)</span>
|
||||
<select
|
||||
className="mt-1 w-full rounded border border-gray-300 bg-white px-3 py-2 text-sm"
|
||||
value={categoryId}
|
||||
onChange={(e) => setCategoryId(e.target.value)}
|
||||
>
|
||||
<option value="">(未分类)</option>
|
||||
{categories.map((c) => (
|
||||
<option key={c.id} value={c.id}>
|
||||
{"\u00A0".repeat(c.level * 2)}
|
||||
{c.name_zh} ({c.path})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<p className="mt-3 text-xs text-gray-400">
|
||||
创建后将进入详情页,可继续补全营养、图片、多条码等信息。
|
||||
</p>
|
||||
<div className="mt-4 flex justify-end gap-2">
|
||||
<button
|
||||
onClick={onClose}
|
||||
className="rounded border px-4 py-2 text-sm text-gray-600"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
<button
|
||||
onClick={submit}
|
||||
disabled={busy}
|
||||
className="rounded bg-emerald-600 px-4 py-2 text-sm text-white hover:bg-emerald-700 disabled:opacity-60"
|
||||
>
|
||||
{busy ? "创建中…" : "创建并编辑"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { api, ApiError } from "../api";
|
||||
import type { AdminStats } from "../types";
|
||||
import { BarChart3, Package, CheckCircle2, Tag, FolderTree, Inbox } from "lucide-react";
|
||||
|
||||
const STATUS_LABEL: Record<string, string> = {
|
||||
active: "在用",
|
||||
merged: "已合并",
|
||||
deprecated: "已停用",
|
||||
};
|
||||
|
||||
function Card({
|
||||
icon,
|
||||
label,
|
||||
value,
|
||||
hint,
|
||||
}: {
|
||||
icon: React.ReactNode;
|
||||
label: string;
|
||||
value: string | number;
|
||||
hint?: string;
|
||||
}) {
|
||||
return (
|
||||
<div className="rounded-lg border bg-white p-5">
|
||||
<div className="flex items-center gap-2 text-sm text-gray-500">
|
||||
{icon}
|
||||
{label}
|
||||
</div>
|
||||
<div className="mt-2 text-2xl font-semibold text-gray-800">{value}</div>
|
||||
{hint && <div className="mt-1 text-xs text-gray-400">{hint}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default function StatsPage() {
|
||||
const [stats, setStats] = useState<AdminStats | null>(null);
|
||||
const [error, setError] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
api
|
||||
.stats()
|
||||
.then(setStats)
|
||||
.catch((e) => setError(e instanceof ApiError ? e.message : "加载失败"));
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-5xl">
|
||||
<h2 className="mb-4 flex items-center gap-2 text-lg font-semibold text-gray-800">
|
||||
<BarChart3 className="h-5 w-5 text-emerald-600" /> 数据概览
|
||||
</h2>
|
||||
|
||||
{error && (
|
||||
<div className="mb-3 rounded bg-red-50 px-4 py-2 text-sm text-red-700">{error}</div>
|
||||
)}
|
||||
|
||||
{!stats ? (
|
||||
<div className="text-sm text-gray-400">加载中…</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="grid grid-cols-2 gap-4 md:grid-cols-3">
|
||||
<Card
|
||||
icon={<Package className="h-4 w-4" />}
|
||||
label="商品总数"
|
||||
value={stats.products.toLocaleString()}
|
||||
/>
|
||||
<Card
|
||||
icon={<CheckCircle2 className="h-4 w-4 text-emerald-600" />}
|
||||
label="合格档案"
|
||||
value={stats.qualified.toLocaleString()}
|
||||
hint={`质量分 ≥ ${stats.min_score} 且在用`}
|
||||
/>
|
||||
<Card
|
||||
icon={<BarChart3 className="h-4 w-4" />}
|
||||
label="平均质量分"
|
||||
value={Math.round(stats.avg_quality * 100)}
|
||||
hint="满分 100"
|
||||
/>
|
||||
<Card
|
||||
icon={<Tag className="h-4 w-4" />}
|
||||
label="品牌数"
|
||||
value={stats.brands.toLocaleString()}
|
||||
/>
|
||||
<Card
|
||||
icon={<FolderTree className="h-4 w-4" />}
|
||||
label="分类数"
|
||||
value={stats.categories.toLocaleString()}
|
||||
/>
|
||||
<Card
|
||||
icon={<Inbox className="h-4 w-4" />}
|
||||
label="待审核投稿"
|
||||
value={stats.pending_submissions.toLocaleString()}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="mt-6 rounded-lg border bg-white p-5">
|
||||
<h3 className="mb-3 text-sm font-medium text-gray-700">按状态分布</h3>
|
||||
<div className="space-y-2">
|
||||
{Object.keys(stats.by_status).length === 0 ? (
|
||||
<div className="text-sm text-gray-400">暂无数据</div>
|
||||
) : (
|
||||
Object.entries(stats.by_status).map(([st, n]) => {
|
||||
const pct = stats.products > 0 ? (n / stats.products) * 100 : 0;
|
||||
return (
|
||||
<div key={st} className="flex items-center gap-3 text-sm">
|
||||
<span className="w-16 text-gray-600">
|
||||
{STATUS_LABEL[st] || st}
|
||||
</span>
|
||||
<div className="h-3 flex-1 overflow-hidden rounded bg-gray-100">
|
||||
<div
|
||||
className="h-full bg-emerald-500"
|
||||
style={{ width: `${pct}%` }}
|
||||
/>
|
||||
</div>
|
||||
<span className="w-12 text-right text-gray-500">{n}</span>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -56,7 +56,7 @@ export default function SubmissionsPage({ onPending }: { onPending?: (n: number)
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div className="mx-auto max-w-5xl">
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
{STATUS_TABS.map((t) => (
|
||||
<button
|
||||
@@ -193,7 +193,7 @@ function SubmissionView({ id, onBack }: { id: string; onBack: () => void }) {
|
||||
const nutri = Object.entries(p.nutriments || {});
|
||||
|
||||
return (
|
||||
<div className="max-w-3xl">
|
||||
<div className="mx-auto max-w-3xl">
|
||||
<button onClick={onBack} className="text-sm text-gray-500 flex items-center gap-1 mb-4">
|
||||
<ArrowLeft className="h-4 w-4" /> 返回投稿队列
|
||||
</button>
|
||||
|
||||
@@ -66,6 +66,7 @@ export interface ProductDetail {
|
||||
export interface Brand {
|
||||
id: string;
|
||||
name: string;
|
||||
product_count: number;
|
||||
}
|
||||
|
||||
export interface Category {
|
||||
@@ -74,6 +75,17 @@ export interface Category {
|
||||
name_en: string | null;
|
||||
path: string;
|
||||
level: number;
|
||||
parent_id: string | null;
|
||||
gpc_brick_code: string | null;
|
||||
product_count: number;
|
||||
}
|
||||
|
||||
export interface CategoryInput {
|
||||
name_zh: string;
|
||||
name_en?: string | null;
|
||||
slug?: string | null;
|
||||
parent_id?: string | null;
|
||||
gpc_brick_code?: string | null;
|
||||
}
|
||||
|
||||
export interface AuditEntry {
|
||||
@@ -84,6 +96,27 @@ export interface AuditEntry {
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface AuditLogRow {
|
||||
id: string;
|
||||
actor: string;
|
||||
action: string;
|
||||
entity: string;
|
||||
entity_id: string | null;
|
||||
fields: string[];
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface AdminStats {
|
||||
products: number;
|
||||
qualified: number;
|
||||
min_score: number;
|
||||
by_status: Record<string, number>;
|
||||
brands: number;
|
||||
categories: number;
|
||||
pending_submissions: number;
|
||||
avg_quality: number;
|
||||
}
|
||||
|
||||
export interface SubmissionRow {
|
||||
id: string;
|
||||
gtin: string | null;
|
||||
|
||||
@@ -64,7 +64,11 @@ func (h *Handler) Router() http.Handler {
|
||||
r.Group(func(r chi.Router) {
|
||||
r.Use(h.authn.Middleware)
|
||||
r.Get("/api/me", h.Me)
|
||||
r.Get("/api/stats", h.Stats)
|
||||
r.Get("/api/audit", h.ListAllAudit)
|
||||
r.Get("/api/products", h.ListProducts)
|
||||
r.Post("/api/products", h.CreateProduct)
|
||||
r.Post("/api/products/bulk", h.BulkProducts)
|
||||
r.Get("/api/products/{id}", h.GetProduct)
|
||||
r.Put("/api/products/{id}", h.UpdateProduct)
|
||||
r.Get("/api/products/{id}/audit", h.ListAudit)
|
||||
@@ -76,7 +80,14 @@ func (h *Handler) Router() http.Handler {
|
||||
r.Delete("/api/products/{id}/barcodes/{barcodeID}", h.DeleteBarcode)
|
||||
r.Post("/api/products/{id}/barcodes/{barcodeID}/primary", h.SetPrimaryBarcode)
|
||||
r.Get("/api/brands", h.ListBrands)
|
||||
r.Post("/api/brands", h.CreateBrand)
|
||||
r.Put("/api/brands/{id}", h.UpdateBrand)
|
||||
r.Post("/api/brands/{id}/merge", h.MergeBrands)
|
||||
r.Delete("/api/brands/{id}", h.DeleteBrand)
|
||||
r.Get("/api/categories", h.ListCategories)
|
||||
r.Post("/api/categories", h.CreateCategory)
|
||||
r.Put("/api/categories/{id}", h.UpdateCategory)
|
||||
r.Delete("/api/categories/{id}", h.DeleteCategory)
|
||||
|
||||
r.Get("/api/submissions", h.ListSubmissions)
|
||||
r.Get("/api/submissions/{id}", h.GetSubmission)
|
||||
@@ -172,6 +183,99 @@ func (h *Handler) GetProduct(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusOK, d)
|
||||
}
|
||||
|
||||
// CreateProduct adds a new product with core fields; the rest is filled in via
|
||||
// the detail editor.
|
||||
func (h *Handler) CreateProduct(w http.ResponseWriter, r *http.Request) {
|
||||
var in adminstore.ProductInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.Name) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "名称不能为空")
|
||||
return
|
||||
}
|
||||
d, err := h.store.CreateProduct(r.Context(), auth.UserFrom(r.Context()), in)
|
||||
if errors.Is(err, adminstore.ErrDuplicateGTIN) {
|
||||
writeError(w, http.StatusConflict, "duplicate_gtin", "该条码(GTIN)已被其它商品使用")
|
||||
return
|
||||
}
|
||||
if h.handleErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, d)
|
||||
}
|
||||
|
||||
// Stats returns the dashboard overview counters.
|
||||
func (h *Handler) Stats(w http.ResponseWriter, r *http.Request) {
|
||||
st, err := h.store.Stats(r.Context())
|
||||
if h.handleErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, st)
|
||||
}
|
||||
|
||||
// ListAllAudit returns a page of the global operations audit log.
|
||||
func (h *Handler) ListAllAudit(w http.ResponseWriter, r *http.Request) {
|
||||
page, size := pageParams(r)
|
||||
items, total, err := h.store.ListAllAudit(r.Context(), size, (page-1)*size)
|
||||
if h.handleErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{
|
||||
"items": items, "page": page, "size": size, "total": total,
|
||||
})
|
||||
}
|
||||
|
||||
type bulkInput struct {
|
||||
IDs []string `json:"ids"`
|
||||
Action string `json:"action"`
|
||||
Status string `json:"status"`
|
||||
CategoryID *string `json:"category_id"`
|
||||
}
|
||||
|
||||
// BulkProducts applies a status or category change to many products at once.
|
||||
func (h *Handler) BulkProducts(w http.ResponseWriter, r *http.Request) {
|
||||
var in bulkInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if len(in.IDs) == 0 {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "未选择任何商品")
|
||||
return
|
||||
}
|
||||
actor := auth.UserFrom(r.Context())
|
||||
var (
|
||||
affected int
|
||||
err error
|
||||
)
|
||||
switch in.Action {
|
||||
case "status":
|
||||
affected, err = h.store.BulkSetStatus(r.Context(), actor, in.IDs, in.Status)
|
||||
case "category":
|
||||
affected, err = h.store.BulkSetCategory(r.Context(), actor, in.IDs, in.CategoryID)
|
||||
default:
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "未知的批量操作")
|
||||
return
|
||||
}
|
||||
switch {
|
||||
case errors.Is(err, adminstore.ErrInvalidStatus):
|
||||
writeError(w, http.StatusBadRequest, "invalid_status", "无效的状态值")
|
||||
return
|
||||
case errors.Is(err, adminstore.ErrInvalidParent):
|
||||
writeError(w, http.StatusBadRequest, "invalid_parent", "目标分类无效")
|
||||
return
|
||||
case errors.Is(err, adminstore.ErrNoTargets):
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "未选择任何商品")
|
||||
return
|
||||
}
|
||||
if h.handleErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]any{"status": "ok", "affected": affected})
|
||||
}
|
||||
|
||||
// UpdateProduct applies an edit.
|
||||
func (h *Handler) UpdateProduct(w http.ResponseWriter, r *http.Request) {
|
||||
var in adminstore.ProductInput
|
||||
@@ -328,6 +432,164 @@ func (h *Handler) ListCategories(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusOK, map[string]any{"items": items})
|
||||
}
|
||||
|
||||
// CreateCategory adds a category node.
|
||||
func (h *Handler) CreateCategory(w http.ResponseWriter, r *http.Request) {
|
||||
var in adminstore.CategoryInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.NameZH) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "分类名称不能为空")
|
||||
return
|
||||
}
|
||||
c, err := h.store.CreateCategory(r.Context(), auth.UserFrom(r.Context()), in)
|
||||
if h.handleCategoryErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, c)
|
||||
}
|
||||
|
||||
// UpdateCategory renames and/or moves a category node.
|
||||
func (h *Handler) UpdateCategory(w http.ResponseWriter, r *http.Request) {
|
||||
var in adminstore.CategoryInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.NameZH) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "分类名称不能为空")
|
||||
return
|
||||
}
|
||||
c, err := h.store.UpdateCategory(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()), in)
|
||||
if h.handleCategoryErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, c)
|
||||
}
|
||||
|
||||
// DeleteCategory removes a leaf category that no product uses.
|
||||
func (h *Handler) DeleteCategory(w http.ResponseWriter, r *http.Request) {
|
||||
err := h.store.DeleteCategory(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()))
|
||||
if h.handleCategoryErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]string{"status": "deleted"})
|
||||
}
|
||||
|
||||
// handleCategoryErr maps category-specific errors to client statuses, falling
|
||||
// back to handleErr otherwise.
|
||||
func (h *Handler) handleCategoryErr(w http.ResponseWriter, err error) bool {
|
||||
if err == nil {
|
||||
return false
|
||||
}
|
||||
switch {
|
||||
case errors.Is(err, adminstore.ErrDuplicatePath):
|
||||
writeError(w, http.StatusConflict, "duplicate_path", "该分类路径已存在,请换一个英文标识(slug)")
|
||||
return true
|
||||
case errors.Is(err, adminstore.ErrCategoryHasChildren):
|
||||
writeError(w, http.StatusConflict, "has_children", "该分类存在子分类,请先删除或移动其子分类")
|
||||
return true
|
||||
case errors.Is(err, adminstore.ErrCategoryInUse):
|
||||
writeError(w, http.StatusConflict, "in_use", "仍有商品归属于该分类,请先改归其它分类")
|
||||
return true
|
||||
case errors.Is(err, adminstore.ErrInvalidParent):
|
||||
writeError(w, http.StatusBadRequest, "invalid_parent", "上级分类无效(不存在或不能移动到自身/子级下)")
|
||||
return true
|
||||
}
|
||||
return h.handleErr(w, err)
|
||||
}
|
||||
|
||||
type brandInput struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type brandMergeInput struct {
|
||||
TargetID string `json:"target_id"`
|
||||
}
|
||||
|
||||
// CreateBrand adds a brand.
|
||||
func (h *Handler) CreateBrand(w http.ResponseWriter, r *http.Request) {
|
||||
var in brandInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.Name) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "品牌名称不能为空")
|
||||
return
|
||||
}
|
||||
b, err := h.store.CreateBrand(r.Context(), auth.UserFrom(r.Context()), in.Name)
|
||||
if h.handleBrandErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, b)
|
||||
}
|
||||
|
||||
// UpdateBrand renames a brand.
|
||||
func (h *Handler) UpdateBrand(w http.ResponseWriter, r *http.Request) {
|
||||
var in brandInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.Name) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "品牌名称不能为空")
|
||||
return
|
||||
}
|
||||
b, err := h.store.UpdateBrand(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()), in.Name)
|
||||
if h.handleBrandErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, b)
|
||||
}
|
||||
|
||||
// MergeBrands folds one brand's products into another, then deletes the source.
|
||||
func (h *Handler) MergeBrands(w http.ResponseWriter, r *http.Request) {
|
||||
var in brandMergeInput
|
||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "invalid body")
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(in.TargetID) == "" {
|
||||
writeError(w, http.StatusBadRequest, "bad_request", "请选择合并目标品牌")
|
||||
return
|
||||
}
|
||||
b, err := h.store.MergeBrands(r.Context(), chi.URLParam(r, "id"), in.TargetID, auth.UserFrom(r.Context()))
|
||||
if h.handleBrandErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, b)
|
||||
}
|
||||
|
||||
// DeleteBrand removes a brand no product references.
|
||||
func (h *Handler) DeleteBrand(w http.ResponseWriter, r *http.Request) {
|
||||
err := h.store.DeleteBrand(r.Context(), chi.URLParam(r, "id"), auth.UserFrom(r.Context()))
|
||||
if h.handleBrandErr(w, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]string{"status": "deleted"})
|
||||
}
|
||||
|
||||
// handleBrandErr maps brand-specific errors to client statuses.
|
||||
func (h *Handler) handleBrandErr(w http.ResponseWriter, err error) bool {
|
||||
if err == nil {
|
||||
return false
|
||||
}
|
||||
switch {
|
||||
case errors.Is(err, adminstore.ErrDuplicateBrand):
|
||||
writeError(w, http.StatusConflict, "duplicate_brand", "该品牌名称已存在")
|
||||
return true
|
||||
case errors.Is(err, adminstore.ErrBrandInUse):
|
||||
writeError(w, http.StatusConflict, "in_use", "仍有商品使用该品牌,请先改用其它品牌或合并")
|
||||
return true
|
||||
case errors.Is(err, adminstore.ErrInvalidMerge):
|
||||
writeError(w, http.StatusBadRequest, "invalid_merge", "合并目标无效(不存在或与源品牌相同)")
|
||||
return true
|
||||
}
|
||||
return h.handleErr(w, err)
|
||||
}
|
||||
|
||||
// ---------- submissions ----------
|
||||
|
||||
// CreateSubmission accepts an anonymous public contribution into the queue.
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
)
|
||||
|
||||
// Brand-management errors, mapped to client statuses by the handler.
|
||||
var (
|
||||
// ErrDuplicateBrand is returned when a brand name already exists.
|
||||
ErrDuplicateBrand = errors.New("duplicate brand name")
|
||||
// ErrBrandInUse blocks deleting a brand still referenced by products.
|
||||
ErrBrandInUse = errors.New("brand in use")
|
||||
// ErrInvalidMerge is returned when a merge target is missing or equal to
|
||||
// the source.
|
||||
ErrInvalidMerge = errors.New("invalid merge target")
|
||||
)
|
||||
|
||||
// CreateBrand inserts a new brand. Names are unique by normalized form.
|
||||
func (s *Store) CreateBrand(ctx context.Context, actor, name string) (*Brand, error) {
|
||||
name = strings.TrimSpace(name)
|
||||
if name == "" {
|
||||
return nil, errors.New("name required")
|
||||
}
|
||||
var b Brand
|
||||
err := s.pool.QueryRow(ctx,
|
||||
`INSERT INTO brand (name, normalized_name) VALUES ($1, $2) RETURNING id, name, 0`,
|
||||
name, normBrand(name)).Scan(&b.ID, &b.Name, &b.ProductCount)
|
||||
if isUniqueViolation(err) {
|
||||
return nil, ErrDuplicateBrand
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "create", "brand", &b.ID, []string{"name"}, nil, b)
|
||||
return &b, nil
|
||||
}
|
||||
|
||||
// UpdateBrand renames a brand, keeping the normalized name in sync.
|
||||
func (s *Store) UpdateBrand(ctx context.Context, id, actor, name string) (*Brand, error) {
|
||||
name = strings.TrimSpace(name)
|
||||
if name == "" {
|
||||
return nil, errors.New("name required")
|
||||
}
|
||||
ct, err := s.pool.Exec(ctx,
|
||||
"UPDATE brand SET name = $1, normalized_name = $2 WHERE id = $3",
|
||||
name, normBrand(name), id)
|
||||
if isUniqueViolation(err) {
|
||||
return nil, ErrDuplicateBrand
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if ct.RowsAffected() == 0 {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
out, err := s.getBrand(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "update", "brand", &id, []string{"name"}, nil, out)
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// MergeBrands reassigns every product of src to dst, then deletes src. Useful
|
||||
// for collapsing duplicate brands (e.g. "可口可乐" and "Coca-Cola").
|
||||
func (s *Store) MergeBrands(ctx context.Context, srcID, dstID, actor string) (*Brand, error) {
|
||||
if srcID == dstID {
|
||||
return nil, ErrInvalidMerge
|
||||
}
|
||||
tx, err := s.pool.Begin(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
var dstName string
|
||||
err = tx.QueryRow(ctx, "SELECT name FROM brand WHERE id = $1", dstID).Scan(&dstName)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrInvalidMerge
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var srcName string
|
||||
err = tx.QueryRow(ctx, "SELECT name FROM brand WHERE id = $1", srcID).Scan(&srcName)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if _, err := tx.Exec(ctx, "UPDATE product SET brand_id = $1 WHERE brand_id = $2", dstID, srcID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := tx.Exec(ctx, "DELETE FROM brand WHERE id = $1", srcID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
out, err := s.getBrand(ctx, dstID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "merge", "brand", &srcID, []string{"name"},
|
||||
map[string]string{"name": srcName},
|
||||
map[string]string{"merged_into": dstName, "merged_into_id": dstID})
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// DeleteBrand removes a brand not referenced by any product.
|
||||
func (s *Store) DeleteBrand(ctx context.Context, id, actor string) error {
|
||||
before, err := s.getBrand(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if before.ProductCount > 0 {
|
||||
return fmt.Errorf("%w: %d products", ErrBrandInUse, before.ProductCount)
|
||||
}
|
||||
ct, err := s.pool.Exec(ctx, "DELETE FROM brand WHERE id = $1", id)
|
||||
if err != nil {
|
||||
if isForeignKeyViolation(err) {
|
||||
return ErrBrandInUse
|
||||
}
|
||||
return err
|
||||
}
|
||||
if ct.RowsAffected() == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "delete", "brand", &id, []string{"name"}, before, nil)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) getBrand(ctx context.Context, id string) (*Brand, error) {
|
||||
var b Brand
|
||||
err := s.pool.QueryRow(ctx, `
|
||||
SELECT b.id, b.name,
|
||||
(SELECT count(*) FROM product p WHERE p.brand_id = b.id)
|
||||
FROM brand b WHERE b.id = $1`, id).Scan(&b.ID, &b.Name, &b.ProductCount)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &b, nil
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestBrandLifecycle(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
ctx := context.Background()
|
||||
|
||||
a, err := s.CreateBrand(ctx, "tester", "品牌A "+randomHex(4))
|
||||
if err != nil {
|
||||
t.Fatalf("create A: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM brand WHERE id = $1", a.ID) })
|
||||
|
||||
b, err := s.CreateBrand(ctx, "tester", "品牌B "+randomHex(4))
|
||||
if err != nil {
|
||||
t.Fatalf("create B: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM brand WHERE id = $1", b.ID) })
|
||||
|
||||
// Duplicate (normalized) name must be rejected.
|
||||
if _, err := s.CreateBrand(ctx, "tester", " "+a.Name+" "); !errors.Is(err, ErrDuplicateBrand) {
|
||||
t.Fatalf("expected ErrDuplicateBrand, got %v", err)
|
||||
}
|
||||
|
||||
// Rename.
|
||||
renamed, err := s.UpdateBrand(ctx, a.ID, "tester", "品牌A改名")
|
||||
if err != nil {
|
||||
t.Fatalf("rename: %v", err)
|
||||
}
|
||||
if renamed.Name != "品牌A改名" {
|
||||
t.Fatalf("rename not applied: %q", renamed.Name)
|
||||
}
|
||||
|
||||
// Attach a product to brand A so deletion is blocked and merge moves it.
|
||||
var prodID string
|
||||
err = s.pool.QueryRow(ctx,
|
||||
"INSERT INTO product (name, brand_id, status) VALUES ($1,$2,'active') RETURNING id",
|
||||
"测试商品 "+randomHex(4), a.ID).Scan(&prodID)
|
||||
if err != nil {
|
||||
t.Fatalf("insert product: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM product WHERE id = $1", prodID) })
|
||||
|
||||
// Deleting an in-use brand must fail.
|
||||
if err := s.DeleteBrand(ctx, a.ID, "tester"); !errors.Is(err, ErrBrandInUse) {
|
||||
t.Fatalf("expected ErrBrandInUse, got %v", err)
|
||||
}
|
||||
|
||||
// Merge A into B: product reassigned, A deleted.
|
||||
merged, err := s.MergeBrands(ctx, a.ID, b.ID, "tester")
|
||||
if err != nil {
|
||||
t.Fatalf("merge: %v", err)
|
||||
}
|
||||
if merged.ID != b.ID || merged.ProductCount < 1 {
|
||||
t.Fatalf("merge result wrong: %+v", merged)
|
||||
}
|
||||
if _, err := s.getBrand(ctx, a.ID); !errors.Is(err, ErrNotFound) {
|
||||
t.Fatalf("source brand should be gone, got %v", err)
|
||||
}
|
||||
|
||||
// Self-merge is invalid.
|
||||
if _, err := s.MergeBrands(ctx, b.ID, b.ID, "tester"); !errors.Is(err, ErrInvalidMerge) {
|
||||
t.Fatalf("expected ErrInvalidMerge, got %v", err)
|
||||
}
|
||||
|
||||
// After moving the product away from B, B can be deleted.
|
||||
if _, err := s.pool.Exec(ctx, "DELETE FROM product WHERE id = $1", prodID); err != nil {
|
||||
t.Fatalf("cleanup product: %v", err)
|
||||
}
|
||||
if err := s.DeleteBrand(ctx, b.ID, "tester"); err != nil {
|
||||
t.Fatalf("delete unused brand: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
)
|
||||
|
||||
// Bulk-operation errors.
|
||||
var (
|
||||
// ErrNoTargets is returned when a bulk request selects no products.
|
||||
ErrNoTargets = errors.New("no products selected")
|
||||
// ErrInvalidStatus is returned for an unknown product status value.
|
||||
ErrInvalidStatus = errors.New("invalid status")
|
||||
)
|
||||
|
||||
var validStatus = map[string]bool{"active": true, "merged": true, "deprecated": true}
|
||||
|
||||
// BulkSetStatus updates the status of every selected product in one statement.
|
||||
func (s *Store) BulkSetStatus(ctx context.Context, actor string, ids []string, status string) (int, error) {
|
||||
if len(ids) == 0 {
|
||||
return 0, ErrNoTargets
|
||||
}
|
||||
if !validStatus[status] {
|
||||
return 0, ErrInvalidStatus
|
||||
}
|
||||
ct, err := s.pool.Exec(ctx,
|
||||
"UPDATE product SET status = $1 WHERE id = ANY($2)", status, ids)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
n := int(ct.RowsAffected())
|
||||
_ = s.writeAudit(ctx, actor, "bulk_status", "product", nil,
|
||||
[]string{"status"}, map[string]any{"ids": ids}, map[string]any{"status": status})
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// BulkSetCategory reassigns the category of every selected product, syncing the
|
||||
// GPC brick code and recomputing quality for each one.
|
||||
func (s *Store) BulkSetCategory(ctx context.Context, actor string, ids []string, categoryID *string) (int, error) {
|
||||
if len(ids) == 0 {
|
||||
return 0, ErrNoTargets
|
||||
}
|
||||
tx, err := s.pool.Begin(ctx)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
var gpc *string
|
||||
if categoryID != nil && *categoryID != "" {
|
||||
if err := tx.QueryRow(ctx, "SELECT gpc_brick_code FROM category WHERE id = $1", *categoryID).Scan(&gpc); err != nil {
|
||||
return 0, ErrInvalidParent
|
||||
}
|
||||
} else {
|
||||
categoryID = nil
|
||||
}
|
||||
|
||||
ct, err := tx.Exec(ctx,
|
||||
"UPDATE product SET category_id = $1, gpc_brick_code = $2 WHERE id = ANY($3)",
|
||||
categoryID, gpc, ids)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
for _, id := range ids {
|
||||
if _, err := s.recomputeQualityTx(ctx, tx, id); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
n := int(ct.RowsAffected())
|
||||
cat := ""
|
||||
if categoryID != nil {
|
||||
cat = *categoryID
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "bulk_category", "product", nil,
|
||||
[]string{"category"}, map[string]any{"ids": ids}, map[string]any{"category_id": cat})
|
||||
return n, nil
|
||||
}
|
||||
@@ -0,0 +1,297 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgconn"
|
||||
)
|
||||
|
||||
// randomHex returns n random lowercase hex characters for fallback ltree slugs.
|
||||
func randomHex(n int) string {
|
||||
b := make([]byte, (n+1)/2)
|
||||
if _, err := rand.Read(b); err != nil {
|
||||
return "x"
|
||||
}
|
||||
return hex.EncodeToString(b)[:n]
|
||||
}
|
||||
|
||||
// Category-management errors, mapped to client statuses by the handler.
|
||||
var (
|
||||
// ErrDuplicatePath is returned when a category path already exists.
|
||||
ErrDuplicatePath = errors.New("duplicate category path")
|
||||
// ErrCategoryHasChildren blocks deleting a node that still has children.
|
||||
ErrCategoryHasChildren = errors.New("category has children")
|
||||
// ErrCategoryInUse blocks deleting a node still referenced by products.
|
||||
ErrCategoryInUse = errors.New("category in use")
|
||||
// ErrInvalidParent is returned for a missing parent or an illegal move
|
||||
// (onto itself or one of its own descendants).
|
||||
ErrInvalidParent = errors.New("invalid parent category")
|
||||
)
|
||||
|
||||
// CategoryInput is the payload accepted when creating or editing a category.
|
||||
// Slug is the ltree label (ASCII); when empty it is derived from NameEN, then
|
||||
// from a random suffix, since ltree labels cannot contain CJK or spaces.
|
||||
type CategoryInput struct {
|
||||
NameZH string `json:"name_zh"`
|
||||
NameEN *string `json:"name_en"`
|
||||
Slug *string `json:"slug"`
|
||||
ParentID *string `json:"parent_id"`
|
||||
GPCBrickCode *string `json:"gpc_brick_code"`
|
||||
}
|
||||
|
||||
var slugInvalid = regexp.MustCompile(`[^a-z0-9_]+`)
|
||||
|
||||
// slugify converts a string into a valid ltree label ([a-z0-9_]).
|
||||
func slugify(s string) string {
|
||||
s = strings.ToLower(strings.TrimSpace(s))
|
||||
s = slugInvalid.ReplaceAllString(s, "_")
|
||||
s = strings.Trim(s, "_")
|
||||
for strings.Contains(s, "__") {
|
||||
s = strings.ReplaceAll(s, "__", "_")
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
// resolveSlug picks an ltree label from the explicit slug, then NameEN, then a
|
||||
// random fallback so a Chinese-only category still gets a valid path label.
|
||||
func resolveSlug(in CategoryInput) string {
|
||||
if in.Slug != nil {
|
||||
if s := slugify(*in.Slug); s != "" {
|
||||
return s
|
||||
}
|
||||
}
|
||||
if in.NameEN != nil {
|
||||
if s := slugify(*in.NameEN); s != "" {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return "cat_" + randomHex(6)
|
||||
}
|
||||
|
||||
func trimPtr(p *string) *string {
|
||||
if p == nil {
|
||||
return nil
|
||||
}
|
||||
t := strings.TrimSpace(*p)
|
||||
if t == "" {
|
||||
return nil
|
||||
}
|
||||
return &t
|
||||
}
|
||||
|
||||
// CreateCategory inserts a new category node. With no parent it becomes a root
|
||||
// (level 0); otherwise its path is parentPath.slug and level is parentLevel+1.
|
||||
func (s *Store) CreateCategory(ctx context.Context, actor string, in CategoryInput) (*Category, error) {
|
||||
name := strings.TrimSpace(in.NameZH)
|
||||
if name == "" {
|
||||
return nil, errors.New("name_zh required")
|
||||
}
|
||||
|
||||
parentPath := ""
|
||||
parentLevel := -1
|
||||
var parentID *string
|
||||
if pid := trimPtr(in.ParentID); pid != nil {
|
||||
var path string
|
||||
var level int
|
||||
err := s.pool.QueryRow(ctx, "SELECT path::text, level FROM category WHERE id = $1", *pid).Scan(&path, &level)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrInvalidParent
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
parentPath, parentLevel, parentID = path, level, pid
|
||||
}
|
||||
|
||||
slug := resolveSlug(in)
|
||||
path := slug
|
||||
if parentPath != "" {
|
||||
path = parentPath + "." + slug
|
||||
}
|
||||
level := parentLevel + 1
|
||||
|
||||
var c Category
|
||||
err := s.pool.QueryRow(ctx, `
|
||||
INSERT INTO category (name_zh, name_en, parent_id, path, gpc_brick_code, level)
|
||||
VALUES ($1, $2, $3, $4::ltree, $5, $6)
|
||||
RETURNING id, name_zh, name_en, path::text, level, parent_id::text, gpc_brick_code, 0`,
|
||||
name, trimPtr(in.NameEN), parentID, path, trimPtr(in.GPCBrickCode), level).
|
||||
Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level, &c.ParentID, &c.GPCBrickCode, &c.ProductCount)
|
||||
if isUniqueViolation(err) {
|
||||
return nil, ErrDuplicatePath
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_ = s.writeAudit(ctx, actor, "create", "category", &c.ID, []string{"name_zh", "path"}, nil, c)
|
||||
return &c, nil
|
||||
}
|
||||
|
||||
// UpdateCategory renames a node and/or moves it under a new parent. Moving
|
||||
// rewrites the path of the node and every descendant via ltree, keeping level
|
||||
// in sync. Moving a node onto itself or a descendant is rejected.
|
||||
func (s *Store) UpdateCategory(ctx context.Context, id, actor string, in CategoryInput) (*Category, error) {
|
||||
name := strings.TrimSpace(in.NameZH)
|
||||
if name == "" {
|
||||
return nil, errors.New("name_zh required")
|
||||
}
|
||||
|
||||
tx, err := s.pool.Begin(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
var oldPath string
|
||||
var oldLevel int
|
||||
var oldParent *string
|
||||
err = tx.QueryRow(ctx, "SELECT path::text, level, parent_id::text FROM category WHERE id = $1", id).
|
||||
Scan(&oldPath, &oldLevel, &oldParent)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if _, err := tx.Exec(ctx,
|
||||
"UPDATE category SET name_zh = $1, name_en = $2, gpc_brick_code = $3 WHERE id = $4",
|
||||
name, trimPtr(in.NameEN), trimPtr(in.GPCBrickCode), id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newParent := trimPtr(in.ParentID)
|
||||
if !strEq(newParent, oldParent) {
|
||||
if err := s.moveCategoryTx(ctx, tx, id, oldPath, newParent); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
out, err := s.getCategory(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "update", "category", &id, []string{"name_zh", "name_en", "gpc_brick_code", "parent_id"}, nil, out)
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// moveCategoryTx re-parents a subtree. The node's slug (last path label) is
|
||||
// preserved; only its ancestor prefix and level change.
|
||||
func (s *Store) moveCategoryTx(ctx context.Context, tx pgx.Tx, id, oldPath string, newParent *string) error {
|
||||
slug := oldPath
|
||||
if i := strings.LastIndex(oldPath, "."); i >= 0 {
|
||||
slug = oldPath[i+1:]
|
||||
}
|
||||
|
||||
newBase := slug
|
||||
if newParent != nil {
|
||||
var parentPath string
|
||||
err := tx.QueryRow(ctx, "SELECT path::text FROM category WHERE id = $1", *newParent).Scan(&parentPath)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrInvalidParent
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Disallow moving a node under itself or one of its descendants.
|
||||
if parentPath == oldPath || strings.HasPrefix(parentPath, oldPath+".") {
|
||||
return ErrInvalidParent
|
||||
}
|
||||
newBase = parentPath + "." + slug
|
||||
}
|
||||
|
||||
// Rewrite the node and all descendants in one statement; level tracks depth.
|
||||
_, err := tx.Exec(ctx, `
|
||||
UPDATE category
|
||||
SET path = ($1::ltree || subpath(path, nlevel($2::ltree) - 1)),
|
||||
level = nlevel($1::ltree) + (nlevel(path) - nlevel($2::ltree)) - 1
|
||||
WHERE path = $2::ltree OR path <@ $2::ltree`, newBase, oldPath)
|
||||
if isUniqueViolation(err) {
|
||||
return ErrDuplicatePath
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, "UPDATE category SET parent_id = $1 WHERE id = $2", newParent, id)
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteCategory removes a leaf node not referenced by any product. Nodes with
|
||||
// children or in-use nodes are rejected with a specific error.
|
||||
func (s *Store) DeleteCategory(ctx context.Context, id, actor string) error {
|
||||
before, err := s.getCategory(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var children int
|
||||
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM category WHERE parent_id = $1", id).Scan(&children); err != nil {
|
||||
return err
|
||||
}
|
||||
if children > 0 {
|
||||
return ErrCategoryHasChildren
|
||||
}
|
||||
|
||||
var products int
|
||||
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM product WHERE category_id = $1", id).Scan(&products); err != nil {
|
||||
return err
|
||||
}
|
||||
if products > 0 {
|
||||
return fmt.Errorf("%w: %d products", ErrCategoryInUse, products)
|
||||
}
|
||||
|
||||
ct, err := s.pool.Exec(ctx, "DELETE FROM category WHERE id = $1", id)
|
||||
if err != nil {
|
||||
// A concurrent product assignment can still trip the FK.
|
||||
if isForeignKeyViolation(err) {
|
||||
return ErrCategoryInUse
|
||||
}
|
||||
return err
|
||||
}
|
||||
if ct.RowsAffected() == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
|
||||
_ = s.writeAudit(ctx, actor, "delete", "category", &id, []string{"path"}, before, nil)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) getCategory(ctx context.Context, id string) (*Category, error) {
|
||||
var c Category
|
||||
err := s.pool.QueryRow(ctx, `
|
||||
SELECT c.id, c.name_zh, c.name_en, c.path::text, c.level, c.parent_id::text,
|
||||
c.gpc_brick_code,
|
||||
(SELECT count(*) FROM product p WHERE p.category_id = c.id)
|
||||
FROM category c WHERE c.id = $1`, id).
|
||||
Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level, &c.ParentID, &c.GPCBrickCode, &c.ProductCount)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &c, nil
|
||||
}
|
||||
|
||||
func isUniqueViolation(err error) bool {
|
||||
var pgErr *pgconn.PgError
|
||||
return errors.As(err, &pgErr) && pgErr.Code == "23505"
|
||||
}
|
||||
|
||||
func isForeignKeyViolation(err error) bool {
|
||||
var pgErr *pgconn.PgError
|
||||
return errors.As(err, &pgErr) && pgErr.Code == "23503"
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// newTestStore connects to the test database, skipping when it is unreachable
|
||||
// or migrations have not been applied.
|
||||
func newTestStore(t *testing.T) *Store {
|
||||
t.Helper()
|
||||
dsn := os.Getenv("OPENGOODS_DATABASE_URL")
|
||||
if dsn == "" {
|
||||
dsn = "postgres://opengoods:opengoods@localhost:5432/opengoods?sslmode=disable"
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||
defer cancel()
|
||||
pool, err := pgxpool.New(ctx, dsn)
|
||||
if err != nil {
|
||||
t.Skipf("no database: %v", err)
|
||||
}
|
||||
if err := pool.Ping(ctx); err != nil {
|
||||
pool.Close()
|
||||
t.Skipf("database not reachable: %v", err)
|
||||
}
|
||||
var hasTable bool
|
||||
if err := pool.QueryRow(ctx, "SELECT to_regclass('public.category') IS NOT NULL").Scan(&hasTable); err != nil || !hasTable {
|
||||
pool.Close()
|
||||
t.Skip("migrations not applied (category missing)")
|
||||
}
|
||||
t.Cleanup(pool.Close)
|
||||
return New(pool)
|
||||
}
|
||||
|
||||
func ptr(s string) *string { return &s }
|
||||
|
||||
func TestCategoryLifecycle(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
ctx := context.Background()
|
||||
|
||||
root, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||
NameZH: "测试根", Slug: ptr("test_root_" + randomHex(6)),
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create root: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM category WHERE path <@ $1::ltree", root.Path) })
|
||||
|
||||
if root.Level != 0 || root.ParentID != nil {
|
||||
t.Fatalf("root level/parent wrong: level=%d parent=%v", root.Level, root.ParentID)
|
||||
}
|
||||
|
||||
child, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||
NameZH: "测试子", NameEN: ptr("Test Child"), ParentID: &root.ID,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create child: %v", err)
|
||||
}
|
||||
if child.Level != 1 || child.ParentID == nil || *child.ParentID != root.ID {
|
||||
t.Fatalf("child hierarchy wrong: %+v", child)
|
||||
}
|
||||
|
||||
// Deleting a node with children must fail.
|
||||
if err := s.DeleteCategory(ctx, root.ID, "tester"); !errors.Is(err, ErrCategoryHasChildren) {
|
||||
t.Fatalf("expected ErrCategoryHasChildren, got %v", err)
|
||||
}
|
||||
|
||||
// Rename child.
|
||||
renamed, err := s.UpdateCategory(ctx, child.ID, "tester", CategoryInput{NameZH: "测试子-改名"})
|
||||
if err != nil {
|
||||
t.Fatalf("rename: %v", err)
|
||||
}
|
||||
if renamed.NameZH != "测试子-改名" {
|
||||
t.Fatalf("rename not applied: %q", renamed.NameZH)
|
||||
}
|
||||
|
||||
// Move child to a second root, descendants' path/level should follow.
|
||||
root2, err := s.CreateCategory(ctx, "tester", CategoryInput{
|
||||
NameZH: "测试根2", Slug: ptr("test_root2_" + randomHex(6)),
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create root2: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM category WHERE path <@ $1::ltree", root2.Path) })
|
||||
|
||||
moved, err := s.UpdateCategory(ctx, child.ID, "tester", CategoryInput{NameZH: "测试子-改名", ParentID: &root2.ID})
|
||||
if err != nil {
|
||||
t.Fatalf("move: %v", err)
|
||||
}
|
||||
if moved.ParentID == nil || *moved.ParentID != root2.ID {
|
||||
t.Fatalf("move parent wrong: %+v", moved)
|
||||
}
|
||||
if moved.Level != 1 {
|
||||
t.Fatalf("moved level wrong: %d", moved.Level)
|
||||
}
|
||||
|
||||
// Moving a node under itself must be rejected.
|
||||
if _, err := s.UpdateCategory(ctx, root2.ID, "tester", CategoryInput{NameZH: "测试根2", ParentID: &child.ID}); !errors.Is(err, ErrInvalidParent) {
|
||||
t.Fatalf("expected ErrInvalidParent for self-move, got %v", err)
|
||||
}
|
||||
|
||||
// Duplicate path on create must be rejected.
|
||||
if _, err := s.CreateCategory(ctx, "tester", CategoryInput{NameZH: "dup", Slug: ptr(root.Path)}); !errors.Is(err, ErrDuplicatePath) {
|
||||
t.Fatalf("expected ErrDuplicatePath, got %v", err)
|
||||
}
|
||||
|
||||
// Now the leaf can be deleted.
|
||||
if err := s.DeleteCategory(ctx, child.ID, "tester"); err != nil {
|
||||
t.Fatalf("delete leaf: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSlugify(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"Cooking Oil": "cooking_oil",
|
||||
" Hello--Wld": "hello_wld",
|
||||
"食品": "",
|
||||
"a__b": "a_b",
|
||||
}
|
||||
for in, want := range cases {
|
||||
if got := slugify(in); got != want {
|
||||
t.Errorf("slugify(%q) = %q, want %q", in, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package adminstore
|
||||
|
||||
import "context"
|
||||
|
||||
// QualifiedMinScore is the quality_score threshold at or above which a product
|
||||
// counts as "qualified" (合格) in admin and public stats.
|
||||
const QualifiedMinScore = 0.6
|
||||
|
||||
// AdminStats summarizes the catalog for the admin overview dashboard.
|
||||
type AdminStats struct {
|
||||
Products int `json:"products"`
|
||||
Qualified int `json:"qualified"`
|
||||
MinScore float64 `json:"min_score"`
|
||||
ByStatus map[string]int `json:"by_status"`
|
||||
Brands int `json:"brands"`
|
||||
Categories int `json:"categories"`
|
||||
Pending int `json:"pending_submissions"`
|
||||
AvgQuality float64 `json:"avg_quality"`
|
||||
}
|
||||
|
||||
// Stats gathers the dashboard counters in a handful of aggregate queries.
|
||||
func (s *Store) Stats(ctx context.Context) (*AdminStats, error) {
|
||||
out := &AdminStats{MinScore: QualifiedMinScore, ByStatus: map[string]int{}}
|
||||
|
||||
if err := s.pool.QueryRow(ctx, `
|
||||
SELECT count(*),
|
||||
count(*) FILTER (WHERE quality_score >= $1 AND status = 'active'),
|
||||
COALESCE(avg(quality_score), 0)
|
||||
FROM product`, QualifiedMinScore).Scan(&out.Products, &out.Qualified, &out.AvgQuality); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := s.pool.Query(ctx, "SELECT status, count(*) FROM product GROUP BY status")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
var st string
|
||||
var n int
|
||||
if err := rows.Scan(&st, &n); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out.ByStatus[st] = n
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM brand").Scan(&out.Brands); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM category").Scan(&out.Categories); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.pool.QueryRow(ctx,
|
||||
"SELECT count(*) FROM submission WHERE status = 'pending'").Scan(&out.Pending); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package adminstore
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestStatsAndBulk(t *testing.T) {
|
||||
s := newTestStore(t)
|
||||
ctx := context.Background()
|
||||
|
||||
base, err := s.Stats(ctx)
|
||||
if err != nil {
|
||||
t.Fatalf("stats: %v", err)
|
||||
}
|
||||
|
||||
var p1, p2 string
|
||||
if err := s.pool.QueryRow(ctx,
|
||||
"INSERT INTO product (name, status) VALUES ($1,'active') RETURNING id",
|
||||
"批量测试1 "+randomHex(4)).Scan(&p1); err != nil {
|
||||
t.Fatalf("insert p1: %v", err)
|
||||
}
|
||||
if err := s.pool.QueryRow(ctx,
|
||||
"INSERT INTO product (name, status) VALUES ($1,'active') RETURNING id",
|
||||
"批量测试2 "+randomHex(4)).Scan(&p2); err != nil {
|
||||
t.Fatalf("insert p2: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _, _ = s.pool.Exec(ctx, "DELETE FROM product WHERE id = ANY($1)", []string{p1, p2}) })
|
||||
|
||||
after, err := s.Stats(ctx)
|
||||
if err != nil {
|
||||
t.Fatalf("stats after: %v", err)
|
||||
}
|
||||
if after.Products != base.Products+2 {
|
||||
t.Fatalf("product count: got %d want %d", after.Products, base.Products+2)
|
||||
}
|
||||
|
||||
// Bulk set status to deprecated.
|
||||
n, err := s.BulkSetStatus(ctx, "tester", []string{p1, p2}, "deprecated")
|
||||
if err != nil || n != 2 {
|
||||
t.Fatalf("bulk status: n=%d err=%v", n, err)
|
||||
}
|
||||
var deprecated int
|
||||
if err := s.pool.QueryRow(ctx,
|
||||
"SELECT count(*) FROM product WHERE id = ANY($1) AND status='deprecated'",
|
||||
[]string{p1, p2}).Scan(&deprecated); err != nil {
|
||||
t.Fatalf("verify: %v", err)
|
||||
}
|
||||
if deprecated != 2 {
|
||||
t.Fatalf("expected 2 deprecated, got %d", deprecated)
|
||||
}
|
||||
|
||||
// Invalid status rejected.
|
||||
if _, err := s.BulkSetStatus(ctx, "tester", []string{p1}, "nope"); err != ErrInvalidStatus {
|
||||
t.Fatalf("expected ErrInvalidStatus, got %v", err)
|
||||
}
|
||||
|
||||
// Empty selection rejected.
|
||||
if _, err := s.BulkSetStatus(ctx, "tester", nil, "active"); err != ErrNoTargets {
|
||||
t.Fatalf("expected ErrNoTargets, got %v", err)
|
||||
}
|
||||
|
||||
// Global audit log should contain the bulk_status entry.
|
||||
rows, total, err := s.ListAllAudit(ctx, 10, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("audit: %v", err)
|
||||
}
|
||||
if total == 0 || len(rows) == 0 {
|
||||
t.Fatalf("expected audit rows, got total=%d", total)
|
||||
}
|
||||
}
|
||||
@@ -170,6 +170,79 @@ ON CONFLICT (product_id) DO UPDATE SET
|
||||
return after, nil
|
||||
}
|
||||
|
||||
// ErrDuplicateGTIN is returned when a product GTIN already exists.
|
||||
var ErrDuplicateGTIN = errors.New("duplicate gtin")
|
||||
|
||||
// CreateProduct inserts a new product from the admin UI. Only the core fields
|
||||
// are required; the operator completes the rest in the detail editor.
|
||||
func (s *Store) CreateProduct(ctx context.Context, actor string, in ProductInput) (*ProductDetail, error) {
|
||||
if strings.TrimSpace(in.Name) == "" {
|
||||
return nil, errors.New("name required")
|
||||
}
|
||||
tx, err := s.pool.Begin(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
brandID := in.BrandID
|
||||
if in.BrandName != nil && strings.TrimSpace(*in.BrandName) != "" {
|
||||
bid, err := s.ensureBrand(ctx, tx, strings.TrimSpace(*in.BrandName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
brandID = &bid
|
||||
}
|
||||
|
||||
var gpc *string
|
||||
if in.CategoryID != nil && *in.CategoryID != "" {
|
||||
if err := tx.QueryRow(ctx, "SELECT gpc_brick_code FROM category WHERE id = $1", *in.CategoryID).Scan(&gpc); err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
canonical, err := s.netCanonical(ctx, tx, in.NetContentValue, in.NetContentUnit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
status := in.Status
|
||||
if status == "" {
|
||||
status = "active"
|
||||
}
|
||||
|
||||
var id string
|
||||
err = tx.QueryRow(ctx, `
|
||||
INSERT INTO product (gtin, name, brand_id, category_id, gpc_brick_code,
|
||||
net_content_value, net_content_unit, net_content_canonical,
|
||||
country_of_origin, status)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
|
||||
RETURNING id`,
|
||||
in.GTIN, in.Name, brandID, in.CategoryID, gpc,
|
||||
in.NetContentValue, in.NetContentUnit, canonical,
|
||||
in.CountryOfOrigin, status).Scan(&id)
|
||||
if isUniqueViolation(err) {
|
||||
return nil, ErrDuplicateGTIN
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if _, err := s.recomputeQualityTx(ctx, tx, id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
after, err := s.GetProduct(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = s.writeAudit(ctx, actor, "create", "product", &id, []string{"name"}, nil, after)
|
||||
return after, nil
|
||||
}
|
||||
|
||||
func strEq(a, b *string) bool {
|
||||
if a == nil && b == nil {
|
||||
return true
|
||||
@@ -330,15 +403,21 @@ func (s *Store) DeleteMSRP(ctx context.Context, productID, msrpID, actor string)
|
||||
|
||||
// ---------- dictionaries ----------
|
||||
|
||||
// Brand is a brand option for the edit form.
|
||||
// Brand is a brand option for the edit form and the management view.
|
||||
type Brand struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
ProductCount int `json:"product_count"`
|
||||
}
|
||||
|
||||
// ListBrands returns all brands ordered by name.
|
||||
// ListBrands returns all brands ordered by name, with the number of products
|
||||
// referencing each one.
|
||||
func (s *Store) ListBrands(ctx context.Context) ([]Brand, error) {
|
||||
rows, err := s.pool.Query(ctx, "SELECT id, name FROM brand ORDER BY name")
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
SELECT b.id, b.name,
|
||||
(SELECT count(*) FROM product p WHERE p.brand_id = b.id) AS product_count
|
||||
FROM brand b
|
||||
ORDER BY b.name`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -346,7 +425,7 @@ func (s *Store) ListBrands(ctx context.Context) ([]Brand, error) {
|
||||
out := []Brand{}
|
||||
for rows.Next() {
|
||||
var b Brand
|
||||
if err := rows.Scan(&b.ID, &b.Name); err != nil {
|
||||
if err := rows.Scan(&b.ID, &b.Name, &b.ProductCount); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, b)
|
||||
@@ -354,19 +433,27 @@ func (s *Store) ListBrands(ctx context.Context) ([]Brand, error) {
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// Category is a category option for the edit form.
|
||||
// Category is a category option for the edit form and the management view.
|
||||
type Category struct {
|
||||
ID string `json:"id"`
|
||||
NameZH string `json:"name_zh"`
|
||||
NameEN *string `json:"name_en"`
|
||||
Path string `json:"path"`
|
||||
Level int `json:"level"`
|
||||
ID string `json:"id"`
|
||||
NameZH string `json:"name_zh"`
|
||||
NameEN *string `json:"name_en"`
|
||||
Path string `json:"path"`
|
||||
Level int `json:"level"`
|
||||
ParentID *string `json:"parent_id"`
|
||||
GPCBrickCode *string `json:"gpc_brick_code"`
|
||||
ProductCount int `json:"product_count"`
|
||||
}
|
||||
|
||||
// ListCategories returns the full category tree.
|
||||
// ListCategories returns the full category tree (path order) with the number of
|
||||
// products directly assigned to each node.
|
||||
func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
|
||||
rows, err := s.pool.Query(ctx,
|
||||
"SELECT id, name_zh, name_en, path::text, level FROM category ORDER BY path")
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
SELECT c.id, c.name_zh, c.name_en, c.path::text, c.level, c.parent_id::text,
|
||||
c.gpc_brick_code,
|
||||
(SELECT count(*) FROM product p WHERE p.category_id = c.id) AS product_count
|
||||
FROM category c
|
||||
ORDER BY c.path`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -374,7 +461,8 @@ func (s *Store) ListCategories(ctx context.Context) ([]Category, error) {
|
||||
out := []Category{}
|
||||
for rows.Next() {
|
||||
var c Category
|
||||
if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level); err != nil {
|
||||
if err := rows.Scan(&c.ID, &c.NameZH, &c.NameEN, &c.Path, &c.Level,
|
||||
&c.ParentID, &c.GPCBrickCode, &c.ProductCount); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, c)
|
||||
@@ -393,6 +481,44 @@ type AuditEntry struct {
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
// AuditLogRow is one global audit-log row for the operations log view.
|
||||
type AuditLogRow struct {
|
||||
ID string `json:"id"`
|
||||
Actor string `json:"actor"`
|
||||
Action string `json:"action"`
|
||||
Entity string `json:"entity"`
|
||||
EntityID *string `json:"entity_id"`
|
||||
Fields []string `json:"fields"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
// ListAllAudit returns a page of the global audit log, newest first, along with
|
||||
// the total row count.
|
||||
func (s *Store) ListAllAudit(ctx context.Context, limit, offset int) ([]AuditLogRow, int, error) {
|
||||
var total int
|
||||
if err := s.pool.QueryRow(ctx, "SELECT count(*) FROM audit_log").Scan(&total); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
SELECT id, actor, action, entity, entity_id::text, fields, created_at::text
|
||||
FROM audit_log
|
||||
ORDER BY created_at DESC
|
||||
LIMIT $1 OFFSET $2`, limit, offset)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []AuditLogRow{}
|
||||
for rows.Next() {
|
||||
var e AuditLogRow
|
||||
if err := rows.Scan(&e.ID, &e.Actor, &e.Action, &e.Entity, &e.EntityID, &e.Fields, &e.CreatedAt); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
out = append(out, e)
|
||||
}
|
||||
return out, total, rows.Err()
|
||||
}
|
||||
|
||||
// ListAudit returns audit history for one product, newest first.
|
||||
func (s *Store) ListAudit(ctx context.Context, productID string, limit int) ([]AuditEntry, error) {
|
||||
rows, err := s.pool.Query(ctx, `
|
||||
|
||||
@@ -26,6 +26,10 @@ var openAPISpec []byte
|
||||
// APIVersion is the current public API version prefix.
|
||||
const APIVersion = "v1"
|
||||
|
||||
// QualifiedMinScore is the quality_score threshold at or above which a product
|
||||
// record is considered "qualified" (合格) for public stats.
|
||||
const QualifiedMinScore = 0.6
|
||||
|
||||
const (
|
||||
defaultPageSize = 20
|
||||
maxPageSize = 100
|
||||
@@ -85,6 +89,7 @@ func (h *Handler) Router() http.Handler {
|
||||
r.Get("/brands", h.ListBrands)
|
||||
r.Get("/categories", h.ListCategories)
|
||||
r.Get("/sources/{id}", h.SourceByID)
|
||||
r.Get("/stats", h.Stats)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -122,6 +127,15 @@ func (h *Handler) Healthz(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
|
||||
}
|
||||
|
||||
// Stats returns catalog totals and the count of qualified records.
|
||||
func (h *Handler) Stats(w http.ResponseWriter, r *http.Request) {
|
||||
st, err := h.store.Stats(r.Context(), QualifiedMinScore)
|
||||
if h.handleErr(w, r, err) {
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, st)
|
||||
}
|
||||
|
||||
// OpenAPI serves the embedded OpenAPI 3 specification for the public API.
|
||||
func (h *Handler) OpenAPI(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
|
||||
@@ -29,6 +29,24 @@ func (s *Store) Ping(ctx context.Context) error {
|
||||
return s.pool.Ping(ctx)
|
||||
}
|
||||
|
||||
// PublicStats summarizes the public catalog for the homepage.
|
||||
type PublicStats struct {
|
||||
Total int `json:"total"`
|
||||
Qualified int `json:"qualified"`
|
||||
MinScore float64 `json:"min_score"`
|
||||
}
|
||||
|
||||
// Stats returns active-product totals and the number of qualified records whose
|
||||
// quality_score meets minScore.
|
||||
func (s *Store) Stats(ctx context.Context, minScore float64) (PublicStats, error) {
|
||||
st := PublicStats{MinScore: minScore}
|
||||
err := s.pool.QueryRow(ctx, `
|
||||
SELECT count(*) FILTER (WHERE status = 'active'),
|
||||
count(*) FILTER (WHERE status = 'active' AND quality_score >= $1)
|
||||
FROM product`, minScore).Scan(&st.Total, &st.Qualified)
|
||||
return st, err
|
||||
}
|
||||
|
||||
// Barcode is one GS1 trade item number attached to a product.
|
||||
type Barcode struct {
|
||||
GTIN string `json:"gtin"`
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { useState } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import { Boxes, Search, PlusCircle, Code2 } from "lucide-react";
|
||||
import Home from "./components/Home";
|
||||
import ProductView from "./components/ProductView";
|
||||
import Contribute from "./components/Contribute";
|
||||
import ApiDocs from "./components/ApiDocs";
|
||||
import { api } from "./api";
|
||||
|
||||
type View =
|
||||
| { name: "home" }
|
||||
@@ -13,6 +14,14 @@ type View =
|
||||
|
||||
export default function App() {
|
||||
const [view, setView] = useState<View>({ name: "home" });
|
||||
const [qualified, setQualified] = useState<number | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
api
|
||||
.stats()
|
||||
.then((s) => setQualified(s.qualified))
|
||||
.catch(() => setQualified(null));
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="min-h-full flex flex-col">
|
||||
@@ -72,9 +81,17 @@ export default function App() {
|
||||
</main>
|
||||
|
||||
<footer className="border-t bg-white">
|
||||
<div className="max-w-5xl mx-auto px-4 py-4 text-xs text-gray-400 leading-relaxed">
|
||||
天工商品档案公共仓 是公益性「商品事实库」,仅收录客观商品信息(条码、品牌、品类、营养、官方建议零售价快照等),不含任何购买/交易功能。
|
||||
公众投稿须经人工审核后方可收纳。
|
||||
<div className="max-w-5xl mx-auto px-4 py-4 text-xs text-gray-400 leading-relaxed text-center">
|
||||
{qualified != null && (
|
||||
<div className="mb-2 text-gray-500">
|
||||
目前已收录
|
||||
<span className="mx-1 font-semibold text-emerald-600">
|
||||
{qualified.toLocaleString()}
|
||||
</span>
|
||||
条合格商品档案
|
||||
</div>
|
||||
)}
|
||||
天工是一个公益性商品档案库。主要收录商品名称,条码,品类,配料等官方快照。不涉及任何交易行为。
|
||||
<button onClick={() => setView({ name: "api" })} className="ml-1 text-emerald-600 hover:underline">
|
||||
API 调用说明
|
||||
</button>
|
||||
|
||||
@@ -30,7 +30,14 @@ export interface SearchFilters {
|
||||
country?: string;
|
||||
}
|
||||
|
||||
export interface Stats {
|
||||
total: number;
|
||||
qualified: number;
|
||||
min_score: number;
|
||||
}
|
||||
|
||||
export const api = {
|
||||
stats: () => req<Stats>(`/api/v1/stats`),
|
||||
search: (q: string, page = 1, size = 20, filters: SearchFilters = {}) => {
|
||||
const params = new URLSearchParams({
|
||||
q,
|
||||
|
||||
@@ -13,8 +13,6 @@ export default function Home({
|
||||
onApi: () => void;
|
||||
}) {
|
||||
const [q, setQ] = useState("");
|
||||
const [brand, setBrand] = useState("");
|
||||
const [country, setCountry] = useState("");
|
||||
const [items, setItems] = useState<ProductSummary[]>([]);
|
||||
const [total, setTotal] = useState(0);
|
||||
const [searched, setSearched] = useState(false);
|
||||
@@ -26,10 +24,7 @@ export default function Home({
|
||||
setLoading(true);
|
||||
setError("");
|
||||
try {
|
||||
const res = await api.search(q.trim(), 1, 30, {
|
||||
brand: brand.trim() || undefined,
|
||||
country: country.trim() || undefined,
|
||||
});
|
||||
const res = await api.search(q.trim(), 1, 30);
|
||||
setItems(res.items);
|
||||
setTotal(res.total);
|
||||
setSearched(true);
|
||||
@@ -43,7 +38,7 @@ export default function Home({
|
||||
return (
|
||||
<div>
|
||||
<div className="text-center py-10">
|
||||
<h1 className="text-3xl font-bold text-gray-800">天工商品档案公共仓</h1>
|
||||
<h1 className="text-3xl font-bold text-gray-800">天工</h1>
|
||||
<p className="mt-2 text-gray-500">
|
||||
输入商品名称或条码,检索客观、可溯源的商品资料。人人可查,人人可贡献。
|
||||
</p>
|
||||
@@ -66,20 +61,6 @@ export default function Home({
|
||||
{loading ? "检索中…" : "检索"}
|
||||
</button>
|
||||
</form>
|
||||
<div className="mt-3 max-w-2xl mx-auto flex flex-wrap items-center justify-center gap-2 text-sm">
|
||||
<input
|
||||
value={brand}
|
||||
onChange={(e) => setBrand(e.target.value)}
|
||||
placeholder="按品牌筛选(如 Ferrero)"
|
||||
className="flex-1 min-w-[14rem] bg-white border rounded-lg px-3 py-2 outline-none focus:ring-2 focus:ring-emerald-300"
|
||||
/>
|
||||
<input
|
||||
value={country}
|
||||
onChange={(e) => setCountry(e.target.value)}
|
||||
placeholder="按产地筛选(如 China)"
|
||||
className="flex-1 min-w-[14rem] bg-white border rounded-lg px-3 py-2 outline-none focus:ring-2 focus:ring-emerald-300"
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
onClick={onApi}
|
||||
className="mt-4 inline-flex items-center gap-1.5 text-sm text-emerald-700 hover:underline"
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
# build artifacts
|
||||
bypos-collector.exe
|
||||
bypos-collector
|
||||
bypos-collector-linux
|
||||
*.exe
|
||||
# collected data / outputs
|
||||
*.jsonl
|
||||
*.csv
|
||||
*.log
|
||||
@@ -1,67 +0,0 @@
|
||||
# bypos-collector
|
||||
|
||||
按条码批量采集商品档案的小工具(单文件 Windows/Linux 程序,自带本地 Web 控制台)。
|
||||
数据来源是云店「新增商品」输入条码时所查的同一个中心商品库 `zc.bypos.net`。
|
||||
采集结果落地为 JSONL,供后续导入本项目(天工/goods)。
|
||||
|
||||
> 这是一个**独立模块**(有自己的 `go.mod`),与 `api/` 主服务互不影响,
|
||||
> CI 不会编译它。放在 `tools/` 下仅作代码留存与后期迭代。
|
||||
|
||||
## 目录
|
||||
|
||||
| 文件 | 说明 |
|
||||
| --- | --- |
|
||||
| `main.go` | 入口:本地 HTTP 服务 + 启动浏览器 + API 路由(start/stop/stats/download/export.csv) |
|
||||
| `collect.go` | 核心:签名、EAN-13 校验位、范围/清单枚举、并发+限速、JSONL 落库、断点续采 |
|
||||
| `web/index.html` | 内嵌(`go:embed`)的控制台界面 |
|
||||
| `build.sh` | 交叉编译出 `bypos-collector.exe`(windows/amd64)与 linux 测试二进制 |
|
||||
| `使用说明.md` | 面向使用者的操作说明 |
|
||||
|
||||
## 构建
|
||||
|
||||
```bash
|
||||
./build.sh
|
||||
# 产物:bypos-collector.exe(发给 Windows 用户)/ bypos-collector-linux(本地测试)
|
||||
```
|
||||
|
||||
二进制与采集产物(`*.jsonl`/`*.csv`)已在 `.gitignore` 中排除,不入库。
|
||||
|
||||
## 接口与签名(逆向所得,后期迭代参考)
|
||||
|
||||
云店新增商品页输入条码时,前端经服务端代理 `/prod-api/ZmSvr/httpUtil/getGet`
|
||||
转发到中心库:
|
||||
|
||||
```
|
||||
GET http://zc.bypos.net/byGoodsService/byMessage.asmx/GetGoodsinfo
|
||||
?sdogid=<账号id>®num=1&barcode=<条码>
|
||||
&sparm1=<md5(sdogid)> # 常量,随账号固定
|
||||
&sparm2=<md5(barcode + tsMs)> # tsMs = 当前秒*1000(末尾恒为 000)
|
||||
&sparm3=<tsMs 前 10 位 = 秒级时间戳>
|
||||
&sparm4=&barcodetype=yunpos
|
||||
```
|
||||
|
||||
返回 `<string>{...json...}</string>`,内层 JSON 字段:
|
||||
|
||||
| 上游字段 | 含义 | 归一化字段 |
|
||||
| --- | --- | --- |
|
||||
| item_name | 品名 | name |
|
||||
| item_size | 规格 | spec |
|
||||
| unit_no | 单位 | unit |
|
||||
| item_area | 产地/地区 | area |
|
||||
| birth_com | 生产企业(常空) | manufacturer |
|
||||
| birth_doc | 生产许可(常空) | license |
|
||||
| inprice | 建议进价 | in_price |
|
||||
| sellprice | 建议零售价 | sell_price |
|
||||
| retcode | 1=命中,0=失败 | status(hit/miss/invalid) |
|
||||
|
||||
`retmsg` 含「非国标条码 / 参数异常」=> invalid;含「条码不存在」=> miss。
|
||||
|
||||
## 配置
|
||||
|
||||
- `sdogid`:中心库账号 id(本项目所属云店账号的授权 id)。默认值见
|
||||
`collect.go` 的 `defaultSdogID`,也可用 `-sdogid` 参数或控制台覆盖。
|
||||
**这是账号级凭证**——若本仓库对外公开,建议改为从环境变量/外部配置读取。
|
||||
|
||||
## 注意
|
||||
|
||||
批量自动查询比页面逐条更"重",上游可能对账号限频。请低速、分前缀/品类分批采集。
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the bypos-collector for Windows (and a Linux binary for local testing).
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
gofmt -w ./*.go
|
||||
go vet ./...
|
||||
echo "building windows/amd64 .exe ..."
|
||||
GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o bypos-collector.exe .
|
||||
echo "building linux/amd64 (for testing) ..."
|
||||
go build -o bypos-collector-linux .
|
||||
ls -la bypos-collector.exe bypos-collector-linux
|
||||
@@ -1,481 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ---- upstream config ----
|
||||
// sdogid is the 云店 account license id observed in the live request. It is
|
||||
// configurable so the tool is not tied to a single account.
|
||||
const defaultSdogID = "137966"
|
||||
|
||||
const endpoint = "http://zc.bypos.net/byGoodsService/byMessage.asmx/GetGoodsinfo"
|
||||
|
||||
var stringTagRe = regexp.MustCompile(`(?s)<string[^>]*>(.*)</string>`)
|
||||
|
||||
// Product is the normalized record we persist (one JSON object per line).
|
||||
type Product struct {
|
||||
Barcode string `json:"barcode"`
|
||||
Name string `json:"name"` // item_name 品名
|
||||
Spec string `json:"spec"` // item_size 规格
|
||||
Unit string `json:"unit"` // unit_no 单位
|
||||
Area string `json:"area"` // item_area 产地/地区
|
||||
Manufacturer string `json:"manufacturer"` // birth_com 生产企业
|
||||
License string `json:"license"` // birth_doc 生产许可
|
||||
InPrice string `json:"in_price"` // 建议进价
|
||||
SellPrice string `json:"sell_price"` // 建议零售价
|
||||
Status string `json:"status"` // hit / miss / invalid / error
|
||||
RetMsg string `json:"retmsg"` // 原始返回信息
|
||||
FetchedAt string `json:"fetched_at"` // RFC3339
|
||||
Source string `json:"source"` // zc.bypos.net
|
||||
}
|
||||
|
||||
// upstream raw fields
|
||||
type rawResp struct {
|
||||
RetCode string `json:"retcode"`
|
||||
RetMsg string `json:"retmsg"`
|
||||
Barcode string `json:"barcode"`
|
||||
ItemName string `json:"item_name"`
|
||||
UnitNo string `json:"unit_no"`
|
||||
ItemSize string `json:"item_size"`
|
||||
ItemArea string `json:"item_area"`
|
||||
BirthCom string `json:"birth_com"`
|
||||
BirthDoc string `json:"birth_doc"`
|
||||
InPrice string `json:"inprice"`
|
||||
SellPrice string `json:"sellprice"`
|
||||
}
|
||||
|
||||
func md5hex(s string) string {
|
||||
h := md5.Sum([]byte(s))
|
||||
return hex.EncodeToString(h[:])
|
||||
}
|
||||
|
||||
// ean13Check computes the EAN-13 check digit for a 12-digit body.
|
||||
func ean13Check(body string) (string, bool) {
|
||||
if len(body) != 12 {
|
||||
return "", false
|
||||
}
|
||||
sum := 0
|
||||
for i := 0; i < 12; i++ {
|
||||
c := body[i]
|
||||
if c < '0' || c > '9' {
|
||||
return "", false
|
||||
}
|
||||
d := int(c - '0')
|
||||
if i%2 == 0 {
|
||||
sum += d
|
||||
} else {
|
||||
sum += d * 3
|
||||
}
|
||||
}
|
||||
chk := (10 - (sum % 10)) % 10
|
||||
return body + strconv.Itoa(chk), true
|
||||
}
|
||||
|
||||
// lookup queries the upstream central library for one barcode.
|
||||
func (c *Collector) lookup(ctx context.Context, barcode string) (*Product, error) {
|
||||
tsMs := strconv.FormatInt(time.Now().Unix()*1000, 10) // always ends in 000
|
||||
sparm1 := md5hex(c.sdogID)
|
||||
sparm2 := md5hex(barcode + tsMs)
|
||||
sparm3 := tsMs[:10]
|
||||
q := url.Values{}
|
||||
q.Set("sdogid", c.sdogID)
|
||||
q.Set("regnum", "1")
|
||||
q.Set("barcode", barcode)
|
||||
q.Set("sparm1", sparm1)
|
||||
q.Set("sparm2", sparm2)
|
||||
q.Set("sparm3", sparm3)
|
||||
q.Set("sparm4", "")
|
||||
q.Set("barcodetype", "yunpos")
|
||||
reqURL := endpoint + "?" + q.Encode()
|
||||
|
||||
req, _ := http.NewRequestWithContext(ctx, "GET", reqURL, nil)
|
||||
req.Header.Set("User-Agent", "Mozilla/5.0")
|
||||
resp, err := c.client.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
b, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
inner := b
|
||||
if m := stringTagRe.FindSubmatch(b); m != nil {
|
||||
inner = m[1]
|
||||
}
|
||||
var r rawResp
|
||||
if err := json.Unmarshal(inner, &r); err != nil {
|
||||
return nil, fmt.Errorf("parse: %v (body=%.120s)", err, string(b))
|
||||
}
|
||||
p := &Product{
|
||||
Barcode: barcode,
|
||||
RetMsg: r.RetMsg,
|
||||
FetchedAt: time.Now().Format(time.RFC3339),
|
||||
Source: "zc.bypos.net",
|
||||
}
|
||||
if r.RetCode == "1" {
|
||||
p.Status = "hit"
|
||||
p.Name = strings.TrimSpace(r.ItemName)
|
||||
p.Spec = strings.TrimSpace(r.ItemSize)
|
||||
p.Unit = strings.TrimSpace(r.UnitNo)
|
||||
p.Area = strings.TrimSpace(r.ItemArea)
|
||||
p.Manufacturer = strings.TrimSpace(r.BirthCom)
|
||||
p.License = strings.TrimSpace(r.BirthDoc)
|
||||
p.InPrice = strings.TrimSpace(r.InPrice)
|
||||
p.SellPrice = strings.TrimSpace(r.SellPrice)
|
||||
} else if strings.Contains(r.RetMsg, "非国标") || strings.Contains(r.RetMsg, "参数异常") {
|
||||
p.Status = "invalid"
|
||||
} else {
|
||||
p.Status = "miss"
|
||||
}
|
||||
return p, nil
|
||||
}
|
||||
|
||||
// ---- job / collector state ----
|
||||
|
||||
type Stats struct {
|
||||
Running bool `json:"running"`
|
||||
Total int64 `json:"total"`
|
||||
Done int64 `json:"done"`
|
||||
Hits int64 `json:"hits"`
|
||||
Miss int64 `json:"miss"`
|
||||
Invalid int64 `json:"invalid"`
|
||||
Errors int64 `json:"errors"`
|
||||
Skipped int64 `json:"skipped"`
|
||||
Current string `json:"current"`
|
||||
OutFile string `json:"out_file"`
|
||||
StartedAt string `json:"started_at"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
type Collector struct {
|
||||
mu sync.Mutex
|
||||
client *http.Client
|
||||
sdogID string
|
||||
outPath string
|
||||
outFile *os.File
|
||||
|
||||
cancel context.CancelFunc
|
||||
wg sync.WaitGroup
|
||||
|
||||
// atomic counters
|
||||
total, done, hits, miss, invalid, errors, skipped int64
|
||||
running int32
|
||||
|
||||
current atomic.Value // string
|
||||
startedAt string
|
||||
message string
|
||||
|
||||
seen map[string]struct{} // barcodes already in output (dedupe / resume)
|
||||
recent []Product // ring of last results for UI
|
||||
}
|
||||
|
||||
func NewCollector(sdogID string) *Collector {
|
||||
if sdogID == "" {
|
||||
sdogID = defaultSdogID
|
||||
}
|
||||
c := &Collector{
|
||||
client: &http.Client{Timeout: 25 * time.Second},
|
||||
sdogID: sdogID,
|
||||
seen: map[string]struct{}{},
|
||||
}
|
||||
c.current.Store("")
|
||||
return c
|
||||
}
|
||||
|
||||
func (c *Collector) isRunning() bool { return atomic.LoadInt32(&c.running) == 1 }
|
||||
|
||||
func (c *Collector) snapshot() Stats {
|
||||
cur, _ := c.current.Load().(string)
|
||||
c.mu.Lock()
|
||||
msg := c.message
|
||||
out := c.outPath
|
||||
started := c.startedAt
|
||||
c.mu.Unlock()
|
||||
return Stats{
|
||||
Running: c.isRunning(),
|
||||
Total: atomic.LoadInt64(&c.total),
|
||||
Done: atomic.LoadInt64(&c.done),
|
||||
Hits: atomic.LoadInt64(&c.hits),
|
||||
Miss: atomic.LoadInt64(&c.miss),
|
||||
Invalid: atomic.LoadInt64(&c.invalid),
|
||||
Errors: atomic.LoadInt64(&c.errors),
|
||||
Skipped: atomic.LoadInt64(&c.skipped),
|
||||
Current: cur,
|
||||
OutFile: out,
|
||||
StartedAt: started,
|
||||
Message: msg,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Collector) recentResults() []Product {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
out := make([]Product, len(c.recent))
|
||||
copy(out, c.recent)
|
||||
return out
|
||||
}
|
||||
|
||||
func (c *Collector) pushRecent(p Product) {
|
||||
c.mu.Lock()
|
||||
c.recent = append(c.recent, p)
|
||||
if len(c.recent) > 60 {
|
||||
c.recent = c.recent[len(c.recent)-60:]
|
||||
}
|
||||
c.mu.Unlock()
|
||||
}
|
||||
|
||||
// loadSeen reads an existing output file to build the dedupe set (for resume).
|
||||
func (c *Collector) loadSeen(path string) error {
|
||||
c.seen = map[string]struct{}{}
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
dec := json.NewDecoder(f)
|
||||
for {
|
||||
var p Product
|
||||
if err := dec.Decode(&p); err != nil {
|
||||
break
|
||||
}
|
||||
if p.Barcode != "" {
|
||||
c.seen[p.Barcode] = struct{}{}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type JobReq struct {
|
||||
Mode string `json:"mode"` // "range" | "list"
|
||||
StartBody string `json:"start_body"` // 12-digit body (range mode)
|
||||
EndBody string `json:"end_body"` // 12-digit body (range mode)
|
||||
List string `json:"list"` // newline/space separated barcodes (list mode)
|
||||
Concurrency int `json:"concurrency"` // parallel requests
|
||||
DelayMs int `json:"delay_ms"` // min interval between request starts
|
||||
LogMiss bool `json:"log_miss"` // also write miss/invalid lines
|
||||
OutFile string `json:"out_file"`
|
||||
SdogID string `json:"sdog_id"`
|
||||
}
|
||||
|
||||
func sanitizeBarcodes(s string) []string {
|
||||
fields := regexp.MustCompile(`[^0-9]+`).Split(s, -1)
|
||||
var out []string
|
||||
for _, f := range fields {
|
||||
if f != "" {
|
||||
out = append(out, f)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Start launches a collection job. Returns error if validation fails or busy.
|
||||
func (c *Collector) Start(req JobReq) error {
|
||||
if c.isRunning() {
|
||||
return fmt.Errorf("已有任务在运行")
|
||||
}
|
||||
if req.Concurrency <= 0 {
|
||||
req.Concurrency = 3
|
||||
}
|
||||
if req.Concurrency > 20 {
|
||||
req.Concurrency = 20
|
||||
}
|
||||
if req.DelayMs < 0 {
|
||||
req.DelayMs = 0
|
||||
}
|
||||
if req.OutFile == "" {
|
||||
req.OutFile = "products.jsonl"
|
||||
}
|
||||
if req.SdogID != "" {
|
||||
c.sdogID = req.SdogID
|
||||
}
|
||||
|
||||
// Build the list of barcodes to query.
|
||||
var barcodes []string
|
||||
switch req.Mode {
|
||||
case "list":
|
||||
barcodes = sanitizeBarcodes(req.List)
|
||||
if len(barcodes) == 0 {
|
||||
return fmt.Errorf("条码清单为空")
|
||||
}
|
||||
case "range":
|
||||
start, err := strconv.ParseInt(req.StartBody, 10, 64)
|
||||
if err != nil || len(req.StartBody) != 12 {
|
||||
return fmt.Errorf("起始码必须是 12 位数字(不含校验位)")
|
||||
}
|
||||
end, err := strconv.ParseInt(req.EndBody, 10, 64)
|
||||
if err != nil || len(req.EndBody) != 12 {
|
||||
return fmt.Errorf("结束码必须是 12 位数字(不含校验位)")
|
||||
}
|
||||
if end < start {
|
||||
return fmt.Errorf("结束码不能小于起始码")
|
||||
}
|
||||
if end-start+1 > 5_000_000 {
|
||||
return fmt.Errorf("单次范围过大(>500万),请缩小区间分批采集")
|
||||
}
|
||||
for v := start; v <= end; v++ {
|
||||
body := fmt.Sprintf("%012d", v)
|
||||
full, ok := ean13Check(body)
|
||||
if ok {
|
||||
barcodes = append(barcodes, full)
|
||||
}
|
||||
}
|
||||
default:
|
||||
return fmt.Errorf("未知模式: %s", req.Mode)
|
||||
}
|
||||
|
||||
abs, _ := filepath.Abs(req.OutFile)
|
||||
if err := c.loadSeen(abs); err != nil {
|
||||
return fmt.Errorf("读取已有文件失败: %v", err)
|
||||
}
|
||||
f, err := os.OpenFile(abs, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
return fmt.Errorf("打开输出文件失败: %v", err)
|
||||
}
|
||||
c.outFile = f
|
||||
c.outPath = abs
|
||||
|
||||
// reset counters
|
||||
atomic.StoreInt64(&c.total, int64(len(barcodes)))
|
||||
atomic.StoreInt64(&c.done, 0)
|
||||
atomic.StoreInt64(&c.hits, 0)
|
||||
atomic.StoreInt64(&c.miss, 0)
|
||||
atomic.StoreInt64(&c.invalid, 0)
|
||||
atomic.StoreInt64(&c.errors, 0)
|
||||
atomic.StoreInt64(&c.skipped, 0)
|
||||
c.mu.Lock()
|
||||
c.recent = nil
|
||||
c.startedAt = time.Now().Format(time.RFC3339)
|
||||
c.message = ""
|
||||
c.mu.Unlock()
|
||||
atomic.StoreInt32(&c.running, 1)
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
c.cancel = cancel
|
||||
|
||||
go c.run(ctx, barcodes, req)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Collector) Stop() {
|
||||
if c.cancel != nil {
|
||||
c.cancel()
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Collector) run(ctx context.Context, barcodes []string, req JobReq) {
|
||||
defer func() {
|
||||
atomic.StoreInt32(&c.running, 0)
|
||||
if c.outFile != nil {
|
||||
c.outFile.Sync()
|
||||
c.outFile.Close()
|
||||
c.outFile = nil
|
||||
}
|
||||
c.current.Store("")
|
||||
}()
|
||||
|
||||
jobs := make(chan string, req.Concurrency*2)
|
||||
var writeMu sync.Mutex
|
||||
|
||||
// global rate limiter: one token every DelayMs
|
||||
var ticker *time.Ticker
|
||||
if req.DelayMs > 0 {
|
||||
ticker = time.NewTicker(time.Duration(req.DelayMs) * time.Millisecond)
|
||||
defer ticker.Stop()
|
||||
}
|
||||
|
||||
worker := func() {
|
||||
defer c.wg.Done()
|
||||
for bc := range jobs {
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
if ticker != nil {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
c.current.Store(bc)
|
||||
p, err := c.lookup(ctx, bc)
|
||||
if err != nil {
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
atomic.AddInt64(&c.errors, 1)
|
||||
atomic.AddInt64(&c.done, 1)
|
||||
ep := Product{Barcode: bc, Status: "error", RetMsg: err.Error(), FetchedAt: time.Now().Format(time.RFC3339), Source: "zc.bypos.net"}
|
||||
c.pushRecent(ep)
|
||||
continue
|
||||
}
|
||||
switch p.Status {
|
||||
case "hit":
|
||||
atomic.AddInt64(&c.hits, 1)
|
||||
case "miss":
|
||||
atomic.AddInt64(&c.miss, 1)
|
||||
case "invalid":
|
||||
atomic.AddInt64(&c.invalid, 1)
|
||||
}
|
||||
atomic.AddInt64(&c.done, 1)
|
||||
c.pushRecent(*p)
|
||||
if p.Status == "hit" || req.LogMiss {
|
||||
line, _ := json.Marshal(p)
|
||||
writeMu.Lock()
|
||||
c.outFile.Write(line)
|
||||
c.outFile.Write([]byte("\n"))
|
||||
c.seen[bc] = struct{}{}
|
||||
writeMu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for i := 0; i < req.Concurrency; i++ {
|
||||
c.wg.Add(1)
|
||||
go worker()
|
||||
}
|
||||
|
||||
for _, bc := range barcodes {
|
||||
if ctx.Err() != nil {
|
||||
break
|
||||
}
|
||||
if _, ok := c.seen[bc]; ok {
|
||||
atomic.AddInt64(&c.skipped, 1)
|
||||
atomic.AddInt64(&c.done, 1)
|
||||
continue
|
||||
}
|
||||
select {
|
||||
case jobs <- bc:
|
||||
case <-ctx.Done():
|
||||
}
|
||||
}
|
||||
close(jobs)
|
||||
c.wg.Wait()
|
||||
|
||||
c.mu.Lock()
|
||||
if ctx.Err() != nil {
|
||||
c.message = "已停止"
|
||||
} else {
|
||||
c.message = "采集完成"
|
||||
}
|
||||
c.mu.Unlock()
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
module byposcollector
|
||||
|
||||
go 1.23.4
|
||||
@@ -1,156 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"encoding/csv"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
"runtime"
|
||||
"time"
|
||||
)
|
||||
|
||||
//go:embed web/*
|
||||
var webFS embed.FS
|
||||
|
||||
var collector = NewCollector("")
|
||||
|
||||
func main() {
|
||||
addr := flag.String("addr", "127.0.0.1:8765", "本地监听地址")
|
||||
noOpen := flag.Bool("no-open", false, "不自动打开浏览器")
|
||||
sdog := flag.String("sdogid", "", "中心库账号 id(默认使用内置值)")
|
||||
flag.Parse()
|
||||
if *sdog != "" {
|
||||
collector.sdogID = *sdog
|
||||
}
|
||||
|
||||
sub, _ := fs.Sub(webFS, "web")
|
||||
mux := http.NewServeMux()
|
||||
mux.Handle("/", http.FileServer(http.FS(sub)))
|
||||
mux.HandleFunc("/api/start", handleStart)
|
||||
mux.HandleFunc("/api/stop", handleStop)
|
||||
mux.HandleFunc("/api/stats", handleStats)
|
||||
mux.HandleFunc("/api/download", handleDownload)
|
||||
mux.HandleFunc("/api/export.csv", handleExportCSV)
|
||||
|
||||
ln, err := net.Listen("tcp", *addr)
|
||||
if err != nil {
|
||||
log.Fatalf("无法监听 %s: %v", *addr, err)
|
||||
}
|
||||
realAddr := ln.Addr().String()
|
||||
urlStr := "http://" + realAddr + "/"
|
||||
fmt.Println("==============================================")
|
||||
fmt.Println(" 中心库商品采集器 bypos-collector")
|
||||
fmt.Println(" 控制台: " + urlStr)
|
||||
fmt.Println(" 关闭本窗口即停止程序")
|
||||
fmt.Println("==============================================")
|
||||
if !*noOpen {
|
||||
go openBrowser(urlStr)
|
||||
}
|
||||
log.Fatal(http.Serve(ln, mux))
|
||||
}
|
||||
|
||||
func openBrowser(url string) {
|
||||
time.Sleep(600 * time.Millisecond)
|
||||
var cmd string
|
||||
var args []string
|
||||
switch runtime.GOOS {
|
||||
case "windows":
|
||||
cmd = "rundll32"
|
||||
args = []string{"url.dll,FileProtocolHandler", url}
|
||||
case "darwin":
|
||||
cmd = "open"
|
||||
args = []string{url}
|
||||
default:
|
||||
cmd = "xdg-open"
|
||||
args = []string{url}
|
||||
}
|
||||
_ = exec.Command(cmd, args...).Start()
|
||||
}
|
||||
|
||||
func writeJSON(w http.ResponseWriter, code int, v interface{}) {
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
w.WriteHeader(code)
|
||||
json.NewEncoder(w).Encode(v)
|
||||
}
|
||||
|
||||
func handleStart(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "POST" {
|
||||
http.Error(w, "method", 405)
|
||||
return
|
||||
}
|
||||
var req JobReq
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeJSON(w, 400, map[string]string{"error": "请求格式错误"})
|
||||
return
|
||||
}
|
||||
if err := collector.Start(req); err != nil {
|
||||
writeJSON(w, 400, map[string]string{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
writeJSON(w, 200, map[string]string{"ok": "started"})
|
||||
}
|
||||
|
||||
func handleStop(w http.ResponseWriter, r *http.Request) {
|
||||
collector.Stop()
|
||||
writeJSON(w, 200, map[string]string{"ok": "stopping"})
|
||||
}
|
||||
|
||||
func handleStats(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, 200, map[string]interface{}{
|
||||
"stats": collector.snapshot(),
|
||||
"recent": collector.recentResults(),
|
||||
})
|
||||
}
|
||||
|
||||
func handleDownload(w http.ResponseWriter, r *http.Request) {
|
||||
s := collector.snapshot()
|
||||
if s.OutFile == "" {
|
||||
http.Error(w, "no output yet", 404)
|
||||
return
|
||||
}
|
||||
f, err := os.Open(s.OutFile)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 404)
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
w.Header().Set("Content-Type", "application/x-ndjson; charset=utf-8")
|
||||
w.Header().Set("Content-Disposition", "attachment; filename=products.jsonl")
|
||||
io.Copy(w, f)
|
||||
}
|
||||
|
||||
func handleExportCSV(w http.ResponseWriter, r *http.Request) {
|
||||
s := collector.snapshot()
|
||||
if s.OutFile == "" {
|
||||
http.Error(w, "no output yet", 404)
|
||||
return
|
||||
}
|
||||
f, err := os.Open(s.OutFile)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 404)
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
w.Header().Set("Content-Type", "text/csv; charset=utf-8")
|
||||
w.Header().Set("Content-Disposition", "attachment; filename=products.csv")
|
||||
w.Write([]byte{0xEF, 0xBB, 0xBF}) // UTF-8 BOM so Excel reads Chinese correctly
|
||||
cw := csv.NewWriter(w)
|
||||
cw.Write([]string{"barcode", "name", "spec", "unit", "area", "manufacturer", "license", "in_price", "sell_price", "status", "fetched_at"})
|
||||
dec := json.NewDecoder(f)
|
||||
for {
|
||||
var p Product
|
||||
if err := dec.Decode(&p); err != nil {
|
||||
break
|
||||
}
|
||||
cw.Write([]string{p.Barcode, p.Name, p.Spec, p.Unit, p.Area, p.Manufacturer, p.License, p.InPrice, p.SellPrice, p.Status, p.FetchedAt})
|
||||
}
|
||||
cw.Flush()
|
||||
}
|
||||
@@ -1,206 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>中心库商品采集器</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; }
|
||||
body { font-family: -apple-system, "Microsoft YaHei", Arial, sans-serif; margin: 0; background:#f4f6f9; color:#222; }
|
||||
header { background:#1f6feb; color:#fff; padding:14px 22px; font-size:18px; font-weight:600; }
|
||||
.wrap { max-width:1080px; margin:18px auto; padding:0 16px; }
|
||||
.card { background:#fff; border:1px solid #e3e8ef; border-radius:10px; padding:18px 20px; margin-bottom:16px; }
|
||||
.card h3 { margin:0 0 12px; font-size:15px; color:#1f6feb; }
|
||||
label { display:block; font-size:13px; color:#555; margin:8px 0 4px; }
|
||||
input[type=text], input[type=number], textarea, select {
|
||||
width:100%; padding:8px 10px; border:1px solid #cdd5e0; border-radius:6px; font-size:14px;
|
||||
}
|
||||
textarea { height:90px; font-family:monospace; }
|
||||
.row { display:flex; gap:14px; flex-wrap:wrap; }
|
||||
.row > div { flex:1; min-width:160px; }
|
||||
.tabs { display:flex; gap:8px; margin-bottom:12px; }
|
||||
.tab { padding:7px 16px; border:1px solid #cdd5e0; border-radius:20px; cursor:pointer; font-size:13px; background:#fff; }
|
||||
.tab.active { background:#1f6feb; color:#fff; border-color:#1f6feb; }
|
||||
button.primary { background:#1f6feb; color:#fff; border:none; padding:10px 22px; border-radius:6px; font-size:14px; cursor:pointer; }
|
||||
button.danger { background:#d1242f; color:#fff; border:none; padding:10px 22px; border-radius:6px; font-size:14px; cursor:pointer; }
|
||||
button.ghost { background:#fff; color:#1f6feb; border:1px solid #1f6feb; padding:8px 16px; border-radius:6px; cursor:pointer; font-size:13px; }
|
||||
button:disabled { opacity:.5; cursor:not-allowed; }
|
||||
.stats { display:flex; gap:10px; flex-wrap:wrap; }
|
||||
.stat { flex:1; min-width:90px; background:#f7f9fc; border:1px solid #e3e8ef; border-radius:8px; padding:10px; text-align:center; }
|
||||
.stat .n { font-size:22px; font-weight:700; }
|
||||
.stat .l { font-size:12px; color:#777; margin-top:2px; }
|
||||
.bar { height:10px; background:#e3e8ef; border-radius:6px; overflow:hidden; margin:10px 0; }
|
||||
.bar > div { height:100%; background:#2da44e; width:0%; transition:width .4s; }
|
||||
table { width:100%; border-collapse:collapse; font-size:13px; }
|
||||
th, td { text-align:left; padding:6px 8px; border-bottom:1px solid #eef1f5; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; max-width:180px; }
|
||||
th { color:#888; font-weight:600; }
|
||||
.hit { color:#2da44e; } .miss { color:#999; } .invalid { color:#d1242f; } .error { color:#bf8700; }
|
||||
.hint { font-size:12px; color:#888; margin-top:6px; line-height:1.5; }
|
||||
.est { font-size:13px; color:#1f6feb; margin-top:6px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header>中心库商品采集器 · bypos-collector</header>
|
||||
<div class="wrap">
|
||||
|
||||
<div class="card">
|
||||
<h3>① 规划采集范围</h3>
|
||||
<div class="tabs">
|
||||
<div class="tab active" data-mode="range" onclick="setMode('range')">按条码范围</div>
|
||||
<div class="tab" data-mode="list" onclick="setMode('list')">按条码清单</div>
|
||||
</div>
|
||||
|
||||
<div id="pane-range">
|
||||
<div class="hint">EAN-13 国标条码共 13 位,最后一位是校验位由程序自动计算。下面填<b>前 12 位</b>(本体),程序逐个枚举并补校验位查询。常见前缀:69 开头为中国大陆。</div>
|
||||
<label>快捷填充前缀(可选)</label>
|
||||
<div class="row">
|
||||
<div><input type="text" id="prefix" placeholder="如 690100,点下方按钮自动算区间"/></div>
|
||||
<div style="flex:0"><button class="ghost" onclick="fillFromPrefix()">用前缀填充区间</button></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div>
|
||||
<label>起始本体(12 位)</label>
|
||||
<input type="text" id="start" value="690100000000" maxlength="12"/>
|
||||
</div>
|
||||
<div>
|
||||
<label>结束本体(12 位)</label>
|
||||
<input type="text" id="end" value="690100000999" maxlength="12"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="est" id="est"></div>
|
||||
</div>
|
||||
|
||||
<div id="pane-list" style="display:none">
|
||||
<label>粘贴条码清单(每行一个,或用空格/逗号分隔)</label>
|
||||
<textarea id="list" placeholder="6901028941068 6920202888883"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>② 采集参数</h3>
|
||||
<div class="row">
|
||||
<div>
|
||||
<label>并发数</label>
|
||||
<input type="number" id="concurrency" value="3" min="1" max="20"/>
|
||||
</div>
|
||||
<div>
|
||||
<label>每次请求间隔(毫秒)</label>
|
||||
<input type="number" id="delay" value="300" min="0"/>
|
||||
</div>
|
||||
<div>
|
||||
<label>输出文件名</label>
|
||||
<input type="text" id="outfile" value="products.jsonl"/>
|
||||
</div>
|
||||
</div>
|
||||
<label style="margin-top:12px"><input type="checkbox" id="logmiss"/> 同时记录未命中/无效条码(默认只存命中)</label>
|
||||
<div class="hint">速度越快越容易触发上游频控。建议并发 3、间隔 300ms 起步,稳定后再调。已采过的条码会自动跳过(断点续采)。</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>③ 运行</h3>
|
||||
<div style="margin-bottom:12px">
|
||||
<button class="primary" id="btnStart" onclick="start()">开始采集</button>
|
||||
<button class="danger" id="btnStop" onclick="stop()" disabled>停止</button>
|
||||
<button class="ghost" onclick="window.open('/api/download')">下载 JSONL</button>
|
||||
<button class="ghost" onclick="window.open('/api/export.csv')">导出 CSV(Excel)</button>
|
||||
</div>
|
||||
<div class="bar"><div id="prog"></div></div>
|
||||
<div class="stats">
|
||||
<div class="stat"><div class="n" id="s-done">0</div><div class="l">已处理</div></div>
|
||||
<div class="stat"><div class="n" id="s-total">0</div><div class="l">总计</div></div>
|
||||
<div class="stat"><div class="n hit" id="s-hits">0</div><div class="l">命中</div></div>
|
||||
<div class="stat"><div class="n miss" id="s-miss">0</div><div class="l">未命中</div></div>
|
||||
<div class="stat"><div class="n invalid" id="s-invalid">0</div><div class="l">无效</div></div>
|
||||
<div class="stat"><div class="n error" id="s-errors">0</div><div class="l">错误</div></div>
|
||||
<div class="stat"><div class="n" id="s-skipped">0</div><div class="l">跳过</div></div>
|
||||
</div>
|
||||
<div class="hint" id="msg"></div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h3>④ 实时结果(最近 60 条)</h3>
|
||||
<div style="max-height:340px; overflow:auto">
|
||||
<table>
|
||||
<thead><tr><th>条码</th><th>品名</th><th>规格</th><th>单位</th><th>产地</th><th>进价</th><th>零售价</th><th>状态</th></tr></thead>
|
||||
<tbody id="rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let mode = 'range';
|
||||
function setMode(m){
|
||||
mode = m;
|
||||
document.querySelectorAll('.tab').forEach(t=>t.classList.toggle('active', t.dataset.mode===m));
|
||||
document.getElementById('pane-range').style.display = m==='range'?'block':'none';
|
||||
document.getElementById('pane-list').style.display = m==='list'?'block':'none';
|
||||
}
|
||||
function fillFromPrefix(){
|
||||
let p = document.getElementById('prefix').value.replace(/[^0-9]/g,'');
|
||||
if(!p){ alert('请先填前缀'); return; }
|
||||
if(p.length>=12){ alert('前缀太长,应少于 12 位'); return; }
|
||||
let pad = 12 - p.length;
|
||||
document.getElementById('start').value = p + '0'.repeat(pad);
|
||||
document.getElementById('end').value = p + '9'.repeat(pad);
|
||||
updateEst();
|
||||
}
|
||||
function updateEst(){
|
||||
let s = document.getElementById('start').value.replace(/[^0-9]/g,'');
|
||||
let e = document.getElementById('end').value.replace(/[^0-9]/g,'');
|
||||
if(s.length===12 && e.length===12){
|
||||
let n = (BigInt(e) - BigInt(s)) + 1n;
|
||||
document.getElementById('est').textContent = '本次将查询约 ' + n.toString() + ' 个条码';
|
||||
} else {
|
||||
document.getElementById('est').textContent = '';
|
||||
}
|
||||
}
|
||||
document.getElementById('start').addEventListener('input', updateEst);
|
||||
document.getElementById('end').addEventListener('input', updateEst);
|
||||
updateEst();
|
||||
|
||||
async function start(){
|
||||
let body = {
|
||||
mode: mode,
|
||||
start_body: document.getElementById('start').value.trim(),
|
||||
end_body: document.getElementById('end').value.trim(),
|
||||
list: document.getElementById('list').value,
|
||||
concurrency: parseInt(document.getElementById('concurrency').value)||3,
|
||||
delay_ms: parseInt(document.getElementById('delay').value)||0,
|
||||
log_miss: document.getElementById('logmiss').checked,
|
||||
out_file: document.getElementById('outfile').value.trim()
|
||||
};
|
||||
let r = await fetch('/api/start', {method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify(body)});
|
||||
let j = await r.json();
|
||||
if(j.error){ alert('启动失败: ' + j.error); return; }
|
||||
}
|
||||
async function stop(){ await fetch('/api/stop', {method:'POST'}); }
|
||||
|
||||
function esc(s){ return (s||'').replace(/[&<>]/g, c=>({'&':'&','<':'<','>':'>'}[c])); }
|
||||
|
||||
async function poll(){
|
||||
try{
|
||||
let r = await fetch('/api/stats'); let j = await r.json();
|
||||
let s = j.stats;
|
||||
document.getElementById('s-done').textContent = s.done;
|
||||
document.getElementById('s-total').textContent = s.total;
|
||||
document.getElementById('s-hits').textContent = s.hits;
|
||||
document.getElementById('s-miss').textContent = s.miss;
|
||||
document.getElementById('s-invalid').textContent = s.invalid;
|
||||
document.getElementById('s-errors').textContent = s.errors;
|
||||
document.getElementById('s-skipped').textContent = s.skipped;
|
||||
let pct = s.total>0 ? Math.floor(s.done*100/s.total) : 0;
|
||||
document.getElementById('prog').style.width = pct + '%';
|
||||
document.getElementById('msg').textContent = (s.running? ('采集中… 当前 '+s.current) : (s.message||'空闲'));
|
||||
document.getElementById('btnStart').disabled = s.running;
|
||||
document.getElementById('btnStop').disabled = !s.running;
|
||||
let rows = (j.recent||[]).slice().reverse().map(p=>
|
||||
'<tr><td>'+esc(p.barcode)+'</td><td>'+esc(p.name)+'</td><td>'+esc(p.spec)+'</td><td>'+esc(p.unit)+'</td><td>'+esc(p.area)+'</td><td>'+esc(p.in_price)+'</td><td>'+esc(p.sell_price)+'</td><td class="'+p.status+'">'+esc(p.status)+'</td></tr>'
|
||||
).join('');
|
||||
document.getElementById('rows').innerHTML = rows;
|
||||
}catch(e){}
|
||||
}
|
||||
setInterval(poll, 1000); poll();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,68 +0,0 @@
|
||||
# 中心库商品采集器 bypos-collector 使用说明
|
||||
|
||||
一个单文件 Windows 小程序,通过云店「新增商品」用到的同一个中心商品库
|
||||
(`zc.bypos.net`)按条码批量采集商品档案(品名/规格/单位/产地/厂商/建议进价/建议零售价),
|
||||
存到本地,供后续导入天工(goods)系统。
|
||||
|
||||
## 一、运行
|
||||
|
||||
1. 把 `bypos-collector.exe` 放到任意空文件夹(采集结果会生成在同一文件夹)。
|
||||
2. 双击运行。会弹出一个黑色命令行窗口(不要关它),并自动打开浏览器控制台
|
||||
`http://127.0.0.1:8765/`。
|
||||
- 若没自动打开,手动在浏览器输入上面这个地址。
|
||||
3. 用完直接关掉那个命令行窗口即可退出。
|
||||
|
||||
## 二、采集
|
||||
|
||||
控制台分四步:
|
||||
|
||||
**① 规划采集范围** —— 两种方式二选一:
|
||||
- **按条码范围**:EAN-13 国标条码共 13 位,最后一位是校验位,程序自动算。
|
||||
你只填**前 12 位**的起止区间。可在「快捷填充前缀」里填如 `690100`,
|
||||
点按钮自动生成区间(`690100000000` ~ `690100999999`)。
|
||||
- **按条码清单**:直接粘贴一批条码(每行一个,或空格/逗号分隔)。
|
||||
|
||||
**② 采集参数**:
|
||||
- 并发数(默认 3)、请求间隔(默认 300ms):**越慢越安全**,上游可能对账号限频。
|
||||
- 输出文件名(默认 `products.jsonl`)。
|
||||
- 「同时记录未命中/无效条码」:默认只存命中的;勾上会把未命中也记下来。
|
||||
|
||||
**③ 运行**:点「开始采集」。进度、命中/未命中/错误实时显示。
|
||||
已经采过的条码会自动跳过(可随时停了再开,断点续采)。
|
||||
|
||||
**④ 实时结果**:最近 60 条滚动显示。
|
||||
|
||||
## 三、导出
|
||||
|
||||
- 「下载 JSONL」:原始数据(每行一个 JSON),用于导入天工系统。
|
||||
- 「导出 CSV」:Excel 可直接打开查看。
|
||||
|
||||
## 四、字段说明(JSONL 每行)
|
||||
|
||||
| 字段 | 含义 |
|
||||
| --- | --- |
|
||||
| barcode | 条码(GTIN/EAN-13) |
|
||||
| name | 品名 |
|
||||
| spec | 规格 |
|
||||
| unit | 单位 |
|
||||
| area | 产地/地区 |
|
||||
| manufacturer | 生产企业(常为空) |
|
||||
| license | 生产许可(常为空) |
|
||||
| in_price | 建议进价 |
|
||||
| sell_price | 建议零售价 |
|
||||
| status | hit=命中 / miss=不存在 / invalid=非国标条码 / error=请求出错 |
|
||||
| fetched_at | 采集时间 |
|
||||
|
||||
## 五、注意
|
||||
|
||||
- 这是用云店账号授权去查上游中心库,**批量自动**比页面里一条条查更"重",
|
||||
上游厂商可能对账号做频控/限额。请低速、分批("一点点采"),发现大量报错就降速。
|
||||
- 全量 69 段是个天文数字,不要无脑全跑;建议按你关心的品牌/品类前缀分批。
|
||||
|
||||
## 六、命令行参数(可选)
|
||||
|
||||
```
|
||||
bypos-collector.exe -addr 127.0.0.1:8765 # 改监听端口
|
||||
bypos-collector.exe -no-open # 不自动开浏览器
|
||||
bypos-collector.exe -sdogid 137966 # 指定中心库账号 id
|
||||
```
|
||||
Reference in New Issue
Block a user