fix(admin): 商户筛选下拉改用不分页的精简接口
自查新做的下游订单页时发现的问题:商户筛选下拉调用 /api/platform/merchants?size=200,而分页查询会把 >100 的 size 静默降级为 20 (service.normalizePage),因此商户超过 20 家时下拉里会少一批商户,界面不报任何错。 - 新增 service.ListMerchantOptions:不分页返回全部启用商户的精简信息 (id/code/name),独立于分页的 ListMerchants - 新增 GET /api/platform/merchant-options - 前端改用该接口;types 增加 MerchantOption,api 增加 merchantOptions() 测试: - TestListMerchantOptionsReturnsAllActiveMerchants:造 25 家启用 + 1 家禁用, 断言返回数量与库中启用数一致、必须超过分页上限、且不含已禁用商户 - TestListMerchantsClampsOversizedPageSize:钉住「size=200 实际只返回 20 条, 而 total 反映真实总数」这一事实,即上面接口存在的理由
This commit is contained in:
@@ -19,6 +19,7 @@ import type {
|
||||
Merchant,
|
||||
MerchantMember,
|
||||
MerchantMemberGroup,
|
||||
MerchantOption,
|
||||
MerchantOwnerAccount,
|
||||
MerchantRole,
|
||||
MerchantProduct,
|
||||
@@ -207,6 +208,9 @@ export const platformApi = {
|
||||
request.delete(`/platform/merchant-accounts/${userId}`).then((r) => r.data.data),
|
||||
merchants: (params?: Record<string, unknown>) =>
|
||||
request.get('/platform/merchants', { params }).then((r) => r.data.data as PageResult<Merchant>),
|
||||
// 不分页的精简商户列表,供筛选下拉使用(/platform/merchants 的 size 上限是 100)
|
||||
merchantOptions: () =>
|
||||
request.get('/platform/merchant-options').then((r) => r.data.data as MerchantOption[]),
|
||||
// 平台侧跨商户订单视图:不传 merchant_id 即全部商户
|
||||
orders: (params?: Record<string, unknown>) =>
|
||||
request.get('/platform/orders', { params }).then((r) => r.data.data as PageResult<FulfillmentOrder>),
|
||||
|
||||
@@ -4,7 +4,7 @@ import type { ColumnsType } from 'antd/es/table'
|
||||
import { ReloadOutlined, SearchOutlined } from '@ant-design/icons'
|
||||
import { platformApi } from '../api'
|
||||
import { PageHeader } from '../components/PageHeader'
|
||||
import type { FulfillmentOrder, Merchant, PageResult } from '../types'
|
||||
import type { FulfillmentOrder, MerchantOption, PageResult } from '../types'
|
||||
import { formatDateTime } from '../utils/time'
|
||||
import { money, orderStatusMap, orderStatusOptions, pageConfig } from './merchantCenterUtils'
|
||||
|
||||
@@ -47,7 +47,7 @@ function orderStatusTag(value: string) {
|
||||
*/
|
||||
export default function PlatformOrders() {
|
||||
const [data, setData] = useState<PageResult<FulfillmentOrder>>(emptyPage)
|
||||
const [merchants, setMerchants] = useState<Merchant[]>([])
|
||||
const [merchants, setMerchants] = useState<MerchantOption[]>([])
|
||||
const [loading, setLoading] = useState(false)
|
||||
|
||||
const [page, setPage] = useState(1)
|
||||
@@ -79,9 +79,11 @@ export default function PlatformOrders() {
|
||||
}, [load])
|
||||
|
||||
useEffect(() => {
|
||||
// 用不分页的精简接口:/platform/merchants 的 size 上限是 100,
|
||||
// 传更大的值会被静默降级,下拉里会少一批商户。
|
||||
platformApi
|
||||
.merchants({ page: 1, size: 200 })
|
||||
.then((res) => setMerchants(res.list || []))
|
||||
.merchantOptions()
|
||||
.then((options) => setMerchants(options || []))
|
||||
.catch(() => setMerchants([]))
|
||||
}, [])
|
||||
|
||||
|
||||
@@ -24,6 +24,13 @@ export interface Merchant {
|
||||
// 平台侧跨商户订单列表里标识订单归属所需的商户信息(后端 Preload 的 Merchant 子集)
|
||||
export type MerchantSummary = Pick<Merchant, 'id' | 'code' | 'name' | 'status'>
|
||||
|
||||
// 筛选下拉用的精简商户(来自 /platform/merchant-options,不分页)
|
||||
export interface MerchantOption {
|
||||
id: number
|
||||
code: string
|
||||
name: string
|
||||
}
|
||||
|
||||
export interface MerchantMember {
|
||||
id: number
|
||||
merchant_id: number
|
||||
|
||||
Reference in New Issue
Block a user