Merge branch 'master' into dev-v1.1

wupengfei

17 小时以前 ce7ff0effee22807c8d29a31d6f5f2713d3bf95c

 src/views/EnterpriseManage/EnterpriseManageList.vue

@@ -52,6 +52,7 @@
  useTable,
  useFormDialog,
  FieldRadio,
  UploadUserFile,
} from '@bole-core/components';
import { useAccess, useGlobalEventContext } from '@/hooks';
import { EnterpriseConfigureType, IsConfiguredText } from '@/constants';
@@ -59,6 +60,7 @@
import { Message } from '@bole-core/core';
import * as enterpriseServices from '@/services/api/enterprise';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import { convertWalletApiToFiles, convertWalletFilesToApi } from '@/utils';

defineOptions({
  name: 'EnterpriseManageList',
@@ -171,10 +173,22 @@
        ),
        smsAccess: smsSetting.smsAccess,
        smsCost: smsSetting.smsCost,
        alipayAccount: alipayWallet.account,
        alipayMerchantId: alipayWallet.merchantId,
        alipayAccount: alipayWallet.identity,
        alipayMerchantId: alipayWallet.code,
        signStatus: alipayWallet.signStatus,
        expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus,

        name: alipayWallet.name,
        scene: alipayWallet.scene || EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU,
        sceneDirections: alipayWallet.sceneDirections,
        sceneFiles: convertWalletApiToFiles(
          alipayWallet.files,
          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
        ),
        sceneQualificationFiles: convertWalletApiToFiles(
          alipayWallet.files,
          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
        ),
      });
    } else {
      handleAdd({
@@ -196,6 +210,14 @@
    alipayMerchantId: '',
    signStatus: '' as any as EnumEnterpriseWalletSignStatus,
    expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,

    name: '',
    scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
    sceneDirections: '',
    /**转账场景截图 */
    sceneFiles: [] as UploadUserFile[],
    /**商户行业资质图片或协议文本 */
    sceneQualificationFiles: [] as UploadUserFile[],
  },
});

@@ -211,6 +233,9 @@
    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
      res = await createOrEditFlexEnterpriseMessageSetting();
    }
    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.AliPay) {
      res = await enterpriseWalletExpandindirectCreate();
    }
    if (res) {
      Message.successMessage('操作成功');
      getList(paginationState.pageIndex);
@@ -219,6 +244,30 @@
  } catch (error) {}
}

async function enterpriseWalletExpandindirectCreate() {
  try {
    let params: API.EnterpriseWalletExpandindirectCreateCommand = {
      enterpriseId: editForm.id,
      identity: editForm.alipayAccount,
      name: editForm.name,
      scene: editForm.scene,
      sceneDirections: editForm.sceneDirections,
      sitesInfo: null,
      files: [
        ...convertWalletFilesToApi(
          editForm.sceneFiles,
          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
        ),
        ...convertWalletFilesToApi(
          editForm.sceneQualificationFiles,
          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
        ),
      ],
    };
    return await enterpriseWalletServices.enterpriseWalletExpandindirectCreate(params);
  } catch (error) {}
}

// async function createOrEditFlexEnterpriseBankSetting() {
//   try {
//     let params: API.CreateOrEditFlexEnterpriseBankInput = {