Merge branch 'feature/sale-after-address' into 'master'

Feature/sale after address

See merge request !72

config/env.config.js

 const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
-const environment = 'xyqb';
+const environment = 'sc1';
 const envAPi = {
   api: `https://security-${environment}.liangkebang.net`, //'https://security-xyqb.liangkebang.net',
   kdspOpApi: `https://sc-merchant-api-${environment}.liangkebang.net`,

src/pages/Admin/service.js

@@ -6,7 +6,7 @@ import { format } from 'date-fns';
 import config from '../../../config/env.config';
 // 查询待办页订单数量
 export async function getPendingNum() {
-  const data = await request.get('/api/kdsp/admin/merchants/getPendingNum', {
+  const data = await request.get('/api/merchants/aftersales/summary', {
     prefix: config.kdspApi,
   });
   return data;

src/pages/AfterSaleManage/components/LogisticsRecordModal.jsx

 import React, { useState, forwardRef, useImperativeHandle, useEffect } from 'react';
 import { Modal, Timeline, notification, Spin, Collapse } from 'antd';
-import { getLogisticsRecord, apiDeliveriesTraceList } from '../services';
+import { apiDeliveriesTraceList } from '../services';
 import styles from '../index.less';
 
 const { Panel } = Collapse;

src/pages/AfterSaleManage/services.js

@@ -7,7 +7,7 @@ const { kdspApi } = config;
 
 // 分页查询所有数据
 export const searchList = params =>
-  request.post('/api/kdsp/op/afs/shop/list', {
+  request.post('/api/merchants/aftersales/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(params, v => !v && v !== 0)),
     headers: {
@@ -15,35 +15,9 @@ export const searchList = params =>
     },
   });
 
-// export async function searchList(params, queryStatus) {
-//   const param = {
-//     ...params,
-//     pageNo: params.current,
-//     pageSize: params.pageSize || 20,
-//     queryStatus,
-//   };
-//   const data = await request.post('/api/kdsp/op/afs/shop/list', {
-//     prefix: kdspApi,
-//     data: stringify(_.omitBy(param, v => !v)),
-//     headers: {
-//       'Content-Type': 'application/x-www-form-urlencoded',
-//     },
-//   });
-//   if (data.data) {
-//     return {
-//       total: data.data.total,
-//       data: data.data.records,
-//     };
-//   }
-//   return {
-//     total: 0,
-//     data: [],
-//   };
-// }
-
 // 售后单详情
 export function orderDetail(params) {
-  return request.get('/api/kdsp/op/afs/sku', {
+  return request.get('/api/merchants/aftersales/skus/list', {
     prefix: kdspApi,
     params,
     headers: {
@@ -54,7 +28,7 @@ export function orderDetail(params) {
 
 // 取消售后单详情
 export async function cancelOrderDetail(params) {
-  const data = await request.get('/cancel-order/sku', {
+  const data = await request.get('/api/merchants/aftersales/skus/canceledlist', {
     prefix: kdspApi,
     params,
     headers: {
@@ -66,7 +40,7 @@ export async function cancelOrderDetail(params) {
 
 // 售后审核
 export async function shopAudit(params) {
-  return request.post('/api/kdsp/op/afs/shop/audit', {
+  return request.post('/api/merchants/aftersales/audit', {
     data: params,
     prefix: kdspApi,
   });
@@ -74,7 +48,7 @@ export async function shopAudit(params) {
 
 // 取消订单审核
 export async function cancelShopAudit(params) {
-  return request.post('/cancel-order/audit', {
+  return request.post('/api/merchants/aftersales/canceledaudit', {
     data: params,
     prefix: kdspApi,
   });
@@ -82,7 +56,7 @@ export async function cancelShopAudit(params) {
 
 // 查询审核信息
 export async function auditInfoApi(params) {
-  return request.get('/api/kdsp/op/afs/back-info', {
+  return request.get('/api/merchants/aftersales/backdetail', {
     params,
     prefix: kdspApi,
   });
@@ -90,7 +64,7 @@ export async function auditInfoApi(params) {
 
 // 审核核检
 export async function shopCheck(params) {
-  return request.post('/api/kdsp/op/afs/shop/check', {
+  return request.post('/api/merchants/aftersales/check', {
     params,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -100,7 +74,7 @@ export async function shopCheck(params) {
 }
 // 查询物流信息
 export async function trackInfo(params) {
-  const data = await request.get('/api/kdsp/op/logistics/kd100/track-list', {
+  const data = await request.get('/api/merchants/deliveries/traces/list', {
     params,
     prefix: kdspApi,
   });
@@ -112,21 +86,14 @@ export async function trackInfo(params) {
 
 // 物流拦截
 export async function logisticsIntercept(params) {
-  return request.get('/api/kdsp/op/afs/shop/logisticsIntercept', {
+  return request.get('/api/merchants/aftersales/abort', {
     params,
     prefix: kdspApi,
   });
 }
 // 售后操作日志
 export async function getOpLog(params) {
-  return request.get(`/afterSaleAdmin/getOpLog/${params}`, {
-    prefix: kdspApi,
-  });
-}
-
-// 查询物流记录信息
-export async function getLogisticsRecord(params) {
-  return request.get(`/api/kdsp/op/logistics/kd100/track-list?orderNo=${params.orderNo}`, {
+  return request.get(`/api/merchants/aftersales/logs/list/${params}`, {
     prefix: kdspApi,
   });
 }
@@ -137,7 +104,7 @@ export async function getLogisticsRecord(params) {
  */
 
 export function apiDeliveriesTraceList(data) {
-  return request.post('/api/merchants/deliveries/trace/list', {
+  return request.post('/api/merchants/deliveries/traces/list', {
     data: stringify(data),
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -148,7 +115,7 @@ export function apiDeliveriesTraceList(data) {
 
 // 查询售后待办数量
 export function getAfterPendingNum(data) {
-  return request.post('/api/kdsp/op/afs/getPendingNum', {
+  return request.post('/api/merchants/aftersales/todos/summary', {
     prefix: kdspApi,
     data,
   });
@@ -160,7 +127,7 @@ export const afterSalesAddrsPage = () => {
     pageSize: 100,
     pageNo: 1,
   };
-  const data = request.post('/api/kdsp/supplier/after-sales-addrs-page', {
+  const data = request.post('/api/merchants/aftersales/addresses/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(params, v => !v)),
     headers: {

src/pages/AfterSaleManageOld/services.js

@@ -13,7 +13,7 @@ export async function searchList(params, queryStatus) {
     pageSize: params.pageSize || 20,
     queryStatus,
   };
-  const data = await request.post('/api/kdsp/op/afs/shop/list', {
+  const data = await request.post('/api/merchants/aftersales/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(param, v => !v)),
     headers: {
@@ -34,7 +34,7 @@ export async function searchList(params, queryStatus) {
 
 // 售后单详情
 export async function orderDetail(params) {
-  const data = await request.get('/api/kdsp/op/afs/sku', {
+  const data = await request.get('/api/merchants/aftersales/skus/list', {
     prefix: kdspApi,
     params,
     headers: {
@@ -45,14 +45,14 @@ export async function orderDetail(params) {
 }
 // 售后审核
 export async function shopAudit(params) {
-  return request.post('/api/kdsp/op/afs/shop/audit', {
+  return request.post('/api/merchants/aftersales/audit', {
     data: params,
     prefix: kdspApi,
   });
 }
 // 查询审核信息
 export async function auditInfoApi(params) {
-  return request.get('/api/kdsp/op/afs/back-info', {
+  return request.get('/api/merchants/aftersales/backdetail', {
     params,
     prefix: kdspApi,
   });
@@ -60,7 +60,7 @@ export async function auditInfoApi(params) {
 
 // 审核核检
 export async function shopCheck(params) {
-  return request.post('/api/kdsp/op/afs/shop/check', {
+  return request.post('/api/merchants/aftersales/check', {
     params,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -70,7 +70,7 @@ export async function shopCheck(params) {
 }
 // 查询物流信息
 export async function trackInfo(params) {
-  const data = await request.get('/api/kdsp/op/logistics/kd100/track-list', {
+  const data = await request.get('/api/merchants/deliveries/traces/list', {
     params,
     prefix: kdspApi,
   });
@@ -82,14 +82,14 @@ export async function trackInfo(params) {
 
 // 物流拦截
 export async function logisticsIntercept(params) {
-  return request.get('/api/kdsp/op/afs/shop/logisticsIntercept', {
+  return request.get('/api/merchants/aftersales/abort', {
     params,
     prefix: kdspApi,
   });
 }
 // 售后操作日志
 export async function getOpLog(params) {
-  return request.get(`/afterSaleAdmin/getOpLog/${params}`, {
+  return request.get(`/api/merchants/aftersales/logs/list${params}`, {
     prefix: kdspApi,
   });
 }

src/pages/AfterSalesClaimForm/service.js

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 import config from '@/../config/env.config';
 
 export const getQueryClamsList = params =>
-  request.post('/api/kdsp/queryClams', {
+  request.post('/api/merchants/aftersales/refunds/list', {
     prefix: config.goodsApi,
     data: params || {},
   });

src/pages/GoodsManage/service.js

@@ -202,7 +202,7 @@ export async function queryAllAfterAddress() {
     pageSize: 100,
     pageNo: 1,
   };
-  const data = request.post('/api/kdsp/supplier/after-sales-addrs-page', {
+  const data = request.post('/api/merchants/aftersales/addresses/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(params, v => !v)),
     headers: {

src/pages/ServiceGoods/components/CommonTemplate.jsx

@@ -138,7 +138,8 @@ export const CreateFormInput = props => {
       placeholder={`请输入${title}`}
       onBlur={e => {
         const inputTarget = e.target;
-        setTimeout(() => {
+        const timer = setTimeout(() => {
+          clearTimeout(timer);
           onBlurEvent(inputTarget.value, dataIndex, rowIndex);
         }, 10);
       }}

src/pages/ServiceGoods/service.js

@@ -48,7 +48,7 @@ export const afterSalesAddrsPage = () => {
     pageSize: 100,
     pageNo: 1,
   };
-  const data = request.post('/api/kdsp/supplier/after-sales-addrs-page', {
+  const data = request.post('/api/merchants/aftersales/addresses/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(params, v => !v)),
     headers: {
@@ -80,7 +80,7 @@ export const merchantProductEdit = data =>
   });
 
 export const supplierListQuery = () =>
-  request.get('/api/kdsp/supplier/supplier-list-query', {
+  request.get('/api/merchants/suppliers/querylist', {
     prefix: config.kdspApi,
     headers,
   });

src/pages/afterSaleAddress/form.jsx

@@ -3,7 +3,7 @@ import { Form } from '@ant-design/compatible';
 import '@ant-design/compatible/assets/index.css';
 import { Modal, Select, Input, notification } from 'antd';
 import _ from 'lodash';
-import { addrQuery, update } from './services';
+import { addrQuery, apiEdit, apiAdd } from './services';
 
 const { TextArea } = Input;
 const FormItem = Form.Item;
@@ -145,14 +145,18 @@ const AddressForm = props => {
         countyName: county.label,
         townId: town.key,
         townName: town.label,
-        id: formData.id,
       };
       delete params.province;
       delete params.city;
       delete params.county;
       delete params.town;
+      let api = apiAdd;
+      if (formData.id) {
+        params.id = formData.id;
+        api = apiEdit;
+      }
 
-      const businessCode = await update(params);
+      const businessCode = await api(params);
       if (businessCode === '0000') {
         notification.success({ message: '操作成功' });
         resetForm();

src/pages/afterSaleAddress/services.js

@@ -14,7 +14,7 @@ export async function query(params) {
   try {
     const {
       data: { current, records, total, size },
-    } = await request.post('/api/kdsp/supplier/after-sales-addrs-page', {
+    } = await request.post('/api/merchants/aftersales/addresses/list', {
       prefix: config.kdspApi,
       data: stringify(_.omitBy(tempParams, v => !v)),
       headers: {
@@ -32,7 +32,7 @@ export async function query(params) {
   }
 }
 export async function supplier() {
-  const { data } = await request.get('/api/kdsp/supplier/supplier-list-query', {
+  const { data } = await request.get('/api/merchants/suppliers/querylist', {
     prefix: config.kdspApi,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -42,7 +42,7 @@ export async function supplier() {
 }
 
 export async function del(id) {
-  const data = await request.post('/api/kdsp/supplier/after-sales-addrs-delete', {
+  const data = await request.post('/api/merchants/aftersales/addresses/delete', {
     prefix: config.kdspApi,
     data: stringify({ id }),
     headers: {
@@ -52,21 +52,29 @@ export async function del(id) {
   return data;
 }
 
-export async function update(params) {
-  const { businessCode } = await request.post(
-    '/api/kdsp/supplier/after-sales-addrs-save-or-update',
-    {
-      prefix: config.kdspApi,
-      data: stringify(params),
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-      },
+export async function apiEdit(params) {
+  const { businessCode } = await request.post('/api/merchants/aftersales/addresses/edit', {
+    prefix: config.kdspApi,
+    data: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+  });
+  return businessCode;
+}
+export async function apiAdd(params) {
+  const { businessCode } = await request.post('/api/merchants/aftersales/addresses/add', {
+    prefix: config.kdspApi,
+    data: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
     },
-  );
+  });
   return businessCode;
 }
+
 export async function addrQuery(params) {
-  const { data } = await request.get('/api/kdsp/area/addr/query', {
+  const { data } = await request.get('/api/merchants/addresses/list', {
     prefix: config.kdspApi,
     params,
     headers: {

src/pages/cancelBillManage/service.js

@@ -14,13 +14,9 @@ export async function searchList(params, auditStatus) {
     pageSize: params.pageSize || 20,
     auditStatus,
   };
-  const data = await request.post('/cancel-order/apply/page-list', {
+  const data = await request.post('/api/merchants/aftersales/canceledlist', {
     prefix: kdspApi,
-    // data: stringify(param),
     data: param,
-    // headers: {
-    //   'Content-Type': 'application/x-www-form-urlencoded',
-    // },
   });
   if (data && data.data) {
     return {
@@ -36,7 +32,7 @@ export async function searchList(params, auditStatus) {
 
 // 售后单详情
 export async function orderDetail(params) {
-  const data = await request.get('/cancel-order/sku', {
+  const data = await request.get('/api/merchants/aftersales/skus/canceledlist', {
     prefix: kdspApi,
     params,
     headers: {
@@ -47,22 +43,15 @@ export async function orderDetail(params) {
 }
 // 售后审核
 export async function shopAudit(params) {
-  return request.post('/cancel-order/audit', {
+  return request.post('/api/merchants/aftersales/canceledaudit', {
     data: params,
     prefix: kdspApi,
   });
 }
-// 查询审核信息
-// export async function auditInfoApi(params) {
-//   return request.get('/api/kdsp/op/afs/back-info', {
-//     params,
-//     prefix: kdspApi,
-//   });
-// }
 
 // 审核核检
 export async function shopCheck(params) {
-  return request.post('/api/kdsp/op/afs/shop/check', {
+  return request.post('/api/merchants/aftersales/check', {
     params,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -72,7 +61,7 @@ export async function shopCheck(params) {
 }
 // 查询物流信息
 export async function trackInfo(params) {
-  const data = await request.get('/api/kdsp/op/logistics/kd100/track-list', {
+  const data = await request.get('/api/merchants/deliveries/traces/list', {
     params,
     prefix: kdspApi,
   });

src/pages/chainStoreManage/services.js

@@ -12,12 +12,9 @@ export async function searchList(params) {
     pageNo: params.current,
     pageSize: params.pageSize || 20,
   };
-  const data = await request.post('/shop/pageQuery', {
+  const data = await request.post('/api/merchants/shops/list', {
     prefix: kdspApi,
     data: _.omitBy(param, v => !v),
-    // headers: {
-    //   'Content-Type': 'application/x-www-form-urlencoded',
-    // },
   });
   if (data.data) {
     return {
@@ -33,7 +30,7 @@ export async function searchList(params) {
 
 // 停启用门店
 export async function apiEnableStore({ id, state }) {
-  const data = await request.get(`/shop/updateState/${id}/${state}`, {
+  const data = await request.get(`/api/merchants/shops/state/edit/${id}/${state}`, {
     prefix: kdspApi,
   });
   return data.businessCode;
@@ -41,7 +38,7 @@ export async function apiEnableStore({ id, state }) {
 
 // 获取地址
 export async function apiAddrArea(params) {
-  const data = await request.post('/api/kdsp/area/addr/query', {
+  const data = await request.post('/api/merchants/addresses/list', {
     prefix: kdspApi,
     data: stringify(_.omitBy(params, v => !v)),
     headers: {
@@ -53,24 +50,18 @@ export async function apiAddrArea(params) {
 
 // 创建门店
 export async function apiCreatStore(params) {
-  const data = await request.post('/shop/create', {
+  const data = await request.post('/api/merchants/shops/add', {
     prefix: kdspApi,
     data: params,
-    // headers: {
-    //   'Content-Type': 'application/x-www-form-urlencoded',
-    // },
   });
   return data.businessCode;
 }
 
 // 更新门店
 export async function apiEditStore(params) {
-  const data = await request.post('/shop/update', {
+  const data = await request.post('/api/merchants/shops/edit', {
     prefix: kdspApi,
     data: params,
-    // headers: {
-    //   'Content-Type': 'application/x-www-form-urlencoded',
-    // },
   });
   return data.businessCode;
 }

src/pages/distributionArea/services.js

@@ -40,7 +40,7 @@ export async function getAddTemplate(param) {
 
 // 获取区域地址
 export async function areaList(params) {
-  const { data } = await request.get('/api/kdsp/area/addr/query', {
+  const { data } = await request.get('/api/merchants/addresses/list', {
     prefix: goodsApi,
     params,
     headers: {

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -18,9 +18,7 @@ import {
   queryToSend,
   queryExpress,
   getGoods,
-  getLogistics,
   downOrder,
-  getJDLogisticsInfo,
   apiQueryOrderInfo,
   apiDeliveriesTraceList,
 } from './service';
@@ -446,19 +444,6 @@ const TableList = props => {
                 marginBottom: '10px',
               }}
               onClick={async () => {
-                // const skuListData = await getGoods(record?.orderId);
-                // let logisticsData = [{}];
-                // setSkuList(skuListData);
-                // const data = await getLogistics(record?.orderId);
-                // logisticsData = data.map(item => ({
-                //   selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
-                //   selectedCompany: item.expressCompanyCode
-                //     ? `${item?.expressCompanyCode}-${item?.expressCompanyName}`
-                //     : null,
-                //   orderNum: item?.deliveryNo,
-                // }));
-                // setLogisticsData(logisticsData);
-                // handleModalVisible(true);
                 const res = await apiQueryOrderInfo({
                   orderNo: record.orderNo,
                 });

src/pages/orderManage/pendingDeliveryOrder/service.js

@@ -10,7 +10,7 @@ export async function queryToSend(params) {
   try {
     const {
       data: { current, records, total, size },
-    } = await request.post('/api/kdsp/op/mch-order/list-v2', {
+    } = await request.post('/api/merchants/orders/list', {
       prefix: config.kdspApi,
       data: stringify(_.omitBy(params, v => !v)),
       headers: {
@@ -31,7 +31,7 @@ export async function queryToSend(params) {
 // 快递公司
 export async function queryExpress() {
   try {
-    const { data } = await request.get('/api/kdsp/op/express/list', {
+    const { data } = await request.get('/api/merchants/companies/list', {
       prefix: config.kdspApi,
     });
     return data;
@@ -41,20 +41,14 @@ export async function queryExpress() {
 }
 
 export async function updateExpress(params) {
-  return request.post('/api/kdsp/op/mch-order/update-express-info', {
+  return request.post('/api/merchants/orders/deliveries/add', {
     prefix: config.kdspApi,
     data: params,
   });
 }
 
 export async function getGoods(orderId) {
-  const { data } = await request.get(`/api/kdsp/op/mch-order/skus?orderId=${orderId}`, {
-    prefix: config.kdspApi,
-  });
-  return data;
-}
-export async function getLogistics(orderId) {
-  const { data } = await request.get(`/api/kdsp/op/mch-order/logistics-skus?orderId=${orderId}`, {
+  const { data } = await request.get(`/api/merchants/orders/skus/list?orderId=${orderId}`, {
     prefix: config.kdspApi,
   });
   return data;
@@ -69,13 +63,10 @@ export async function uploadFile(file) {
   return data;
 }
 export function downTemplate() {
-  window.location.href =
-    // 'https://kdspstatic.q-gp.com/%E8%AE%A2%E5%8D%95%E7%89%A9%E6%B5%81%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF-v1.xlsx';
-    // 'https://kdspstatic.q-gp.com/order_import_templatev2.xlsx';
-    'https://sc-img.q-gp.com/orders/templates/batch_deliveriesV2.xlsx';
+  window.location.href = 'https://sc-img.q-gp.com/orders/templates/batch_deliveriesV2.xlsx';
 }
 export async function downOrder(params) {
-  const data = await request.post('/api/kdsp/op/mch-order/order-export', {
+  const data = await request.post('/api/merchants/orders/export', {
     data: stringify(_.omitBy(params, v => !v)),
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -86,22 +77,6 @@ export async function downOrder(params) {
   const blob = new Blob([data]);
   saveAs(blob, `商户订单列表-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`);
 }
-export async function getLogisticsInfo(companyCode, logisticsNo) {
-  const { data } = await request.get(
-    `/api/kdsp/op/logistics/kd100/track-list?companyCode=${companyCode}&logisticsNo=${logisticsNo}`,
-    {
-      prefix: config.kdspApi,
-    },
-  );
-  return data;
-}
-// 京东企业购和京东开普勒物流信息
-export async function getJDLogisticsInfo(orderSkuId) {
-  const { data } = await request.get(`/api/kdsp/op/logistics/track-list?orderSkuId=${orderSkuId}`, {
-    prefix: config.kdspApi,
-  });
-  return data;
-}
 // 批量发货订单
 export async function queryToBatchSend(params) {
   const transformedParam = {
@@ -114,7 +89,7 @@ export async function queryToBatchSend(params) {
   };
   const {
     data: { current, records, total, size },
-  } = await request.get('/api/kdsp/op/mch-order/delivery-batch-list', {
+  } = await request.get('/api/merchants/deliveries/batchlist', {
     prefix: config.kdspApi,
     params: _.omitBy(transformedParam, v => !v),
     headers: {
@@ -129,7 +104,7 @@ export async function queryToBatchSend(params) {
   };
 }
 export async function downUploadeOrder(params) {
-  const data = await request.get('/api/kdsp/op/mch-order/delivery-batch-order-downLoad', {
+  const data = await request.get('/api/merchants/deliveries/batchexport', {
     params,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -147,7 +122,7 @@ export async function downUploadeOrder(params) {
 }
 // 延迟发货
 export function apiDelayDeliverGoods(data) {
-  return request.post('/api/kdsp/order/operation/record/create', {
+  return request.post('/api/merchants/orders/logs/add', {
     data,
     prefix: config.kdspApi,
   });
@@ -160,42 +135,6 @@ export function apiDelayDeliverGoods(data) {
  * @see http://yapi.quantgroups.com/project/389/interface/api/45840
  */
 export function apiQueryOrderInfo(params) {
-  // return new Promise(resolve => {
-  //   setTimeout(() => {
-  //     resolve({
-  //       packageList: [
-  //         {
-  //           expressCompanyCode: 'yunda',
-  //           expressCompanyName: '',
-  //           expressNo: 'YUNDA012345678',
-  //           serialNumber: '0011223344',
-  //           skuInfoList: [
-  //             {
-  //               skuNo: ['529355424931841'],
-  //               quantity: '2',
-  //             },
-  //             {
-  //               skuNo: ['530724210084865'],
-  //               quantity: '12',
-  //             },
-  //           ],
-  //         },
-  //         {
-  //           expressCompanyCode: 'yunda',
-  //           expressCompanyName: '',
-  //           expressNo: 'YUNDA012345678',
-  //           serialNumber: '0011223344',
-  //           skuInfoList: [
-  //             {
-  //               skuNo: ['529355424931841'],
-  //               quantity: '2',
-  //             },
-  //           ],
-  //         },
-  //       ],
-  //     });
-  //   }, 1000);
-  // });
   return request.get('/api/merchants/orders/deliveries/packages/detail', {
     params,
     prefix: config.kdspApi,
@@ -227,7 +166,7 @@ export function apiDeliveriesEdit(data) {
  */
 
 export function apiDeliveriesTraceList(data) {
-  return request.post('/api/merchants/deliveries/trace/list', {
+  return request.post('/api/merchants/deliveries/traces/list', {
     data: stringify(data),
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',

src/pages/orderManage/queryOrder/index.jsx

@@ -12,7 +12,7 @@ import MultiLogisticsModal from '../pendingDeliveryOrder/components/MultiLogisti
 import LogisticsCom from '../pendingDeliveryOrder/components/LogisticsCom';
 import DetailModal from './components/DetailModal/index';
 
-import { queryOrderList, getGoods, getLogistics, queryExpress, queryToSend } from './service';
+import { queryOrderList, getGoods, queryExpress, queryToSend } from './service';
 import { apiQueryOrderInfo, apiDeliveriesTraceList } from '../pendingDeliveryOrder/service';
 import { ORDER_SEARCH_TYPE, ORDER_TYPE, ORDER_STATUS } from './const';
 

src/pages/orderManage/queryOrder/service.js

@@ -7,14 +7,14 @@ import config from '../../../../config/env.config';
 
 // 查询订单列表
 export async function queryOrderList(params) {
-  return request.post('/api/kdsp/queryOrderList', {
+  return request.post('/api/merchants/orders/poplist', {
     prefix: config.kdspApi,
     data: params,
   });
 }
 // 订单详情
 export async function queryOrderDetail(params) {
-  return request.post('/api/kdsp/queryOrderDetail', {
+  return request.post('/api/merchants/orders/popdetail', {
     prefix: config.kdspApi,
     data: params,
   });
@@ -24,7 +24,7 @@ export async function queryToSend(params) {
   try {
     const {
       data: { current, records, total, size },
-    } = await request.post('/api/kdsp/op/mch-order/list-v2', {
+    } = await request.post('/api/merchants/orders/list', {
       prefix: config.kdspApi,
       data: stringify(_.omitBy(params, v => !v)),
       headers: {
@@ -44,7 +44,7 @@ export async function queryToSend(params) {
 
 //  发货/更新物流
 export async function updateExpress(params) {
-  return request.post('/api/kdsp/op/mch-order/update-express-info', {
+  return request.post('/api/merchants/orders/deliveries/add', {
     prefix: config.kdspApi,
     data: params,
   });
@@ -53,7 +53,7 @@ export async function updateExpress(params) {
 // 快递公司
 export async function queryExpress() {
   try {
-    const { data } = await request.get('/api/kdsp/op/express/list', {
+    const { data } = await request.get('/api/merchants/companies/list', {
       prefix: config.kdspApi,
     });
     return data;
@@ -63,14 +63,7 @@ export async function queryExpress() {
 }
 
 export async function getGoods(orderId) {
-  const { data } = await request.get(`/api/kdsp/op/mch-order/skus?orderId=${orderId}`, {
-    prefix: config.kdspApi,
-  });
-  return data;
-}
-
-export async function getLogistics(orderId) {
-  const { data } = await request.get(`/api/kdsp/op/mch-order/logistics-skus?orderId=${orderId}`, {
+  const { data } = await request.get(`/api/merchants/orders/skus/list?orderId=${orderId}`, {
     prefix: config.kdspApi,
   });
   return data;

src/pages/reconciliation/form.jsx

@@ -3,7 +3,7 @@ import { Form } from '@ant-design/compatible';
 import '@ant-design/compatible/assets/index.css';
 import { Modal, Select, Input, notification } from 'antd';
 import _ from 'lodash';
-import { update } from './services';
+import { apiSave, apiAdd } from './services';
 import { addrQuery } from '../afterSaleAddress/services';
 
 const FormItem = Form.Item;
@@ -145,14 +145,17 @@ const AddressForm = props => {
         countyName: county.label,
         townId: town.key,
         townName: town.label,
-        id: formData.id,
       };
       delete params.province;
       delete params.city;
       delete params.county;
       delete params.town;
-
-      const businessCode = await update(params);
+      let api = apiAdd;
+      if (formData.id) {
+        params.id = formData.id;
+        api = apiSave;
+      }
+      const businessCode = await api(params);
       if (businessCode === '0000') {
         notification.success({ message: '操作成功' });
         resetForm();

src/pages/reconciliation/services.js

@@ -36,7 +36,7 @@ export async function query(params) {
   }
 }
 export async function supplier() {
-  const { data } = await request.get('/api/kdsp/supplier/supplier-list-query', {
+  const { data } = await request.get('/api/merchants/suppliers/querylist', {
     prefix: config.kdspApi,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -97,16 +97,24 @@ export async function updateStatus(params) {
   return businessCode;
 }
 
-export async function update(params) {
-  const { businessCode } = await request.post(
-    '/api/kdsp/supplier/after-sales-addrs-save-or-update',
-    {
-      prefix: config.kdspApi,
-      data: stringify(params),
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-      },
+export async function apiSave(params) {
+  const { businessCode } = await request.post('/api/merchants/aftersales/addresses/edit', {
+    prefix: config.kdspApi,
+    data: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+  });
+  return businessCode;
+}
+
+export async function apiAdd(params) {
+  const { businessCode } = await request.post('/api/merchants/aftersales/addresses/add', {
+    prefix: config.kdspApi,
+    data: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
     },
-  );
+  });
   return businessCode;
 }