master
lml 3 months ago
parent d3512d5847
commit 6370f7f3e5

Binary file not shown.

@ -81,7 +81,7 @@ export default {
{ {
"订单模块": [ "订单模块": [
{ title: '创建订单', index: '1' }, { title: '创建订单', index: '1' },
{ title: '根据订单id获取订单详情', index: '3' }, { title: '根据订单获取订单详情', index: '3' },
{ title: '获取渠道信息', index: '4' }, { title: '获取渠道信息', index: '4' },
{ title: '获取FBA仓库编码', index: '5' }, { title: '获取FBA仓库编码', index: '5' },
{ title: '获取订单轨迹', index: '6' }, { title: '获取订单轨迹', index: '6' },

@ -276,17 +276,21 @@ export default {
} }
}`.split('\n'), }`.split('\n'),
codeLines1: ` { codeLines1: ` {
"success": true, "success": true,
"reTry": false, "reTry": false,
"message": "下单成功您的订单是AABB2407010041", "message": "下单成功您的订单是AABB2407010041",
"code": 200, "code": 200,
"data": "8175052ed64143f093c401feb91346ec", "data": {
"timestamp": 1719836214170 "id": ""8175052ed64143f093c401feb91346ec"",
"orderNo": "aaGM2407010042"
},
"timestamp": 1719836214170
}`.split('\n'), }`.split('\n'),
codeLines2: ` success:请求成功标志true仅代表请求成功不代表通过 codeLines2: ` success:请求成功标志true仅代表请求成功不代表通过
message请求描述 message请求描述
code:200则代表请求通过完成下单500则代表校验未通过 code:200则代表请求通过完成下单500则代表校验未通过
data:订单id请求成功会返回订单的id`.split('\n'), id:订单id系统生成的唯一序列号
orderNo订单号系统生成的唯一订单号`.split('\n'),
tableData:[ tableData:[
{ id: 'transportMode', field: 'transportMode', fieldName: '运输方式', required: '是', dataType: 'string', example: 'AIR', description: '海运-OCEAN, 空运-AIR, 铁路-RAIL, 卡航-ROAD' }, { id: 'transportMode', field: 'transportMode', fieldName: '运输方式', required: '是', dataType: 'string', example: 'AIR', description: '海运-OCEAN, 空运-AIR, 铁路-RAIL, 卡航-ROAD' },
{ id: 'countryCode', field: 'countryCode', fieldName: '国家编码', required: '是', dataType: 'string', example: 'GB', description: '国家二字码' }, { id: 'countryCode', field: 'countryCode', fieldName: '国家编码', required: '是', dataType: 'string', example: 'GB', description: '国家二字码' },
@ -394,230 +398,160 @@ export default {
Content-Type:application/json`.split('\n'), Content-Type:application/json`.split('\n'),
apiDesc:[ apiDesc:[
{ {
h2Title: '根据订单id获取订单详情', h2Title: '根据订单获取订单详情',
requestUrl: '[GET] /v1/order/aafOrder/querySupplementOrderById', requestUrl: '[GET] /v1/order/aafOrder/queryOrderInfoByOrderNo',
type:"", type:"",
description:"orderId:下单时返回的订单id", description:"orderNo:下单时返回的orderNo",
codeLines: ` codeLines: `
/v1/order/aafOrder/querySupplementOrderById?orderId=e9569b7d755c4eeea069740f997b4c05`.split('\n'), /v1/order/aafOrder/queryOrderInfoByOrderNo?orderNo=AAGM2407010042`.split('\n'),
codeLines1: ` codeLines1: `
{ {
"success": true,     "success": true,
"reTry": false,     "reTry": false,
"message": "操作成功",     "message": "操作成功",
"code": 200,     "code": 200,
"data": {     "data": {
"transportMode": "AIR",         "orderId": "c20c09dafc6d400791e0b91bc1b49d1e",
"cabinetType": "1",         "transportMode": "AIR",
"countryCode": "GB",         "cabinetType": "1",
"orderType": null,         "countryCode": "GB",
"countryName": "英国",         "orderType": null,
"channelId": "06f73b6cfc914fb1adb80292ca280416",         "countryName": "英国",
"channelName": "英国空派Send-UK-F-不递延",         "channelId": "06f73b6cfc914fb1adb80292ca280416",
"cabinetSize": null,         "channelName": "英国空派Send-UK-F-不递延",
"custOrderNo": "2406290003",         "cabinetSize": null,
"isUseCustOrderNo": null,         "custOrderNo": "2406290003",
"shipmentId": "FBAABCD1234",         "isUseCustOrderNo": null,
"goodsAttrList": [         "shipmentId": "FBAABCD1234",
{         "goodsAttrTypeList": [
"id": "7ff7e778112148d38fa8f236a8fd4dd0",             "2",
"materialType": "2",             "1"
"materialTypeStr": "带电",         ],
"batteryType": "1",         "forecastNumber": 1,
"batteryTypeStr": "干电池",         "declareType": "3",
"power": "123",         "receiveType": "1",
"watts": "123",         "orderReceive": {
"documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip",             "id": "4b3eea4d93a645e3adba35eabf28d82b",
"documentsStr": "鉴定文件.zip"             "orderId": "c20c09dafc6d400791e0b91bc1b49d1e",
},             "orderNo": "aaGM2407010042",
{             "warehouseCode": "ORF2",
"id": "d8394d0c13ff4ff891534694bbe1a572",             "shipmentType": "1",
"materialType": "1",             "fbaWarehouseCode": "ORF2",
"materialTypeStr": "普货",             "fbaWarehouseName": null,
"batteryType": null,             "tpWarehouseCode": null,
"batteryTypeStr": null,             "tpWarehouseName": null,
"power": null,             "receiveCountryName": null,
"watts": null,             "receivePostcode": null,
"documents": null,             "state": "VA",
"documentsStr": null             "city": "CHESAPEAKE",
}             "address": "5045 PORTSMOUTH BLVD",
],             "receiveAddress": "VA-CHESAPEAKE-5045 PORTSMOUTH BLVD",
"goodsAttrTypeList": [             "receiveName": null,
"2",             "receivePhone": null,
"1"             "receiveLandline": null,
],             "email": null,
"forecastNumber": 1,             "inBoundCode": null,
"declareType": "3",             "companyName": null,
"receiveType": "1",             "isDel": "0",
"orderReceive": {             "createTime": "2024-07-01 20:27:13",
"id": "4b3eea4d93a645e3adba35eabf28d82b",             "createBy": "admin null",
"orderId": "c20c09dafc6d400791e0b91bc1b49d1e",             "updateTime": null,
"orderNo": "aaGM2407010042",             "updateBy": null
"warehouseCode": "ORF2",         },
"shipmentType": "1",         "takeType": "1",
"fbaWarehouseCode": "ORF2",         "orderTake": {
"fbaWarehouseName": null,             "id": "b6727d5bf3e740cfb4879e48e695cd16",
"tpWarehouseCode": null,             "orderId": "c20c09dafc6d400791e0b91bc1b49d1e",
"tpWarehouseName": null,             "orderNo": "aaGM2407010042",
"receiveCountryName": null,             "type": "1",
"receivePostcode": null,             "contact": null,
"state": "VA",             "phone": null,
"city": "CHESAPEAKE",             "takeTime": null,
"address": "5045 PORTSMOUTH BLVD",             "province": null,
"receiveAddress": "VA-CHESAPEAKE-5045 PORTSMOUTH BLVD",             "city": null,
"receiveName": null,             "district": null,
"receivePhone": null,             "address": null,
"receiveLandline": null,             "takeAddress": null,
"email": null,             "warehouseId": "00c8070b70a1475d90a4724331b85w44",
"inBoundCode": null,             "warehouseName": "深圳市美通一号仓",
"companyName": null,             "remark": null,
"isDel": "0",             "createTime": "2024-07-01 20:27:12",
"createTime": "2024-07-01 20:27:13",             "createBy": "admin null",
"createBy": "admin null",             "updateTime": null,
"updateTime": null,             "updateBy": null
"updateBy": null         },
},         "orderRemark": null,
"takeType": "1",         "orderNo": "aaGM2407010042",
"orderTake": {         "importType": "页面录入",
"id": "b6727d5bf3e740cfb4879e48e695cd16",         "isPurchaseInsurance": "0",
"orderId": "c20c09dafc6d400791e0b91bc1b49d1e",         "insuranceType": null,
"orderNo": "aaGM2407010042",         "insuranceCurrency": null,
"type": "1",         "insuranceAmount": null,
"contact": null,         "isSpecifyDelivery": null,
"phone": null,         "deliveryCompanyId": null,
"takeTime": null,         "forecastWeight": 100.000,
"province": null,         "forecastVolume": 1.000,
"city": null,         "isArrangeInspection": null,
"district": null,         "goodsAttrObj": {
"address": null,             "batteryType": "1",
"takeAddress": null,             "power": "123",
"warehouseId": "00c8070b70a1475d90a4724331b85w44",             "watts": "123",
"warehouseName": "深圳市美通一号仓",             "documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip"
"remark": null,         },
"createTime": "2024-07-01 20:27:12",         "orderGoodsList": [
"createBy": "admin null",             {
"updateTime": null,                 "id": "7eb1b9b4cf5b4fa8b989eff6b28c8d77",
"updateBy": null                 "orderId": "c20c09dafc6d400791e0b91bc1b49d1e",
},                 "orderNo": "aaGM2407010042",
"orderRemark": null,                 "boxNo": "FBAABCD1234U000002",
"docRemark": null,                 "shipmentId": "FBAABCD1234",
"orderId": "c20c09dafc6d400791e0b91bc1b49d1e",                 "referenceId": null,
"orderDetailId": "903007bf123d492abcfca1adfc09ca89",                 "boxWeight": 100.000,
"orderNo": "aaGM2407010042",                 "length": 100.000,
"importType": "页面录入",                 "width": 100.000,
"isPurchaseInsurance": "0",                 "height": 100.000,
"insuranceType": null,                 "skuEnglishName": "Bluetooth Earphones",
"insuranceCurrency": null,                 "skuName": "蓝牙耳机",
"insuranceAmount": null,                 "declarePrice": 2.700,
"isSpecifyDelivery": null,                 "number": 100,
"deliveryCompanyId": null,                 "exportHscode": "123",
"deliveryCompanyStr": null,                 "clearanceHscode": "123",
"forecastWeight": 100.000,                 "brand": "无",
"forecastVolume": 1.000,                 "brandType": "1",
"isArrangeInspection": null,                 "model": "ABC",
"goodsAttrObj": {                 "material": "塑料",
"batteryType": "1",                 "purpose": "手机配件",
"batteryTypeStr": "干电池",                 "saleUrl": "https://www.amazon.co.gb/dp/ABCD1234",
"power": "123",                 "salesPrice": 0.000,
"watts": "123",                 "picUrl": null,
"documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip",                 "productWeight": 0.000,
"documentsStr": "鉴定文件.zip",                 "purchasePrice": 2.700,
"batteryFileList": null                 "asin": null,
},                 "sku": null,
"orderGoodsList": [                 "isElectric": "0",
{                 "isMagnetic": "0",
"id": "7eb1b9b4cf5b4fa8b989eff6b28c8d77",                 "isLiquid": null,
"orderId": "c20c09dafc6d400791e0b91bc1b49d1e",                 "isPowder": null,
"orderNo": "aaGM2407010042",                 "isHazardous": null,
"boxNo": "FBAABCD1234U000002",                 "isWooden": null,
"shipmentId": "FBAABCD1234",                 "declareType": "1",
"referenceId": null,                 "description": null
"boxWeight": 100.000,             }
"length": 100.000,         ],
"width": 100.000,         "taxRefundInfo": null,
"height": 100.000,         "taxRefundRemark": "1",
"skuEnglishName": "Bluetooth Earphones",         "taxType": "1",
"skuName": "蓝牙耳机",         "vatNo": null,
"declarePrice": 2.700,         "eoriNo": null,
"number": 100,         "einNo": null,
"exportHscode": "123",         "taxNo": null,
"clearanceHscode": "123",         "taxId": null
"brand": "无",     },
"brandType": "1",     "timestamp": 1720081364204
"brandTypeStr": "无品牌", }`.split('\n'),
"model": "ABC",
"material": "塑料",
"purpose": "手机配件",
"saleUrl": "https://www.amazon.co.gb/dp/ABCD1234",
"salesPrice": 0.000,
"picUrl": null,
"productWeight": 0.000,
"purchasePrice": 2.700,
"asin": null,
"sku": null,
"isElectric": "0",
"isElectricStr": "否",
"isMagnetic": "0",
"isMagneticStr": "否",
"isLiquid": null,
"isLiquidStr": null,
"isPowder": null,
"isPowderStr": null,
"isHazardous": null,
"isHazardousStr": null,
"isWooden": null,
"isWoodenStr": null,
"declareType": "1",
"declareTypeStr": "买单报关",
"description": null,
"productId": null,
"country": null,
"addtionalCode": null,
"specialCode": null,
"specialRate": null,
"preTariff": null,
"taxRate": null,
"unit": null,
"costPrice": null,
"totalPrice": null,
"grossWeight": null,
"netWeight": null,
"volume": null,
"materialRate": null,
"maker": null,
"makerAddress": null,
"remark": null,
"mixed": null,
"sort": null,
"size": null,
"isVat": null,
"invoiceCode": null,
"declareTotalPrice": null,
"declareNetWeight": null,
"isDel": "0",
"createTime": "2024-07-01T12:27:13.000+00:00",
"createBy": "admin null",
"updateTime": null,
"updateBy": null
}
],
"taxRefundInfo": null,
"taxRefundInfoStr": null,
"taxRefundFileList": null,
"taxRefundRemark": "1",
"taxType": "1",
"taxTypeStr": "不包税",
"vatNo": null,
"eoriNo": null,
"einNo": null,
"taxNo": null,
"taxId": null
},
"timestamp": 1719885098599
}`.split('\n'),
codeLines2: '', codeLines2: '',
tableData:[{ tableData:[{
id: 'orderId', field: 'orderId', fieldName: '参数', required: '是', dataType: 'string', example: '', description: '' }, ] id: 'orderNo', field: 'orderNo', fieldName: '参数', required: '是', dataType: 'string', example: '', description: '' }, ]
}, },
], ],
}, },
@ -914,13 +848,13 @@ export default {
apiDesc:[ apiDesc:[
{ {
h2Title: '取消订单', h2Title: '取消订单',
requestUrl: '[POST] /v1/order/aafOrder/cancelOrderById', requestUrl: '[POST] /v1/order/aafOrder/cancelByOrderNo',
type:"application/json", type:"application/json",
description:"id:下单时返回的订单id", description:"orderNo:下单时返回的订单orderNo",
codeLines: ` codeLines: `
{ {
"id" : "e9569b7d755c4eeea069740f997b4c05" "orderNo" : "AAGM2407010042"
}`.split('\n'), }`.split('\n'),
codeLines1: ` codeLines1: `
{ {
"success": true, "success": true,

Loading…
Cancel
Save