From 329df2aed8f35d6caa0dcdd6b9fd9496beebd90a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 30 十二月 2025 16:13:58 +0800
Subject: [PATCH] fix: nongye
---
src/services/api/ExternalSystem.ts | 63 +++++++++++++++
src/services/api/DataBoard.ts | 45 +++++++++-
src/views/Reward/components/WithdrawalApprovalAuditDialog.vue | 7 +
src/services/api/typings.d.ts | 62 +++++++++++++++
src/views/Reward/RewardApplyTradeCheck.vue | 3
src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 8 +
6 files changed, 179 insertions(+), 9 deletions(-)
diff --git a/src/services/api/DataBoard.ts b/src/services/api/DataBoard.ts
index eda960d..e8fdf21 100644
--- a/src/services/api/DataBoard.ts
+++ b/src/services/api/DataBoard.ts
@@ -279,18 +279,41 @@
);
}
-/** 鏌ヨ浜鸿祫浼佷笟鐨勭敳鏂瑰鎴� GET /api/DataBoard/GetEnterpriseCustomers */
-export async function getEnterpriseCustomers(options?: API.RequestConfig) {
- return request<any>('/api/DataBoard/GetEnterpriseCustomers', {
+/** 鏌ヨ浜у�� GET /api/DataBoard/GetEnterpriseOutputValue */
+export async function getEnterpriseOutputValue(options?: API.RequestConfig) {
+ return request<any>('/api/DataBoard/GetEnterpriseOutputValue', {
method: 'GET',
...(options || {}),
});
}
-/** 鏌ヨ浜у�� GET /api/DataBoard/GetEnterpriseOutputValue */
-export async function getEnterpriseOutputValue(options?: API.RequestConfig) {
- return request<any>('/api/DataBoard/GetEnterpriseOutputValue', {
- method: 'GET',
+/** 瀵煎叆浜鸿祫浼佷笟鐨勭敳鏂瑰鎴� POST /api/DataBoard/ImportEnterpriseCustomers */
+export async function importEnterpriseCustomers(
+ body: {},
+ file?: File,
+ options?: API.RequestConfig
+) {
+ const formData = new FormData();
+
+ if (file) {
+ formData.append('file', file);
+ }
+
+ Object.keys(body).forEach((ele) => {
+ const item = (body as any)[ele];
+
+ if (item !== undefined && item !== null) {
+ formData.append(
+ ele,
+ typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item
+ );
+ }
+ });
+
+ return request<any>('/api/DataBoard/ImportEnterpriseCustomers', {
+ method: 'POST',
+ data: formData,
+ requestType: 'form',
...(options || {}),
});
}
@@ -340,3 +363,11 @@
}
);
}
+
+/** 鍚屾浜鸿祫浼佷笟鐨勭敳鏂瑰鎴� POST /api/DataBoard/SyncEnterpriseCustomers */
+export async function syncEnterpriseCustomers(options?: API.RequestConfig) {
+ return request<any>('/api/DataBoard/SyncEnterpriseCustomers', {
+ method: 'POST',
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/ExternalSystem.ts b/src/services/api/ExternalSystem.ts
index 21cdaca..9e8f573 100644
--- a/src/services/api/ExternalSystem.ts
+++ b/src/services/api/ExternalSystem.ts
@@ -17,6 +17,36 @@
});
}
+/** 鏌ヨ娓犻亾鍐滀笟閾惰鍦板尯閽卞寘 GET /api/ExternalSystem/GetBankAreas */
+export async function getBankAreas(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetBankAreasParams,
+ options?: API.RequestConfig
+) {
+ return request<API.StringStringSelectOption[]>('/api/ExternalSystem/GetBankAreas', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ娓犻亾鍐滀笟閾惰閽卞寘 GET /api/ExternalSystem/GetBanks */
+export async function getBanks(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetBanksParams,
+ options?: API.RequestConfig
+) {
+ return request<API.StringStringSelectOption[]>('/api/ExternalSystem/GetBanks', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鏌ョ湅褰撳墠澶栭儴绯荤粺淇℃伅 GET /api/ExternalSystem/GetCurrentExternalSystem */
export async function getCurrentExternalSystem(options?: API.RequestConfig) {
return request<API.GetCurrentExternalSystemOutput>(
@@ -43,6 +73,24 @@
});
}
+/** 鏌ヨ澶栭儴绯荤粺鍐滀笟閾惰閽卞寘淇℃伅 GET /api/ExternalSystem/GetExternalSystemNongYePayWallet */
+export async function getExternalSystemNongYePayWallet(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetExternalSystemNongYePayWalletParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetExternalSystemNongYePayWalletOutput>(
+ '/api/ExternalSystem/GetExternalSystemNongYePayWallet',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ澶栭儴绯荤粺骞冲畨閾惰閽卞寘淇℃伅 GET /api/ExternalSystem/GetExternalSystemPingAnPayWallet */
export async function getExternalSystemPingAnPayWallet(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -61,6 +109,21 @@
);
}
+/** 淇濆瓨澶栭儴绯荤粺鍐滀笟閾惰閽卞寘淇℃伅 POST /api/ExternalSystem/SaveExternalSystemNongYePayWallet */
+export async function saveExternalSystemNongYePayWallet(
+ body: API.SaveExternalSystemNongYePayWalletInput,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/ExternalSystem/SaveExternalSystemNongYePayWallet', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 淇濆瓨澶栭儴绯荤粺骞冲畨閾惰閽卞寘淇℃伅 POST /api/ExternalSystem/SaveExternalSystemPingAnPayWallet */
export async function saveExternalSystemPingAnPayWallet(
body: API.SaveExternalSystemPingAnPayWalletInput,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 979b22a..e5a8446 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -1328,6 +1328,18 @@
lgGigWorkerCustomerTemplateId?: string;
}
+ interface APIgetBankAreasParams {
+ /** 閫氶亾 */
+ access?: EnumWalletAccess;
+ }
+
+ interface APIgetBanksParams {
+ /** 閫氶亾 */
+ access?: EnumWalletAccess;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ }
+
interface APIgetBatchBillStaffListParams {
insurancePolicyId?: string;
batchBillId?: string;
@@ -1519,6 +1531,11 @@
id?: string;
}
+ interface APIgetExternalSystemNongYePayWalletParams {
+ /** 澶栭儴绯荤粺Id */
+ externalSystemId?: string;
+ }
+
interface APIgetExternalSystemPingAnPayWalletParams {
/** 澶栭儴绯荤粺Id */
externalSystemId?: string;
@@ -5407,6 +5424,8 @@
insureBillNo?: string;
/** 鏀舵鍗曚綅鍚嶇О */
incomeBankAccount?: string;
+ /** 鏀舵鍗曚綅琛屽彿 */
+ incomeBankNo?: string;
/** 鏀舵鍗曚綅璐﹀彿 */
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
@@ -6517,6 +6536,8 @@
type EnumSmsStatus = 0 | 10 | 20 | 30;
+ type EnumWalletAccess = 10 | 20 | 30 | 40;
+
type EnumWalletSignStatus = 1 | 10 | 100 | 999;
type EnumWalletTransactionStatus = 1 | 10 | 20 | 30 | 40 | 50;
@@ -6526,7 +6547,7 @@
enterpriseName: string;
/** 淇＄敤浠ｇ爜 */
societyCreditCode: string;
- /** 璐㈡斂鎷ㄤ粯閲戦 */
+ /** 鎺ㄥ箍琛ヨ创鍙戞斁閲戦 */
financeToAmountStr?: string;
/** 骞冲彴鎷ㄤ粯閲戦 */
transferToAmountStr?: string;
@@ -8129,6 +8150,8 @@
accountName?: string;
bankNumber?: string;
bankName?: string;
+ /** 琛屽彿 */
+ bankNo?: string;
bankResumeName?: string;
amount?: number;
remainAmount?: number;
@@ -8327,6 +8350,16 @@
searchKey?: string;
}
+ interface GetExternalSystemNongYePayWalletOutput {
+ /** 鎴峰悕 */
+ name?: string;
+ /** 璐﹀彿 */
+ identity?: string;
+ /** 浣欓 */
+ balance?: number;
+ signStatus?: EnumWalletSignStatus;
+ }
+
interface GetExternalSystemPingAnPayWalletOutput {
/** 鎴峰悕 */
name?: string;
@@ -9859,6 +9892,8 @@
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
incomeBankName?: string;
+ /** 鏀舵鍗曚綅琛屽彿 */
+ incomeBankNo?: string;
/** 鎶曚繚浜烘暟 */
insurePeopleNum?: number;
creationTime?: string;
@@ -10117,6 +10152,8 @@
cooperationUrl?: string;
/** 閾惰鎬昏鍚嶇О */
bankName?: string;
+ /** 琛屽彿 */
+ bankNo?: string;
/** 閾惰鏀鍚嶇О */
bankBranchName?: string;
/** 閾惰鍗″彿 */
@@ -10879,6 +10916,8 @@
licenseUrl?: string;
enterpriseIsVerify?: boolean;
bankName?: string;
+ /** 琛屽彿 */
+ bankNo?: string;
bankBranchName?: string;
bankCardNumber?: string;
bankIsVerify?: boolean;
@@ -21065,6 +21104,15 @@
templateParamExtraData?: string;
}
+ interface SaveExternalSystemNongYePayWalletInput {
+ /** 澶栭儴绯荤粺Id */
+ externalSystemId?: string;
+ /** 鎴峰悕 */
+ name: string;
+ /** 璐﹀彿 */
+ identity: string;
+ }
+
interface SaveExternalSystemPingAnPayWalletInput {
/** 澶栭儴绯荤粺Id */
externalSystemId?: string;
@@ -21636,6 +21684,7 @@
interface SetUserEnterpriseBankInfoInput {
bankName?: string;
+ bankNo?: string;
bankBranchName?: string;
bankCardNumber?: string;
/** 鐢ㄦ埛Id */
@@ -22205,6 +22254,15 @@
sttDesc?: string;
}
+ interface StringStringSelectOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ /** 鏁版嵁 */
+ data?: string;
+ }
+
interface SubAccountBalanceQueryInput {
/** 鎺ユ敹鎶ユ枃闀垮害 鎶ユ枃鏁版嵁闀垮害锛涗笉鍖呮嫭闄勪欢鍐呭銆佺鍚嶅唴瀹圭殑闀垮害锛屼笉澶熷乏琛�0 */
recvLength?: number;
@@ -22493,6 +22551,8 @@
insureBillNo?: string;
/** 鏀舵鍗曚綅鍚嶇О */
incomeBankAccount?: string;
+ /** 鏀舵鍗曚綅琛屽彿 */
+ incomeBankNo?: string;
/** 鏀舵鍗曚綅璐﹀彿 */
incomeBankCardNumber?: string;
/** 寮�鎴疯 */
diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue
index 94bc67d..54a9e9a 100644
--- a/src/views/Reward/RewardApplyTradeCheck.vue
+++ b/src/views/Reward/RewardApplyTradeCheck.vue
@@ -209,6 +209,7 @@
incomeBankName: row.incomeBankName,
creationTime: row.creationTime,
insurePeopleNum: row.insurePeopleNum ?? ('' as any as number),
+ incomeBankNo: row.incomeBankNo ?? '',
});
}
@@ -243,6 +244,8 @@
incomeBankName: '',
creationTime: '',
insurePeopleNum: 0,
+
+ incomeBankNo: '',
},
});
diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
index 082ea82..554bef3 100644
--- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
+++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -179,7 +179,9 @@
insurePeopleNum: number;
creationTime: string;
- isSignWallet: boolean;
+ isSignWallet?: boolean;
+
+ incomeBankNo: string;
};
const form = defineModel<Form>('form');
@@ -233,6 +235,10 @@
formatter: (row) => getIncomeBankName(row),
},
{
+ label: '寮�鎴疯鍙�',
+ key: 'incomeBankNo',
+ },
+ {
label: '寮�鎴疯处鍙�',
key: 'incomeBankCardNumber',
formatter: (row) => getIncomeBankCardNumber(row),
diff --git a/src/views/Reward/components/WithdrawalApprovalAuditDialog.vue b/src/views/Reward/components/WithdrawalApprovalAuditDialog.vue
index 2040c3d..0a22047 100644
--- a/src/views/Reward/components/WithdrawalApprovalAuditDialog.vue
+++ b/src/views/Reward/components/WithdrawalApprovalAuditDialog.vue
@@ -140,6 +140,8 @@
checkFileUrl: UploadUserFile[];
isSignWallet: boolean;
+
+ bankNo?: string;
};
const form = defineModel<Form>('form');
@@ -184,6 +186,7 @@
form.value.checkStatus = form.value?.isCheck
? data.checkStatus
: ('' as any as EnterpriseRechargeStatusEnum);
+ form.value.bankNo = data.bankNo ?? '';
form.value.checkFileUrl = convertApi2FormUrlOnlyOne(data.checkFileUrl);
},
});
@@ -221,6 +224,10 @@
key: 'bankResumeName',
},
{
+ label: '寮�鎴疯鍙�',
+ key: 'bankNo',
+ },
+ {
label: '鎻愮幇閲戦',
key: 'amount',
type: 'money',
--
Gitblit v1.10.0