Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318

src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/schema/index.ts

@@ -16,7 +16,7 @@ import {
   ORDER_TYPE2_POINTS,
   ORDER_TYPE2_CHANNEL_POINTS,
 } from '@/constants/order';
-import { isMaterialOrder } from '../../../../../utils';
+import { isMaterialOrder, fetchSupplierList } from '../../../../../utils';
 
 const intl = getIntl();
 
@@ -49,17 +49,6 @@ const supplierColumns = [
   },
 ];
 
-// 获取供应会员
-const getSupplier = async (params) => {
-  const res = await getMemberManageAftersaleReplacePage({
-    ...params,
-  })
-  if (res.code === 1000) {
-    return res.data;
-  }
-  return { totalCount: 0, data: [] };
-};
-
 const supplierSchema: ISchema = {
   type: 'object', 
   properties: {
@@ -151,7 +140,7 @@ export const addSchema = (orderType: number): ISchema => {
                             keepAlive: false,
                           }, 
                           columns: supplierColumns, 
-                          fetchTableData: getSupplier, 
+                          fetchTableData: fetchSupplierList, 
                           formilyProps: {
                             ctx: { 
                               schema: supplierSchema, 

src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/schema/index.ts

@@ -11,7 +11,7 @@ import {
   ORDER_TYPE_POINTS,
   ORDER_TYPE_CHANNEL_POINTS,
 } from '@/constants/order';
-import { isMaterialOrder } from '../../../../../utils';
+import { isMaterialOrder, fetchSupplierList } from '../../../../../utils';
 
 const intl = getIntl();
 
@@ -44,17 +44,6 @@ const supplierColumns = [
   },
 ];
 
-// 获取供应会员
-const getSupplier = async (params) => {
-  const res = await getMemberManageAftersaleReplacePage({
-    ...params,
-  })
-  if (res.code === 1000) {
-    return res.data;
-  }
-  return { totalCount: 0, data: [] };
-};
-
 const supplierSchema: ISchema = {
   type: 'object', 
   properties: {
@@ -145,7 +134,7 @@ export const addSchema = (orderType: number): ISchema => {
                             keepAlive: false,
                           }, 
                           columns: supplierColumns, 
-                          fetchTableData: getSupplier, 
+                          fetchTableData: fetchSupplierList, 
                           formilyProps: {
                             ctx: { 
                               schema: supplierSchema, 

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts

@@ -12,7 +12,7 @@ import {
   ORDER_TYPE_POINTS,
   ORDER_TYPE_CHANNEL_POINTS,
 } from '@/constants/order';
-import { isMaterialOrder } from '../../../../../utils';
+import { isMaterialOrder, fetchSupplierList } from '../../../../../utils';
 
 const intl = getIntl();
 
@@ -45,17 +45,6 @@ const supplierColumns = [
   },
 ];
 
-// 获取供应会员
-const getSupplier = async (params) => {
-  const res = await getMemberManageAftersaleReplacePage({
-    ...params,
-  })
-  if (res.code === 1000) {
-    return res.data;
-  }
-  return { totalCount: 0, data: [] };
-};
-
 const supplierSchema: ISchema = {
   type: 'object', 
   properties: {
@@ -150,7 +139,7 @@ export const addSchema = (orderType: number): ISchema => {
                             keepAlive: false,
                           }, 
                           columns: supplierColumns, 
-                          fetchTableData: getSupplier, 
+                          fetchTableData: fetchSupplierList, 
                           formilyProps: {
                             ctx: { 
                               schema: supplierSchema, 

src/pages/afterService/utils.ts

@@ -11,6 +11,8 @@ import {
   ORDER_TYPE_TENDER_CONTRACT,
   ORDER_TYPE_REQUISITION,
 } from '@/constants/order';
+import { getMemberManageAftersaleReplacePage, getMemberManageUpperProviderMerchantPage } from '@/services/MemberV220318Api';
+import BASE_CONFIG from '@/../config/base.config.json';
 
 // 是否是采购订单
 export const isMaterialOrder = (orderType: number) => {
@@ -32,4 +34,20 @@ export type AsType = 2 | 3 | 4;
  * 售后地址角色
  * 寄件人 'sender' 收件人 'receiver'
  */
-export type AsAddressRole = 'sender' | 'receiver'
\ No newline at end of file
+export type AsAddressRole = 'sender' | 'receiver'
+
+const SUPPLIER_LIST_MAP = {
+  0: getMemberManageAftersaleReplacePage,
+  1: getMemberManageUpperProviderMerchantPage,
+};
+
+export const fetchSupplierList = async (params) => {
+  const enableMultiTenancy = BASE_CONFIG.global.siteInfo.enableMultiTenancy || 0;
+  const res = await SUPPLIER_LIST_MAP[enableMultiTenancy]({
+    ...params,
+  })
+  if (res.code === 1000) {
+    return res.data;
+  }
+  return { totalCount: 0, data: [] };
+};
\ No newline at end of file

src/pages/balance/platformSettlement/integral/hooks/useHandleSettlementList.tsx

@@ -76,13 +76,13 @@ function useHandleSettlementList() {
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementWayName' }), dataIndex: 'settlementWayName' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.totalCount' }), dataIndex: 'totalCount' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.score' }), dataIndex: 'score' },
-    {
-      title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.ratio' }),
-      dataIndex: 'ratio',
-      render: (text, record) => {
-        return (record.ratio + "%");
-      }
-    },
+    // {
+    //   title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.ratio' }),
+    //   dataIndex: 'ratio',
+    //   render: (text, record) => {
+    //     return (record.ratio + "%");
+    //   }
+    // },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.amount' }), dataIndex: 'amount' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '预计付款时间' }), dataIndex: 'estimatedPaymentDate' },
     { title: intl.formatMessage({id: 'balance.platformSettlement.columns.payTime', defaultMessage: '实际付款时间'}), dataIndex: 'payTime'},