From ce7ff0effee22807c8d29a31d6f5f2713d3bf95c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:39:51 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/EnterpriseManage/EnterpriseManageList.vue | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 365b471..3e21988 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/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',
@@ -159,10 +161,10 @@
if (row) {
let electronSignSetting = await getEnterpriseElectronSignSetting(row.id);
let smsSetting = await getEnterpriseSmsSetting(row.id);
- // let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({
- // enterpriseId: row.id,
- // access: EnumEnterpriseWalletAccess.Alipay,
- // });
+ let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({
+ enterpriseId: row.id,
+ access: EnumEnterpriseWalletAccess.Alipay,
+ });
handleEdit({
id: row.id,
enterpriseConfigureType: EnterpriseConfigureType.AliPay,
@@ -171,8 +173,22 @@
),
smsAccess: smsSetting.smsAccess,
smsCost: smsSetting.smsCost,
- alipayAccount: '',
- alipayMerchantId: '',
+ 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({
@@ -192,6 +208,16 @@
smsCost: 0,
alipayAccount: '',
alipayMerchantId: '',
+ signStatus: '' as any as EnumEnterpriseWalletSignStatus,
+ expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,
+
+ name: '',
+ scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
+ sceneDirections: '',
+ /**杞处鍦烘櫙鎴浘 */
+ sceneFiles: [] as UploadUserFile[],
+ /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+ sceneQualificationFiles: [] as UploadUserFile[],
},
});
@@ -207,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);
@@ -215,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 = {
--
Gitblit v1.9.1