diff --git a/new-company-2024-7-4.zip b/new-company-2024-7-4.zip index 4dd4d63..fa264f5 100644 Binary files a/new-company-2024-7-4.zip and b/new-company-2024-7-4.zip differ diff --git a/src/view/developmentDocking/index.vue b/src/view/developmentDocking/index.vue index 5265f2d..f07b563 100644 --- a/src/view/developmentDocking/index.vue +++ b/src/view/developmentDocking/index.vue @@ -81,7 +81,7 @@ export default { { "订单模块": [ { title: '创建订单', index: '1' }, - { title: '根据订单id获取订单详情', index: '3' }, + { title: '根据订单号获取订单详情', index: '3' }, { title: '获取渠道信息', index: '4' }, { title: '获取FBA仓库编码', index: '5' }, { title: '获取订单轨迹', index: '6' }, diff --git a/src/view/developmentDocking/mainComponents.vue b/src/view/developmentDocking/mainComponents.vue index 47a4594..83fbf5e 100644 --- a/src/view/developmentDocking/mainComponents.vue +++ b/src/view/developmentDocking/mainComponents.vue @@ -276,17 +276,21 @@ export default { } }`.split('\n'), codeLines1: ` { - "success": true, - "reTry": false, - "message": "下单成功，您的订单是：AABB2407010041", - "code": 200, - "data": "8175052ed64143f093c401feb91346ec", - "timestamp": 1719836214170 + "success": true, + "reTry": false, + "message": "下单成功，您的订单是：AABB2407010041", + "code": 200, + "data": { + "id": ""8175052ed64143f093c401feb91346ec"", + "orderNo": "aaGM2407010042" + }, + "timestamp": 1719836214170 }`.split('\n'), codeLines2: ` success:请求成功标志，true仅代表请求成功，不代表通过 message：请求描述 code:200则代表请求通过，完成下单，500则代表校验未通过 - data:订单id，请求成功会返回订单的id`.split('\n'), + id:订单id，系统生成的唯一序列号 + orderNo：订单号，系统生成的唯一订单号`.split('\n'), tableData:[ { 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: '国家二字码' }, @@ -394,230 +398,160 @@ export default { Content-Type:application/json`.split('\n'), apiDesc:[ { - h2Title: '根据订单id获取订单详情', - requestUrl: '[GET] /v1/order/aafOrder/querySupplementOrderById', + h2Title: '根据订单号获取订单详情', + requestUrl: '[GET] /v1/order/aafOrder/queryOrderInfoByOrderNo', type:"", - description:"orderId:下单时返回的订单id", + description:"orderNo:下单时返回的orderNo", codeLines: ` - /v1/order/aafOrder/querySupplementOrderById?orderId=e9569b7d755c4eeea069740f997b4c05`.split('\n'), + /v1/order/aafOrder/queryOrderInfoByOrderNo?orderNo=AAGM2407010042`.split('\n'), codeLines1: ` { - "success": true, - "reTry": false, - "message": "操作成功", - "code": 200, - "data": { - "transportMode": "AIR", - "cabinetType": "1", - "countryCode": "GB", - "orderType": null, - "countryName": "英国", - "channelId": "06f73b6cfc914fb1adb80292ca280416", - "channelName": "英国空派Send-UK-F-不递延", - "cabinetSize": null, - "custOrderNo": "2406290003", - "isUseCustOrderNo": null, - "shipmentId": "FBAABCD1234", - "goodsAttrList": [ - { - "id": "7ff7e778112148d38fa8f236a8fd4dd0", - "materialType": "2", - "materialTypeStr": "带电", - "batteryType": "1", - "batteryTypeStr": "干电池", - "power": "123", - "watts": "123", - "documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip", - "documentsStr": "鉴定文件.zip" - }, - { - "id": "d8394d0c13ff4ff891534694bbe1a572", - "materialType": "1", - "materialTypeStr": "普货", - "batteryType": null, - "batteryTypeStr": null, - "power": null, - "watts": null, - "documents": null, - "documentsStr": null - } - ], - "goodsAttrTypeList": [ - "2", - "1" - ], - "forecastNumber": 1, - "declareType": "3", - "receiveType": "1", - "orderReceive": { - "id": "4b3eea4d93a645e3adba35eabf28d82b", - "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", - "orderNo": "aaGM2407010042", - "warehouseCode": "ORF2", - "shipmentType": "1", - "fbaWarehouseCode": "ORF2", - "fbaWarehouseName": null, - "tpWarehouseCode": null, - "tpWarehouseName": null, - "receiveCountryName": null, - "receivePostcode": null, - "state": "VA", - "city": "CHESAPEAKE", - "address": "5045 PORTSMOUTH BLVD", - "receiveAddress": "VA-CHESAPEAKE-5045 PORTSMOUTH BLVD", - "receiveName": null, - "receivePhone": null, - "receiveLandline": null, - "email": null, - "inBoundCode": null, - "companyName": null, - "isDel": "0", - "createTime": "2024-07-01 20:27:13", - "createBy": "admin null", - "updateTime": null, - "updateBy": null - }, - "takeType": "1", - "orderTake": { - "id": "b6727d5bf3e740cfb4879e48e695cd16", - "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", - "orderNo": "aaGM2407010042", - "type": "1", - "contact": null, - "phone": null, - "takeTime": null, - "province": null, - "city": null, - "district": null, - "address": null, - "takeAddress": null, - "warehouseId": "00c8070b70a1475d90a4724331b85w44", - "warehouseName": "深圳市美通一号仓", - "remark": null, - "createTime": "2024-07-01 20:27:12", - "createBy": "admin null", - "updateTime": null, - "updateBy": null - }, - "orderRemark": null, - "docRemark": null, - "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", - "orderDetailId": "903007bf123d492abcfca1adfc09ca89", - "orderNo": "aaGM2407010042", - "importType": "页面录入", - "isPurchaseInsurance": "0", - "insuranceType": null, - "insuranceCurrency": null, - "insuranceAmount": null, - "isSpecifyDelivery": null, - "deliveryCompanyId": null, - "deliveryCompanyStr": null, - "forecastWeight": 100.000, - "forecastVolume": 1.000, - "isArrangeInspection": null, - "goodsAttrObj": { - "batteryType": "1", - "batteryTypeStr": "干电池", - "power": "123", - "watts": "123", - "documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip", - "documentsStr": "鉴定文件.zip", - "batteryFileList": null - }, - "orderGoodsList": [ - { - "id": "7eb1b9b4cf5b4fa8b989eff6b28c8d77", - "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", - "orderNo": "aaGM2407010042", - "boxNo": "FBAABCD1234U000002", - "shipmentId": "FBAABCD1234", - "referenceId": null, - "boxWeight": 100.000, - "length": 100.000, - "width": 100.000, - "height": 100.000, - "skuEnglishName": "Bluetooth Earphones", - "skuName": "蓝牙耳机", - "declarePrice": 2.700, - "number": 100, - "exportHscode": "123", - "clearanceHscode": "123", - "brand": "无", - "brandType": "1", - "brandTypeStr": "无品牌", - "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'), +     "success": true, +     "reTry": false, +     "message": "操作成功", +     "code": 200, +     "data": { +         "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", +         "transportMode": "AIR", +         "cabinetType": "1", +         "countryCode": "GB", +         "orderType": null, +         "countryName": "英国", +         "channelId": "06f73b6cfc914fb1adb80292ca280416", +         "channelName": "英国空派Send-UK-F-不递延", +         "cabinetSize": null, +         "custOrderNo": "2406290003", +         "isUseCustOrderNo": null, +         "shipmentId": "FBAABCD1234", +         "goodsAttrTypeList": [ +             "2", +             "1" +         ], +         "forecastNumber": 1, +         "declareType": "3", +         "receiveType": "1", +         "orderReceive": { +             "id": "4b3eea4d93a645e3adba35eabf28d82b", +             "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", +             "orderNo": "aaGM2407010042", +             "warehouseCode": "ORF2", +             "shipmentType": "1", +             "fbaWarehouseCode": "ORF2", +             "fbaWarehouseName": null, +             "tpWarehouseCode": null, +             "tpWarehouseName": null, +             "receiveCountryName": null, +             "receivePostcode": null, +             "state": "VA", +             "city": "CHESAPEAKE", +             "address": "5045 PORTSMOUTH BLVD", +             "receiveAddress": "VA-CHESAPEAKE-5045 PORTSMOUTH BLVD", +             "receiveName": null, +             "receivePhone": null, +             "receiveLandline": null, +             "email": null, +             "inBoundCode": null, +             "companyName": null, +             "isDel": "0", +             "createTime": "2024-07-01 20:27:13", +             "createBy": "admin null", +             "updateTime": null, +             "updateBy": null +         }, +         "takeType": "1", +         "orderTake": { +             "id": "b6727d5bf3e740cfb4879e48e695cd16", +             "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", +             "orderNo": "aaGM2407010042", +             "type": "1", +             "contact": null, +             "phone": null, +             "takeTime": null, +             "province": null, +             "city": null, +             "district": null, +             "address": null, +             "takeAddress": null, +             "warehouseId": "00c8070b70a1475d90a4724331b85w44", +             "warehouseName": "深圳市美通一号仓", +             "remark": null, +             "createTime": "2024-07-01 20:27:12", +             "createBy": "admin null", +             "updateTime": null, +             "updateBy": null +         }, +         "orderRemark": null, +         "orderNo": "aaGM2407010042", +         "importType": "页面录入", +         "isPurchaseInsurance": "0", +         "insuranceType": null, +         "insuranceCurrency": null, +         "insuranceAmount": null, +         "isSpecifyDelivery": null, +         "deliveryCompanyId": null, +         "forecastWeight": 100.000, +         "forecastVolume": 1.000, +         "isArrangeInspection": null, +         "goodsAttrObj": { +             "batteryType": "1", +             "power": "123", +             "watts": "123", +             "documents": "https://public-aaf-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/鉴定文件.zip" +         }, +         "orderGoodsList": [ +             { +                 "id": "7eb1b9b4cf5b4fa8b989eff6b28c8d77", +                 "orderId": "c20c09dafc6d400791e0b91bc1b49d1e", +                 "orderNo": "aaGM2407010042", +                 "boxNo": "FBAABCD1234U000002", +                 "shipmentId": "FBAABCD1234", +                 "referenceId": null, +                 "boxWeight": 100.000, +                 "length": 100.000, +                 "width": 100.000, +                 "height": 100.000, +                 "skuEnglishName": "Bluetooth Earphones", +                 "skuName": "蓝牙耳机", +                 "declarePrice": 2.700, +                 "number": 100, +                 "exportHscode": "123", +                 "clearanceHscode": "123", +                 "brand": "无", +                 "brandType": "1", +                 "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", +                 "isMagnetic": "0", +                 "isLiquid": null, +                 "isPowder": null, +                 "isHazardous": null, +                 "isWooden": null, +                 "declareType": "1", +                 "description": null +             } +         ], +         "taxRefundInfo": null, +         "taxRefundRemark": "1", +         "taxType": "1", +         "vatNo": null, +         "eoriNo": null, +         "einNo": null, +         "taxNo": null, +         "taxId": null +     }, +     "timestamp": 1720081364204 + }`.split('\n'), codeLines2: '', 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:[ { h2Title: '取消订单', - requestUrl: '[POST] /v1/order/aafOrder/cancelOrderById', + requestUrl: '[POST] /v1/order/aafOrder/cancelByOrderNo', type:"application/json", - description:"id:下单时返回的订单id", + description:"orderNo:下单时返回的订单orderNo", codeLines: ` - { - "id" : "e9569b7d755c4eeea069740f997b4c05" - }`.split('\n'), + { + "orderNo" : "AAGM2407010042" + }`.split('\n'), codeLines1: ` { "success": true,