chore: 去掉PublicApi

src/pages/transaction/purchaserEvaluation/analysis/index.tsx

@@ -3,8 +3,7 @@ import { Tabs, Row, Col, Button } from 'antd';
 import { history } from 'umi';
 import { observer, inject } from 'mobx-react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { PublicApi } from '@/services/api';
-import { isJSONStr } from '@/utils';
+import { getMemberCommentConsumerCountTradeHistoryPage, getMemberCommentConsumerCountTradeSummary, getMemberCommentConsumerReceiveTradeHistoryPage, getMemberCommentConsumerSendTradeHistoryPage } from '@/services/MemberV2Api';
 import { IEvaluationModule } from '@/module/evaluationModule';
 import MellowCard from '@/components/MellowCard';
 import PolymericTable from '@/components/PolymericTable';
@@ -156,7 +155,7 @@ const Analysis: React.FC<AnalysisProps> = ({
 
   // 获取评价汇总
   const getTradeSummary = () => {
-    PublicApi.getMemberCommentConsumerCountTradeSummary().then(res => {
+    getMemberCommentConsumerCountTradeSummary().then(res => {
       if (res.code === 1000) {
         const evaluate = summaryEvaluate(res.data.rows);
         const evaluatePieData = getSummaryEvaluatePie(evaluate);
@@ -172,7 +171,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   const getTradeHistory = (params: ListParams): Promise<RecordRes> => {
     const { star, ...rest } = params;
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentConsumerCountTradeHistoryPage({
+      getMemberCommentConsumerCountTradeHistoryPage({
         ...rest, 
         starLevel: params.star, 
       }).then(res => {
@@ -205,7 +204,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   // 获取收到的评价列表
   const getReceivedList = (params: ListParams): Promise<RecordRes> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentConsumerReceiveTradeHistoryPage({
+      getMemberCommentConsumerReceiveTradeHistoryPage({
         ...params, 
       }).then(res => {
         if (res.code === 1000) {
@@ -238,7 +237,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   const getSentList = (params: ListParams): Promise<RecordRes> => {
     const { memberName, ...rest } = params;
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentConsumerSendTradeHistoryPage({
+      getMemberCommentConsumerSendTradeHistoryPage({
         ...rest,
         subMemberName: memberName, 
       }).then(res => {

src/pages/transaction/purchaserEvaluation/received/detail/index.tsx

@@ -10,7 +10,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import { createFormActions } from '@formily/antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
-import { PublicApi } from '@/services/api';
+import { getMemberCommentConsumerReceiveTradeHistoryGet } from '@/services/MemberV2Api';
 import { normalizeFiledata, FileData } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
@@ -51,7 +51,7 @@ const ReceivedDetail: React.FC = () => {
       return;
     }
     setEvaluationInfoLoading(true);
-    PublicApi.getMemberCommentConsumerReceiveTradeHistoryGet({
+    getMemberCommentConsumerReceiveTradeHistoryGet({
       id,
     }).then(res => {
       if (res.code === 1000) {

src/pages/transaction/purchaserEvaluation/sent/components/DetailInfo/index.tsx

@@ -11,7 +11,7 @@ import { FormOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberCommentConsumerSendTradeHistoryGet, postMemberCommentConsumerSendTradeHistoryUpdate } from '@/services/MemberV2Api';
 import { normalizeFiledata, FileData } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
@@ -66,7 +66,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       return;
     }
     setEvaluationInfoLoading(true);
-    PublicApi.getMemberCommentConsumerSendTradeHistoryGet({
+    getMemberCommentConsumerSendTradeHistoryGet({
       id,
     }).then(res => {
       if (res.code === 1000) {
@@ -121,7 +121,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       return;
     } 
     
-    PublicApi.postMemberCommentConsumerSendTradeHistoryUpdate(payload[0])
+    postMemberCommentConsumerSendTradeHistoryUpdate(payload[0])
       .then(res => {
         if (res.code === 1000) {
           setTimeout(() => {

src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx

@@ -13,8 +13,7 @@ import { history, Prompt } from 'umi';
 import moment from 'moment';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
-import { PublicApi } from '@/services/api';
-import { GetMemberCommentConsumerOrderTradeDetailResponse } from '@/services/MemberV2Api';
+import { getMemberCommentConsumerOrderTradeDetail, GetMemberCommentConsumerOrderTradeDetailResponse, postMemberCommentConsumerOrderTradeSubmit } from '@/services/MemberV2Api';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
 import { normalizeUnevaluatedList } from '../../utils';
@@ -56,7 +55,7 @@ const EvaluateOrder: React.FC = () => {
       return;
     }
     setInfoLoading(true);
-    PublicApi.getMemberCommentConsumerOrderTradeDetail({
+    getMemberCommentConsumerOrderTradeDetail({
       id, 
     } as any).then(res => {
       if (res.code === 1000) {
@@ -102,7 +101,7 @@ const EvaluateOrder: React.FC = () => {
       };
     });
     
-    PublicApi.postMemberCommentConsumerOrderTradeSubmit({
+    postMemberCommentConsumerOrderTradeSubmit({
       orderId: orderInfo.orderId, 
       commentSubmitDetailList: payload, 
     }).then(res => {

src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx

@@ -8,7 +8,7 @@ import { createFormActions } from '@formily/antd';
 import moment from 'moment';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { PublicApi } from '@/services/api';
+import { getMemberOrderCommentBuyerPage } from '@/services/MemberV2Api';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
 import StatusTag from '@/components/StatusTag';
@@ -104,7 +104,7 @@ const Unevaluated: React.FC = () => {
     createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;
 
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberOrderCommentBuyerPage({
+      getMemberOrderCommentBuyerPage({
         createTimeStart,
         createTimeEnd,
         ...rest

src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/index.ts

+/*
+ * @Author: XieZhiXiong
+ * @Date: 2021-10-18 11:11:48
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2021-11-17 20:29:02
+ * @Description: 
+ */
 import { useBusinessEffects } from './useBusinessEffects';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
-import { PublicApi } from '@/services/api';
+import { getProductInvoicesTypeAll, getProductWarehouseAll } from '@/services/ProductV2Api';
 
 // 获取单据类型
 const fetchInvoicesType = (): Promise<any[]> => {
   return new Promise((resolve, reject) => {
-    PublicApi.getProductInvoicesTypeAll().then(res => {
+    getProductInvoicesTypeAll().then(res => {
       if (res.code === 1000) {
         resolve(res.data);
       }
@@ -19,7 +26,7 @@ const fetchInvoicesType = (): Promise<any[]> => {
 // 获取仓库
 const fetchInventory = (): Promise<any[]> => {
   return new Promise((resolve, reject) => {
-    PublicApi.getProductWarehouseAll().then(res => {
+    getProductWarehouseAll().then(res => {
       if (res.code === 1000) {
         resolve(res.data);
       }

src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-16 15:16:47
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-29 13:40:54
+ * @LastEditTime: 2021-11-17 20:30:16
  * @Description: 联动逻辑相关
  */
 import { Modal, message } from 'antd';
@@ -34,7 +34,8 @@ import Search from '@/components/NiceForm/components/Search';
 import Submit from '@/components/NiceForm/components/Submit';
 import DateSelect from '@/components/NiceForm/components/DateSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const'; 
-import { PublicApi } from '@/services/api';
+import { getEnhanceProcessToBeAddDeliveryDetails, getEnhanceSupplierToBeAddStorageDetails } from '@/services/EnhanceV2Api';
+import { getAsReplaceGoodsPageReturnedGoods, getAsReturnGoodsPageReturnedGoods } from '@/services/AfterServiceV2Api';
 import { 
   purchaseOrderBillSchema, 
   machiningWarehousingBillSchema, 
@@ -61,6 +62,7 @@ import {
   getExchangeWarehousingList, 
 } from '../fetchBillList';
 
+
 const { 
   onFieldInputChange$, 
   onFieldValueChange$, 
@@ -346,23 +348,23 @@ export const useBusinessEffects = (context, actions) => {
         setFieldValue('deliveryType', first.deliveryType);
 
         // 根据选择的订单查询 订单对应的商品，并给 Table 的商品下拉框赋值
-        PublicApi.getOrderProcurementOrderProductList({
-          id: first.id, 
-          orderNo: '',
-        } as any).then(res => {
-          if (res.code === 1000) {
-            const goodOptions = res.data.map(item => ({
-              label: item.productName, 
-              value: item.id, 
-            }));
-            setFieldState('invoicesDetailsRequests.*.product', state => {
-              FormPath.setIn(state, 'originAsyncData', res.data);
-              FormPath.setIn(state, 'props.enum', goodOptions);
-            });
-          }
-        }).catch((err) => {
-          console.warn(err);
-        });
+        // getOrderProcurementOrderProductList({
+        //   id: first.id, 
+        //   orderNo: '',
+        // } as any).then(res => {
+        //   if (res.code === 1000) {
+        //     const goodOptions = res.data.map(item => ({
+        //       label: item.productName, 
+        //       value: item.id, 
+        //     }));
+        //     setFieldState('invoicesDetailsRequests.*.product', state => {
+        //       FormPath.setIn(state, 'originAsyncData', res.data);
+        //       FormPath.setIn(state, 'props.enum', goodOptions);
+        //     });
+        //   }
+        // }).catch((err) => {
+        //   console.warn(err);
+        // });
         break;
       }
       
@@ -372,7 +374,7 @@ export const useBusinessEffects = (context, actions) => {
         setFieldValue('transport', DELIVERY_TYPE[first.deliveryType]);
         setFieldValue('deliveryType', first.deliveryType);
         // 从加工单详情获取 商品 数据
-        PublicApi.getEnhanceSupplierToBeAddStorageDetails({
+        getEnhanceSupplierToBeAddStorageDetails({
           id: first.id, 
         }).then(res => {
           if (res.code !== 1000) {
@@ -409,7 +411,7 @@ export const useBusinessEffects = (context, actions) => {
         setFieldValue('transport', DELIVERY_TYPE[first.deliveryType]);
         setFieldValue('deliveryType', first.deliveryType);
         // 从加工单详情获取 商品 数据
-        PublicApi.getEnhanceProcessToBeAddDeliveryDetails({
+        getEnhanceProcessToBeAddDeliveryDetails({
           id: first.id, 
         }).then(res => {
           if (res.code !== 1000) {
@@ -448,7 +450,7 @@ export const useBusinessEffects = (context, actions) => {
         setFieldValue('deliveryType', first.deliveryType);
 
         // 获取明细数据 商品 数据
-        PublicApi.getAsReplaceGoodsPageReturnedGoods({
+        getAsReplaceGoodsPageReturnedGoods({
           replaceId: first.id, 
           current: `${1}`, 
           pageSize: `${99999}`,
@@ -486,7 +488,7 @@ export const useBusinessEffects = (context, actions) => {
         setFieldValue('deliveryType', first.deliveryType);
 
         // 获取明细数据 商品 数据
-        PublicApi.getAsReturnGoodsPageReturnedGoods({
+        getAsReturnGoodsPageReturnedGoods({
           returnId: first.id, 
           current: `${1}`, 
           pageSize: `${99999}`,

src/pages/transaction/stockSellStorage/bills/components/BillsForm/fetchBillList.ts

@@ -5,31 +5,33 @@
  * @LastEditTime: 2021-01-07 10:15:47
  * @Description: 获取 单据列表 弹窗数据接口相关
  */
-import { PublicApi } from '@/services/api';
+import { getAsReplaceGoodsPageToBeAddReplaceDeliveryByWarehouse, getAsReplaceGoodsPageToBeAddReplaceStorageByWarehouse, getAsReplaceGoodsPageToBeAddReturnDeliveryByWarehouse, getAsReplaceGoodsPageToBeAddReturnStorageByWarehouse, getAsReturnGoodsPageToBeAddReturnDeliveryByWarehouse, getAsReturnGoodsPageToBeAddReturnStorageByWarehouse } from '@/services/AfterServiceV2Api';
+import { getEnhanceProcessToBeAddDeliveryList, getEnhanceSupplierToBeAddStorageList } from '@/services/EnhanceV2Api';
+// import { getOrderPurchaseReceiptAddList } from '@/services/OrderV2Api';
 import moment from 'moment';
 
 // 获取采购入库单相关数据
 export const fetchOrderPurchaseReceiptAddList = async (params: any) => {
-  const res = await PublicApi.getOrderPurchaseReceiptAddList({
-    ...params,
-  })
-  if (res.code === 1000) {
-    return {
-      data: res.data.data.map(item => ({
-        ...item, 
-        memberName: item.supplyMembersName, 
-        membersId: item.supplyMembersId, 
-        membersRoleId: item.supplyMembersRoleId, 
-      })), 
-      total: res.data.totalCount, 
-    };
-  }
-  return { data: [], total: 0 };
+  // const res = await getOrderPurchaseReceiptAddList({
+  //   ...params,
+  // })
+  // if (res.code === 1000) {
+  //   return {
+  //     data: res.data.data.map(item => ({
+  //       ...item, 
+  //       memberName: item.supplyMembersName, 
+  //       membersId: item.supplyMembersId, 
+  //       membersRoleId: item.supplyMembersRoleId, 
+  //     })), 
+  //     total: res.data.totalCount, 
+  //   };
+  // }
+  // return { data: [], total: 0 };
 };
 
 // 获取销售发货单相关数据
 export const getOrderSalesInvoiceOrderList = async (params: any) => {
-  const res = await PublicApi.getOrderSalesInvoiceOrderList({
+  const res = await getOrderSalesInvoiceOrderList({
     ...params,
   })
   if (res.code === 1000) {
@@ -49,7 +51,7 @@ export const getOrderSalesInvoiceOrderList = async (params: any) => {
 // 获取加工入库单单相关数据
 export const getMachiningWarehousingList = async (params: any) => {
   const { search, ...rest } = params;
-  const res = await PublicApi.getEnhanceSupplierToBeAddStorageList({
+  const res = await getEnhanceSupplierToBeAddStorageList({
     noticeNo: search, 
     ...rest,
   })
@@ -73,7 +75,7 @@ export const getMachiningWarehousingList = async (params: any) => {
 // 获取加工发货单单相关数据
 export const getMachiningDeliveryList = async (params: any) => {
   const { search, ...rest } = params;
-  const res = await PublicApi.getEnhanceProcessToBeAddDeliveryList({
+  const res = await getEnhanceProcessToBeAddDeliveryList({
     noticeNo: search, 
     ...rest,
   })
@@ -97,7 +99,7 @@ export const getMachiningDeliveryList = async (params: any) => {
 // 获取售后退货发货单单相关数据
 export const getRefundDeliveryList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReturnGoodsPageToBeAddReturnDeliveryByWarehouse({
+  const res = await getAsReturnGoodsPageToBeAddReturnDeliveryByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
@@ -128,7 +130,7 @@ export const getRefundDeliveryList = async (params: any) => {
 // 获取售后退货入库单单相关数据
 export const getRefundWarehousingList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReturnGoodsPageToBeAddReturnStorageByWarehouse({
+  const res = await getAsReturnGoodsPageToBeAddReturnStorageByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
@@ -159,7 +161,7 @@ export const getRefundWarehousingList = async (params: any) => {
 // 获取售后换货退货发货单单相关数据
 export const getExchangeReturnDeliveryList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReturnDeliveryByWarehouse({
+  const res = await getAsReplaceGoodsPageToBeAddReturnDeliveryByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
@@ -190,7 +192,7 @@ export const getExchangeReturnDeliveryList = async (params: any) => {
 // 获取售后换货退货入库单单相关数据
 export const getExchangeReturnWarehousingList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReturnStorageByWarehouse({
+  const res = await getAsReplaceGoodsPageToBeAddReturnStorageByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
@@ -221,7 +223,7 @@ export const getExchangeReturnWarehousingList = async (params: any) => {
 // 获取售后换货发货单单相关数据
 export const getExchangeDeliveryList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReplaceDeliveryByWarehouse({
+  const res = await getAsReplaceGoodsPageToBeAddReplaceDeliveryByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 
@@ -252,7 +254,7 @@ export const getExchangeDeliveryList = async (params: any) => {
 // 获取售后换货入库单单相关数据
 export const getExchangeWarehousingList = async (params: any) => {
   const { search, startTime, endTime, ...rest } = params;
-  const res = await PublicApi.getAsReplaceGoodsPageToBeAddReplaceStorageByWarehouse({
+  const res = await getAsReplaceGoodsPageToBeAddReplaceStorageByWarehouse({
     applyNo: search, 
     startTime: startTime ? moment(+startTime).format('YYYY-MM-DD HH:mm:ss') : null, 
     endTime: endTime ? moment(+endTime).format('YYYY-MM-DD HH:mm:ss') : null, 

src/pages/transaction/stockSellStorage/bills/components/BillsFormPage/effects/index.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-08-04 14:42:57
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-08-16 14:47:41
+ * @LastEditTime: 2021-11-17 20:30:29
  * @Description: 
  */
 import {
@@ -11,8 +11,8 @@ import {
   ISchemaFormActions,
   ISchemaFormAsyncActions,
 } from '@formily/antd';
+import { getProductInvoicesTypeAll, getProductWarehouseAll } from '@/services/ProductV2Api';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
-import { PublicApi } from '@/services/api';
 import { useBusinessEffects } from './useBusinessEffects';
 
 const { 
@@ -22,7 +22,7 @@ const {
 // 获取单据类型
 const fetchInvoicesType = (): Promise<any[]> => {
   return new Promise((resolve, reject) => {
-    PublicApi.getProductInvoicesTypeAll().then(res => {
+    getProductInvoicesTypeAll().then(res => {
       if (res.code === 1000) {
         resolve(res.data);
       }
@@ -36,7 +36,7 @@ const fetchInvoicesType = (): Promise<any[]> => {
 // 获取仓库
 const fetchInventory = (): Promise<any[]> => {
   return new Promise((resolve, reject) => {
-    PublicApi.getProductWarehouseAll().then(res => {
+    getProductWarehouseAll().then(res => {
       if (res.code === 1000) {
         resolve(res.data);
       }

src/pages/transaction/stockSellStorage/bills/index.tsx

@@ -6,6 +6,7 @@ import { PlusOutlined, DownOutlined, DeleteOutlined, RollbackOutlined, SnippetsO
 import { StandardTable } from 'god';
 import moment from 'moment';
 import { ColumnType } from 'antd/lib/table/interface';
+import { getProductInvoicesList, getProductInvoicesTypeAll, getProductWarehouseAll, postProductInvoicesBatchDelete, postProductInvoicesBatchReviewAll, postProductInvoicesBatchAgainstReview } from '@/services/ProductV2Api';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
@@ -13,7 +14,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import UploadModal from '@/components/UploadModal';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
-import { PublicApi } from '@/services/api';
 import { DOC_STATUS_UNREVIEWED, DOC_STATUS_REVIEWED, DOC_STATUS } from '@/constants/commodity'; 
 import { billsSchema } from './schema';
 
@@ -27,7 +27,7 @@ const Bills: React.FC<{}> = () => {
   const [batchLoading, setBatchLoading] = useState(false);
 
   const fetchListData = async (params: any) => {
-    const res = await PublicApi.getProductInvoicesList(params);
+    const res = await getProductInvoicesList(params);
     if (res.code === 1000) {
       return res.data;
     }
@@ -36,7 +36,7 @@ const Bills: React.FC<{}> = () => {
 
   // 获取单据类型
   const fetchInvoicesType = async () => {
-    const { data, code } = await PublicApi.getProductInvoicesTypeAll();
+    const { data, code } = await getProductInvoicesTypeAll();
     if (code === 1000) {
       return data?.map(v => ({ label: v.name, value: v.id }));
     }
@@ -45,7 +45,7 @@ const Bills: React.FC<{}> = () => {
 
   // 获取对应仓库
   const fetchInventory = async () => {
-    const { data, code } = await PublicApi.getProductWarehouseAll();
+    const { data, code } = await getProductWarehouseAll();
     if (code === 1000) {
       return data?.map(v => ({ label: v.name, value: v.id }));
     }
@@ -54,7 +54,7 @@ const Bills: React.FC<{}> = () => {
 
   const deleteInvoices = (ids: number[], callback?: () => void) => {
     setBatchLoading(true);
-    PublicApi.postProductInvoicesBatchDelete({
+    postProductInvoicesBatchDelete({
       ids, 
     }).then(res => {
       if (res.code !== 1000) {
@@ -70,7 +70,7 @@ const Bills: React.FC<{}> = () => {
 
   const auditInvoices = (ids: number[], callback?: () => void) => {
     setBatchLoading(true);
-    PublicApi.postProductInvoicesBatchReviewAll({
+    postProductInvoicesBatchReviewAll({
       ids, 
     }).then(res => {
       if (res.code !== 1000) {
@@ -86,7 +86,7 @@ const Bills: React.FC<{}> = () => {
 
   const counterclaimInvoices = (ids: number[], callback?: () => void) => {
     setBatchLoading(true);
-    PublicApi.postProductInvoicesBatchAgainstReview({
+    postProductInvoicesBatchAgainstReview({
       ids, 
     }).then(res => {
       if (res.code !== 1000) {

src/pages/transaction/stockSellStorage/billsType/components/BillTypeForm/index.tsx

@@ -6,7 +6,7 @@ import { SaveOutlined } from '@ant-design/icons';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import ReutrnEle from '@/components/ReturnEle';
 import NiceForm from '@/components/NiceForm';
-import { PublicApi } from '@/services/api';
+import { getProductInvoicesTypeDetails, postProductInvoicesTypeAdd, postProductInvoicesTypeUpdate } from '@/services/ProductV2Api';
 import { billsTypeDetailSchema } from './schema';
 
 const formActions = createFormActions();
@@ -35,7 +35,7 @@ const BillTypeForm: React.FC<BillTypeFormProps> = ({
       return;
     }
     setInfoLoading(true);
-    const infoRes = await PublicApi.getProductInvoicesTypeDetails({
+    const infoRes = await getProductInvoicesTypeDetails({
       id,
     });
 
@@ -55,7 +55,7 @@ const BillTypeForm: React.FC<BillTypeFormProps> = ({
         return;
       }
       setSubmitLoading(true);
-      PublicApi.postProductInvoicesTypeAdd({ ...value })
+      postProductInvoicesTypeAdd({ ...value })
         .then(res => {
           if (res.code === 1000) {
             setTimeout(() => {
@@ -71,7 +71,7 @@ const BillTypeForm: React.FC<BillTypeFormProps> = ({
         return;
       }
       setSubmitLoading(true);
-      PublicApi.postProductInvoicesTypeUpdate({
+      postProductInvoicesTypeUpdate({
         id: id,
         ...value,
       }).then(res => {

src/pages/transaction/stockSellStorage/billsType/index.tsx

@@ -10,7 +10,7 @@ import {
 import { createFormActions } from '@formily/antd';
 import { StandardTable } from 'god';
 import { PlusOutlined } from '@ant-design/icons';
-import { PublicApi } from '@/services/api';
+import { getProductInvoicesTypeList, postProductInvoicesTypeStateUpdate, postProductInvoicesTypeDelete } from '@/services/ProductV2Api';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
 import { ColumnType } from 'antd/lib/table/interface';
@@ -104,7 +104,7 @@ const billsType: React.FC<{}> = () => {
 
   const fetchListData = (params: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getProductInvoicesTypeList(params)
+      getProductInvoicesTypeList(params)
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);
@@ -118,7 +118,7 @@ const billsType: React.FC<{}> = () => {
   };
 
   const handleModify = (record: any) => {
-    PublicApi.postProductInvoicesTypeStateUpdate({
+    postProductInvoicesTypeStateUpdate({
       id: record.id,
       state: record.state === DOC_TYPE_STATUS_EFFECTIVE ? DOC_TYPE_STATUS_INVALID : DOC_TYPE_STATUS_EFFECTIVE,
     }).then(res => {
@@ -129,7 +129,7 @@ const billsType: React.FC<{}> = () => {
   };
 
   const handleDelete = record => {
-    PublicApi.postProductInvoicesTypeDelete({
+    postProductInvoicesTypeDelete({
       id: record.id,
     }).then(res => {
       if (res.code === 1000) {

src/pages/transaction/stockSellStorage/inventory/index.tsx

@@ -12,7 +12,7 @@ import NiceForm from '@/components/NiceForm';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { PublicApi } from '@/services/api';
+import { getProductInventoryList, getProductWarehouseAll, postProductInventorySafetyUpdate } from '@/services/ProductV2Api';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
 import { inventorySchema, safetyModalSchema } from './schema';
 import styles from './index.less'; 
@@ -105,7 +105,7 @@ const Inventory: React.FC<{}> = () => {
 
   const fetchListData = (params: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getProductInventoryList(params)
+      getProductInventoryList(params)
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);
@@ -120,7 +120,7 @@ const Inventory: React.FC<{}> = () => {
 
   // 获取对应仓库
   const fetchInventory = async () => {
-    const { data, code } = await PublicApi.getProductWarehouseAll();
+    const { data, code } = await getProductWarehouseAll();
     if (code === 1000) {
       return data.map(v => ({ label: v.name, value: v.id }));
     }
@@ -131,7 +131,7 @@ const Inventory: React.FC<{}> = () => {
   const handleSubmit = async values => {
     setConfirmLoading(true);
 
-    const res = await PublicApi.postProductInventorySafetyUpdate({
+    const res = await postProductInventorySafetyUpdate({
       id: current.id,
       safetyInvoices: +values.safetyInvoices,
     });

src/pages/transaction/stockSellStorage/warehouse/components/WarehouseForm/index.tsx

@@ -9,9 +9,11 @@ import NiceForm from '@/components/NiceForm';
 import { warehouseDetailSchema } from './schema';
 import { useLinkEnumEffect } from '@/components/NiceForm/linkages/linkEnum';
 import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
-import { PublicApi } from '@/services/api';
+import { getManageAreaAll, getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
+import { getProductWarehouseDetails, postProductWarehouseAdd, postProductWarehouseUpdate } from '@/services/ProductV2Api';
 import styles from './index.less';
 
+
 const formActions = createFormActions();
 const { 
   onFormInputChange$, 
@@ -36,11 +38,11 @@ const WarehouseForm: React.FC<WarehouseFormProps> = ({
   const getWarehouseInfo = async () => {
     if (id) {
       setInfoLoading(true);
-      const infoRes = await PublicApi.getProductWarehouseDetails({
+      const infoRes = await getProductWarehouseDetails({
         id,
       });
   
-      const areaRes = await PublicApi.getManageAreaAll();
+      const areaRes = await getManageAreaAll();
       if (areaRes.code === 1000) {
         const { data } = areaRes;
         formActions.setFieldState('provinceId', targetState => {
@@ -57,7 +59,7 @@ const WarehouseForm: React.FC<WarehouseFormProps> = ({
       }
       setInfoLoading(false);
     } else {
-      const areaRes = await PublicApi.getManageAreaAll();
+      const areaRes = await getManageAreaAll();
       if (areaRes.code === 1000) {
         const { data } = areaRes;
         formActions.setFieldState('provinceId', targetState => {
@@ -77,7 +79,7 @@ const WarehouseForm: React.FC<WarehouseFormProps> = ({
 
   // 获取手机code
   const fetchTelCode = async () => {
-    const { data, code } = await PublicApi.getManageCountryAreaGetTelCode();
+    const { data, code } = await getManageCountryAreaGetTelCode();
     if (code === 1000) {
       return data;
     }
@@ -90,7 +92,7 @@ const WarehouseForm: React.FC<WarehouseFormProps> = ({
         return;
       }
       setSubmitLoading(true);
-      PublicApi.postProductWarehouseAdd({ ...value }).then(res => {
+      postProductWarehouseAdd({ ...value }).then(res => {
         if (res.code === 1000) {
           setTimeout(() => {
             history.goBack();
@@ -104,7 +106,7 @@ const WarehouseForm: React.FC<WarehouseFormProps> = ({
         return;
       }
       setSubmitLoading(true);
-      PublicApi.postProductWarehouseUpdate({
+      postProductWarehouseUpdate({
         id: id,
         ...value,
       }).then(res => {

src/pages/transaction/stockSellStorage/warehouse/index.tsx

@@ -11,7 +11,7 @@ import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
 import { createFormActions } from '@formily/antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { PublicApi } from '@/services/api';
+import { getProductWarehouseList, postProductWarehouseStartRoStop, postProductWarehouseDelete } from '@/services/ProductV2Api';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
 import NiceForm from '@/components/NiceForm';
@@ -109,7 +109,7 @@ const WareHouse: React.FC<{}> = () => {
 
   const fetchListData = (params: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getProductWarehouseList(params)
+      getProductWarehouseList(params)
         .then(res => {
           if (res.code === 1000) {
             resolve(res.data);
@@ -123,7 +123,7 @@ const WareHouse: React.FC<{}> = () => {
   };
 
   const handleModify = record => {
-    PublicApi.postProductWarehouseStartRoStop({
+    postProductWarehouseStartRoStop({
       id: record.id,
       state: record.state === POSITION_STATUS_EFFECTIVE ? POSITION_STATUS_INVALID : POSITION_STATUS_EFFECTIVE,
     }).then(res => {
@@ -134,7 +134,7 @@ const WareHouse: React.FC<{}> = () => {
   };
 
   const handleDelete = record => {
-    PublicApi.postProductWarehouseDelete({
+    postProductWarehouseDelete({
       id: record.id,
     }).then(res => {
       if (res.code === 1000) {

src/pages/transaction/supplierEvaluation/analysis/index.tsx

@@ -3,7 +3,7 @@ import { Tabs, Row, Col } from 'antd';
 import { history } from 'umi';
 import { observer, inject } from 'mobx-react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { PublicApi } from '@/services/api';
+import { getMemberCommentSupplyCountTradeSummary, getMemberCommentSupplyCountTradeHistoryPage, getMemberCommentSupplyReceiveTradeHistoryPage, getMemberCommentSupplySendTradeHistoryPage, postMemberCommentSupplyReceiveTradeHistoryReply } from '@/services/MemberV2Api';
 import { IEvaluationModule } from '@/module/evaluationModule';
 import MellowCard from '@/components/MellowCard';
 import PolymericTable from '@/components/PolymericTable';
@@ -162,7 +162,7 @@ const Analysis: React.FC<AnalysisProps> = ({
 
   // 获取评价汇总
   const getTradeSummary = () => {
-    PublicApi.getMemberCommentSupplyCountTradeSummary().then(res => {
+    getMemberCommentSupplyCountTradeSummary().then(res => {
       if (res.code === 1000) {
         const evaluate = summaryEvaluate(res.data.rows);
         const evaluatePieData = getSummaryEvaluatePie(evaluate);
@@ -178,7 +178,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   const getTradeHistory = (params: ListParams): Promise<RecordRes> => {
     const { star, ...rest } = params;
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentSupplyCountTradeHistoryPage({
+      getMemberCommentSupplyCountTradeHistoryPage({
         ...rest, 
         starLevel: params.star, 
       }).then(res => {
@@ -211,7 +211,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   // 获取收到的评价列表
   const getReceivedList = (params: ListParams): Promise<RecordRes> => {
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentSupplyReceiveTradeHistoryPage({
+      getMemberCommentSupplyReceiveTradeHistoryPage({
         ...params, 
       }).then(res => {
         if (res.code === 1000) {
@@ -245,7 +245,7 @@ const Analysis: React.FC<AnalysisProps> = ({
   const getSentList = (params: ListParams): Promise<RecordRes> => {
     const { memberName, ...rest } = params;
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberCommentSupplySendTradeHistoryPage({
+      getMemberCommentSupplySendTradeHistoryPage({
         ...rest,
         subMemberName: memberName, 
       }).then(res => {
@@ -330,7 +330,7 @@ const Analysis: React.FC<AnalysisProps> = ({
 
   const handleExplainSubmit = (values: ValuesType) => {
     setExplainConfirmLoading(true);
-    PublicApi.postMemberCommentSupplyReceiveTradeHistoryReply({
+    postMemberCommentSupplyReceiveTradeHistoryReply({
       id: currentRecordRef.current.id,
       content: values.content,
     }).then((res) => {

src/pages/transaction/supplierEvaluation/received/detail/index.tsx

@@ -10,7 +10,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import { createFormActions } from '@formily/antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
-import { PublicApi } from '@/services/api';
+import { getMemberCommentSupplyReceiveTradeHistoryGet } from '@/services/MemberV2Api';
 import { normalizeFiledata, FileData } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
@@ -53,7 +53,7 @@ const ReceivedDetail: React.FC = () => {
       return;
     }
     setEvaluationInfoLoading(true);
-    PublicApi.getMemberCommentSupplyReceiveTradeHistoryGet({
+    getMemberCommentSupplyReceiveTradeHistoryGet({
       id,
     }).then(res => {
       if (res.code === 1000) {

src/pages/transaction/supplierEvaluation/sent/components/DetailInfo/index.tsx

@@ -11,7 +11,7 @@ import { FormOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
-import { PublicApi } from '@/services/api';
+import { getMemberCommentSupplySendTradeHistoryGet, postMemberCommentSupplySendTradeHistoryUpdate } from '@/services/MemberV2Api';
 import { normalizeFiledata, FileData } from '@/utils';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
@@ -66,7 +66,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       return;
     }
     setEvaluationInfoLoading(true);
-    PublicApi.getMemberCommentSupplySendTradeHistoryGet({
+    getMemberCommentSupplySendTradeHistoryGet({
       id,
     }).then(res => {
       if (res.code === 1000) {
@@ -121,7 +121,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
       return;
     } 
     
-    PublicApi.postMemberCommentSupplySendTradeHistoryUpdate(payload[0])
+    postMemberCommentSupplySendTradeHistoryUpdate(payload[0])
       .then(res => {
         if (res.code === 1000) {
           setTimeout(() => {

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx

@@ -13,8 +13,7 @@ import { history, Prompt } from 'umi';
 import moment from 'moment';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { usePageStatus } from '@/hooks/usePageStatus';
-import { PublicApi } from '@/services/api';
-import { GetMemberCommentSupplyOrderTradeDetailResponse } from '@/services/MemberV2Api';
+import { getMemberCommentSupplyOrderTradeDetail, GetMemberCommentSupplyOrderTradeDetailResponse, postMemberCommentSupplyOrderTradeSubmit } from '@/services/MemberV2Api';
 import AvatarWrap from '@/components/AvatarWrap';
 import NiceForm from '@/components/NiceForm';
 import { normalizeUnevaluatedList } from '../../../purchaserEvaluation/utils';
@@ -56,7 +55,7 @@ const EvaluateOrder: React.FC = () => {
       return;
     }
     setInfoLoading(true);
-    PublicApi.getMemberCommentSupplyOrderTradeDetail({
+    getMemberCommentSupplyOrderTradeDetail({
       id, 
     }).then(res => {
       if (res.code === 1000) {
@@ -102,7 +101,7 @@ const EvaluateOrder: React.FC = () => {
       };
     });
     
-    PublicApi.postMemberCommentSupplyOrderTradeSubmit({
+    postMemberCommentSupplyOrderTradeSubmit({
       orderId: orderInfo.orderId, 
       commentSubmitDetailList: payload, 
     }).then(res => {

src/pages/transaction/supplierEvaluation/unevaluated/index.tsx

@@ -8,7 +8,7 @@ import { createFormActions } from '@formily/antd';
 import moment from 'moment';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { PublicApi } from '@/services/api';
+import { getMemberOrderCommentVendorPage } from '@/services/MemberV2Api';
 import EyePreview from '@/components/EyePreview';
 import NiceForm from '@/components/NiceForm';
 import StatusTag from '@/components/StatusTag';
@@ -104,7 +104,7 @@ const Unevaluated: React.FC = () => {
     createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;
 
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberOrderCommentVendorPage({
+      getMemberOrderCommentVendorPage({
         createTimeStart,
         createTimeEnd,
         ...rest