热修

src/view/developmentDocking/index.vue

@@ -83,6 +83,7 @@ export default {
               { title: '创建订单', index: '1' },
               { title: '根据订单号获取订单详情', index: '3' },
               { title: '获取渠道信息', index: '4' },
+              { title: '获取交货仓库信息', index: '8' },
               { title: '获取FBA仓库编码', index: '5' },
               { title: '获取订单轨迹', index: '6' },
               { title: '获取第三方海外信息', index: '7' },

src/view/developmentDocking/mainComponents.vue

@@ -627,6 +627,56 @@ export default {
           codeLines: `          Authorization:Bearer ACCESS_TOKEN
           Content-Type:application/json`.split('\n'),
           apiDesc:[
+          {
+              h2Title: '获取交货仓库信息',
+              requestUrl: '[GET] /v1/sys/bdWarehouse/queryWarehouseList',
+              type:"",
+              description:"无需传参",
+              codeLines: `
+              /v1/sys/bdWarehouse/queryWarehouseList`.split('\n'),
+                  codeLines1: `
+                  {
+                  "success":true,
+                  "reTry":false,
+                  "message":"操作成功",
+                  "code":200,
+                  "data":[
+                            {
+                              "warehouseId":"00c8070b70a1475d90a4724331b85d3a",
+                              "warehouseName":"观澜分拨中心"
+                            },
+                            {
+                              "warehouseId":"00c8070b70a1475d90a4724331b85w44",
+                              "warehouseName":"佛山1号仓"
+                            },
+                            {
+                              "warehouseId":"293b0a78bd6b4670a68f950dde605d28",
+                              "warehouseName":"东莞1号仓"
+                            }
+                      ]
+                  }
+            `.split('\n'),
+                  codeLines2: `
+                  success:请求成功标志，true仅代表请求成功，不代表通过
+                  message：请求描述
+                  code:200则代表请求通过，完成下单，500则代表校验未通过
+                  warehouseId：交货仓库id
+                  warehouseName：交货仓库名称
+                  `.split('\n'),
+              tableData:[ ]
+            },
+          ],
+        },
+        {
+          api:'2-4',
+          apiAdd:'5',
+          selectedVersion:'V1.0',
+          mainTitle: '常规接口HTTP请求头格式',
+          h2Title1: '',
+          description: '',
+          codeLines: `          Authorization:Bearer ACCESS_TOKEN
+          Content-Type:application/json`.split('\n'),
+          apiDesc:[
           {
               h2Title: '获取FBA仓库编码',
               requestUrl: '[GET] /v1/sys/bdFbaCode/queryAllFbaCode',
@@ -667,8 +717,8 @@ export default {
           ],
         },
         {
-          api:'2-4',
-          apiAdd:'5',
+          api:'2-5',
+          apiAdd:'6',
           selectedVersion:'V1.0',
           mainTitle: '常规接口HTTP请求头格式',
           h2Title1: '',
@@ -839,8 +889,8 @@ export default {
           ],
         },
         {
-          api:'2-6',
-          apiAdd:'7',
+          api:'2-7',
+          apiAdd:'8',
           selectedVersion:'V1.0',
           mainTitle: '常规接口HTTP请求头格式',
           h2Title1: '',
@@ -887,7 +937,7 @@ export default {
           apiDesc:[
           {
               h2Title: '创建运单',
-              requestUrl: '[POST] http://aafexp.nextsls.com/api/v5/shipment/create',
+              requestUrl: '[POST] /v1/order/aafOrder/createOrder',
               type:"",
               description:"",
               description1: '注：蓝色字体为兼容老系统和新接口所需的新增字段',
@@ -1090,9 +1140,11 @@ export default {
                   data.shipment.parcels.label_url	标签文档的url地址	否	String	访问这个地址就能下载标签，标签格式是pdf `.split('\n'),
                tableData:[
                     { id: 'shipment', field: 'shipment', fieldName: '订单信息', required: '是', dataType: 'Shipment Object', example: '', description: '订单详细信息',children:[
-                    { id: 'service', field: 'service', fieldName: '服务类型代码', required: '是', dataType: 'String', example: '', description: '通过get_service接口可以查看' },
-                    { id: 'transportMode', field: 'transportMode', fieldName: '运输方式', required: '是', dataType: 'string', example: 'AIR', description: '海运-OCEAN, 空运-AIR, 铁路-RAIL, 卡航-ROAD' },
+                    { id: 'service', field: 'service', fieldName: '服务类型代码', required: '是', dataType: 'String', example: '', description: '通过/v1/sys/bdChannel/queryAllChannelList接口可以查看' },
                     { id: 'shipmentType', field: 'shipmentType', fieldName: '收件地址类型', required: '是', dataType: 'string', example: '1', description: '1:FBA地址 2：第三方海外仓 3：商业地址 4:住宅地址' },
+                    { id: 'takeType', field: 'takeType', fieldName: '交货方式', required: '是', dataType: 'String', example: '1', description: '当选择上门提货时必填，数据从/v1/sys/bdWarehouse/queryWarehouseList接口中获取' },
+                    { id: 'warehouseId', field: 'warehouseId', fieldName: '交货仓库id', required: '是', dataType: 'String', example: '', description: '1:自送到仓 2：上门提货' },
+                    { id: 'transportMode', field: 'transportMode', fieldName: '运输方式', required: '是', dataType: 'string', example: 'AIR', description: '海运-OCEAN, 空运-AIR, 铁路-RAIL, 卡航-ROAD' },
                     { id: 'store_id', field: 'store_id', fieldName: '店铺名称', required: '否', dataType: 'String', example: '', description: '默认为空' },
                     { id: 'client_reference', field: 'client_reference', fieldName: '客户订单号', required: '否', dataType: 'String', example: '', description: '' },
                     { id: 'reference_1', field: 'reference_1', fieldName: '参考号一', required: '否', dataType: 'String', example: '', description: '' },
@@ -1193,7 +1245,7 @@ export default {
     rowClassName({ row, rowIndex }) {
       const selected = this.$route.query.selectedVersion;
       // console.log(selectedVersion,row, rowIndex,'selectedVersionselectedVersion')
-    if ((row.id === 'transportMode' || row.id === 'shipmentType')&&selected==='oldSystem') {
+    if ((row.id === 'transportMode' || row.id === 'shipmentType'||row.id === 'service'||row.id === 'takeType'||row.id === 'warehouseId')&&selected==='oldSystem') {
       return 'blueTips';
     }
   },