Merge branch 'main' into feature/distribution-system

合入 main 的推广追踪(adtracking)模块,并解决与分销业务的 8 处冲突。

冲突解决原则:两边的字段、菜单与路由全部保留,不删任何一方。

后端:
- model/order.go:保留分销字段注释块,追加 SourceTrackCode
- model/user.go:追加 RegisterTrackCode;TokenVersion 默认值保持 1
  (与本库 users.token_version 列默认值一致)
- auth/repository.go:两处建号结构体同时写入 RegisterTrackCode 与 TokenVersion
- order/dto.go:OrderDTO 同时暴露 distribution_site_id 与 source_track_code;
  CreateRequest 同时接受 distribution_site_code 与 track_code
- order/presenter.go:同时映射 DistributionSiteID 与 SourceTrackCode

前端:
- orders/api/orders.ts:createOrder 同时携带 distribution_site_code 与 track_code
- layouts/AdminLayout.vue:分销管理菜单组与推广追踪菜单组并列保留
- router/adminRoutes.ts:分销 4 条路由与 tracking-links 路由并列保留

迁移:feature 侧 000064-000067 已在前一提交顺延为 000065-000068,
为 main 的 000064_ad_tracking 让号,合并后编号 000063→000068 连续无重复。
This commit is contained in:
yml2213
2026-09-10 13:06:18 +08:00
28 changed files with 2461 additions and 55 deletions
+10 -1
View File
@@ -3,6 +3,7 @@ import type { ApiResponse, PaginatedResult } from '@/shared/types/types'
import type { HandoffStatus, OrderStatus, SettlementStatus } from '@/shared/types/status'
import { yuanToCent } from '@/shared/utils/money'
import { getEffectiveSiteCode } from '@/stores/distributionSite'
import { getTrackCode } from '@/shared/utils/trackCode'
export interface Order {
id: number
@@ -361,10 +362,18 @@ export async function fetchOrder(id: string | number, distributionSiteCode?: str
export async function createOrder(listingId: number, distributionSiteCode?: string) {
const siteCode = distributionSiteCode || getEffectiveSiteCode() || undefined
const payload: { listing_id: number; distribution_site_code?: string } = { listing_id: listingId }
const trackCode = getTrackCode()
const payload: {
listing_id: number
distribution_site_code?: string
track_code?: string
} = { listing_id: listingId }
if (siteCode) {
payload.distribution_site_code = siteCode
}
if (trackCode) {
payload.track_code = trackCode
}
const { data } = await apiClient.post<ApiResponse<Order>>('/orders', payload)
return data.data
}