- {items.slice(0, 2).map((item) => (
-
- {item.resourceId || "-"} / {item.quantity || 0}
- {item.durationMs ? ` / ${formatDuration(item.durationMs)}` : ""}
-
+ 
:
+ {items.map((item) => (
+
+ );
+}
+
+function GrantItemMedia({ item }) {
+ const snapshot = parseGrantItemSnapshot(item.resourceSnapshotJson);
+ const walletAssetType = snapshotValue(snapshot, "walletAssetType", "wallet_asset_type", "WalletAssetType");
+ if (walletAssetType) {
+ const label = resourceGroupAssetLabels[walletAssetType] || walletAssetType;
+ const amount = snapshotValue(snapshot, "walletAssetAmount", "wallet_asset_amount", "WalletAssetAmount", "quantity");
+ return {`${label} ${formatNumber(amount || item.quantity)}`};
+ }
+
+ const label = grantItemLabel(item, snapshot);
+ const imageUrl = grantItemImageUrl(snapshot);
+ return (
+
+
+ {imageUrl ?
+ {sourceLabel === "-" ? subjectLabel : `${subjectLabel} · ${sourceLabel}`}
+ {subjectMeta(grant)}
+
+ );
+}
+
+function GrantReason({ grant }) {
+ const label = reasonLabel(grant.reason);
+ const raw = String(grant.reason || "").trim();
+ return (
+
+ {label}
+ {raw && raw !== label ? {raw} : null}
);
}
@@ -384,26 +420,115 @@ function GrantOperator({ grant }) {
/>
);
}
- if (source === "admin") {
- const name = operator.name || operator.username || (operatorUserId ? `Admin ${operatorUserId}` : "-");
- return (
-
- {name}
- {operator.username || operatorUserId || "-"}
-
- );
+ return "-";
+}
+
+const grantSourceLabels = {
+ achievement: "成就奖励",
+ admin: "后台发放",
+ agency_opening: "Agency 开通",
+ cp_weekly_rank: "CP 周榜奖励",
+ cumulative_recharge_reward: "累充奖励",
+ first_recharge_reward: "首充奖励",
+ game_robot_init: "机器人初始化",
+ growth_level: "成长等级奖励",
+ manager_center: "经理中心",
+ registration_reward: "注册奖励",
+ resource_shop: "道具商店",
+ room_rocket: "房间火箭",
+ seven_day_checkin: "七日签到",
+ weekly_star: "周星奖励",
+ wheel_reward: "转盘奖励",
+};
+
+const grantReasonLabels = {
+ ...grantSourceLabels,
+ growth_level_registration_badge: "注册成长等级徽章",
+ "resource shop purchase": "道具商店购买",
+};
+
+function grantSourceLabel(source) {
+ const key = String(source || "").trim();
+ return grantSourceLabels[key] || key || "-";
+}
+
+function reasonLabel(reason) {
+ const key = String(reason || "").trim();
+ return grantReasonLabels[key] || key || "-";
+}
+
+function subjectMeta(grant) {
+ const subjectLabel = resourceGrantSubjectLabels[grant.grantSubjectType] || grant.grantSubjectType || "对象";
+ return grant.grantSubjectId ? `${subjectLabel} ID ${grant.grantSubjectId}` : "-";
+}
+
+function grantItemLabel(item, snapshot = parseGrantItemSnapshot(item.resourceSnapshotJson)) {
+ const walletAssetType = snapshotValue(snapshot, "walletAssetType", "wallet_asset_type", "WalletAssetType");
+ if (walletAssetType) {
+ const label = resourceGroupAssetLabels[walletAssetType] || walletAssetType;
+ const amount = snapshotValue(snapshot, "walletAssetAmount", "wallet_asset_amount", "WalletAssetAmount", "quantity");
+ return `${label} ${formatNumber(amount || item.quantity)}`;
}
- if (!operatorUserId) {
- return "-";
+
+ const resourceName = snapshotValue(snapshot, "name", "Name", "resourceName", "resource_name") || `资源 ${item.resourceId || "-"}`;
+ const resourceType = snapshotValue(snapshot, "resourceType", "resource_type", "ResourceType");
+ const typeLabel = resourceTypeLabels[resourceType] || resourceType || "资源";
+ const quantity = Number(item.quantity || 0);
+ const parts = [`${resourceName} x${formatNumber(quantity)}`, typeLabel];
+ if (item.durationMs) {
+ parts.push(formatDuration(item.durationMs));
}
- return (
-
- {operatorUserId}
- {source || "-"}
-
+ return parts.join(" · ");
+}
+
+function grantItemImageUrl(snapshot) {
+ return imageURL(
+ snapshotValue(
+ snapshot,
+ "previewUrl",
+ "preview_url",
+ "PreviewURL",
+ "assetUrl",
+ "asset_url",
+ "AssetURL",
+ "animationUrl",
+ "animation_url",
+ "AnimationURL",
+ ),
);
}
+function parseGrantItemSnapshot(value) {
+ if (!value || typeof value !== "string") {
+ return {};
+ }
+ try {
+ const parsed = JSON.parse(value);
+ return parsed && typeof parsed === "object" ? parsed : {};
+ } catch {
+ return {};
+ }
+}
+
+function snapshotValue(snapshot, ...keys) {
+ for (const key of keys) {
+ const value = snapshot?.[key];
+ if (value !== undefined && value !== null && value !== "") {
+ return value;
+ }
+ }
+ return "";
+}
+
+function formatNumber(value) {
+ return Number(value || 0).toLocaleString("zh-CN");
+}
+
+function imageURL(value) {
+ const url = String(value || "").trim();
+ return /\.(avif|gif|jpe?g|png|webp)(\?|#|$)/i.test(url) ? url : "";
+}
+
function formatDuration(durationMs) {
const days = Number(durationMs || 0) / (24 * 60 * 60 * 1000);
return Number.isInteger(days) ? `${days}天` : `${days.toFixed(1)}天`;
diff --git a/src/features/resources/pages/ResourceGrantListPage.test.jsx b/src/features/resources/pages/ResourceGrantListPage.test.jsx
index 4df88ca..f5142e8 100644
--- a/src/features/resources/pages/ResourceGrantListPage.test.jsx
+++ b/src/features/resources/pages/ResourceGrantListPage.test.jsx
@@ -65,6 +65,91 @@ test("resource grant list hides revoke without permission", () => {
expect(screen.queryByLabelText("撤销")).not.toBeInTheDocument();
});
+test("resource grant list renders readable source, reason, and granted items", () => {
+ vi.mocked(useResourceGrantListPage).mockReturnValue(
+ pageFixture({
+ data: {
+ items: [
+ grantFixture({
+ grantId: "rgr_1234567890abcdef",
+ commandId: "seven_day_checkin_1782448934991_9b39c38",
+ grantSource: "seven_day_checkin",
+ grantSubjectId: "18",
+ grantSubjectType: "resource_group",
+ items: [
+ {
+ grantItemId: 1,
+ quantity: 100,
+ resourceId: 0,
+ resourceSnapshotJson: JSON.stringify({
+ wallet_asset_type: "COIN",
+ wallet_asset_amount: 100,
+ }),
+ },
+ {
+ durationMs: 7 * 24 * 60 * 60 * 1000,
+ grantItemId: 2,
+ quantity: 1,
+ resourceId: 385,
+ resourceSnapshotJson: JSON.stringify({
+ Name: "星光头像框",
+ PreviewURL: "https://media.haiyihy.com/star-frame.png",
+ ResourceType: "avatar_frame",
+ }),
+ },
+ ],
+ operator: { name: "后台用户", source: "admin", userId: "7" },
+ reason: "seven_day_checkin",
+ }),
+ ],
+ page: 1,
+ pageSize: 50,
+ total: 1,
+ },
+ }),
+ );
+
+ render(