Release/test 合并上生产 #1

Merged
admin merged 236 commits from release/test into main 2026-09-17 11:51:50 +08:00
2 changed files with 7 additions and 6 deletions
Showing only changes of commit fb8a4743f6 - Show all commits
+4 -4
View File
@@ -485,19 +485,19 @@ export function getMerchantInboundCodePolicy() {
}
export function getMerchantOrderAddresses(addressType?: CustomerOrderAddressType) {
return apiRequest<CustomerOrderAddress[]>({ method: 'GET', url: '/merchant/v1/order-addresses', params: { addressType } })
return apiRequest<CustomerOrderAddress[]>({ method: 'GET', url: '/merchant/v1/orders/first-leg/addresses', params: { addressType } })
}
export function createMerchantOrderAddress(payload: CustomerOrderAddressSaveRequest) {
return apiRequest<number | string>({ method: 'POST', url: '/merchant/v1/order-addresses', data: payload })
return apiRequest<number | string>({ method: 'POST', url: '/merchant/v1/orders/first-leg/addresses', data: payload })
}
export function updateMerchantOrderAddress(id: number | string, payload: CustomerOrderAddressSaveRequest) {
return apiRequest<void>({ method: 'PUT', url: `/merchant/v1/order-addresses/${id}`, data: payload })
return apiRequest<void>({ method: 'PUT', url: `/merchant/v1/orders/first-leg/addresses/${id}`, data: payload })
}
export function disableMerchantOrderAddress(id: number | string) {
return apiRequest<void>({ method: 'DELETE', url: `/merchant/v1/order-addresses/${id}` })
return apiRequest<void>({ method: 'DELETE', url: `/merchant/v1/orders/first-leg/addresses/${id}` })
}
export function downloadMerchantFirstLegBatchImportTemplate() {
@@ -29,8 +29,9 @@ test('declares the documented merchant warehouse and first-leg endpoints', () =>
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg'/)
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg\/inbound-code-policy'/)
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg\/batch'/)
assert.match(apiSource, /url: '\/merchant\/v1\/order-addresses'/)
assert.match(apiSource, /`\/merchant\/v1\/order-addresses\/\$\{id\}`/)
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg\/addresses'/)
assert.match(apiSource, /`\/merchant\/v1\/orders\/first-leg\/addresses\/\$\{id\}`/)
assert.doesNotMatch(apiSource, /merchant\/v1\/order-addresses/)
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg\/batch-imports\/template'/)
assert.match(apiSource, /url: '\/merchant\/v1\/orders\/first-leg\/batch-imports'/)
assert.match(apiSource, /params: \{ mode \}/)