From 6695ef01506e6f7de7f90b4bf47076e49d9f7eae Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 09 九月 2025 10:44:41 +0800 Subject: [PATCH] fix: bug --- packages/services/apiV2/codeUrl.ts | 30 + packages/services/apiV2/enterpriseWallet.ts | 184 +++++-- apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 27 packages/services/apiV2/enterpriseEmployee.ts | 15 packages/services/apiV2/taskUser.ts | 18 packages/services/apiV2/user.ts | 32 + packages/services/apiV2/syncDatabase.ts | 15 packages/services/apiV2/index.ts | 8 packages/utils/message.tsx | 3 apps/cMiniApp/project.config.json | 4 packages/services/apiV2/task.ts | 93 ++++ packages/services/apiV2/typings.d.ts | 802 +++++++++++++++++++++++++++++----- packages/constants/apiEnum.ts | 122 ++++ apps/cMiniApp/src/pages/mine/index.vue | 6 14 files changed, 1,132 insertions(+), 227 deletions(-) diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json index cc53dd5..1d057ff 100644 --- a/apps/cMiniApp/project.config.json +++ b/apps/cMiniApp/project.config.json @@ -3,8 +3,8 @@ "description": "", "setting": { "urlCheck": false, - "es6": false, - "enhance": false, + "es6": true, + "enhance": true, "postcss": false, "preloadBackgroundData": false, "minified": false, diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue index 74f192b..0804ffb 100644 --- a/apps/cMiniApp/src/pages/mine/index.vue +++ b/apps/cMiniApp/src/pages/mine/index.vue @@ -120,9 +120,11 @@ const { goLoginFn } = useGoLogin(); const bgHeight = computed(() => 133 + systemStore.navHeight); -Taro.useDidShow(() => { +Taro.useDidShow(({ scene }) => { if (isLogin.value) { - updateUserInfo(); + setTimeout(() => { + updateUserInfo(); + }, 300); } }); diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue index 4f6e1e2..8d607b3 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue @@ -130,24 +130,27 @@ const goToSign = useAccessReal(async () => { try { - // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) { let params: API.PersonalUserElectronSignCommand = { id: detail.value?.id, }; let res = await enterpriseEmployeeServices.personalUserElectronSign(params); if (res) { - const encodedUrl = encodeURIComponent(res.signContractLongUrl); - Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` }); + if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) { + try { + await Message.confirm({ + message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone( + detail.value?.contactPhoneNumber + )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`, + cancelText: '鏈敹鍒扮煭淇�', + }); + } catch (error) { + goToSign(); + } + } else { + const encodedUrl = encodeURIComponent(res.signContractLongUrl); + Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` }); + } } - // } - // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) { - // Message.confirm({ - // message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone( - // detail.value?.contactPhoneNumber - // )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`, - // showCancelBtn: false, - // }); - // } } catch (error) {} }); Taro.useDidShow(() => { diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 3303086..efed8bd 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -21,6 +21,14 @@ Wxmp = 20, } +/** 缂栧彿鍦板潃鍦烘櫙 */ +export enum EnumCodeUrlScene { + /**閭�璇风绾� */ + InviteElectronSign = 1, + /**绛剧害鍦板潃 */ + ElectronSignUrl = 10, +} + /** 鍚堝悓鍒剁増鐘舵�� */ export enum EnumContractTemplateStatus { /**寰呭埗鐗� */ @@ -101,14 +109,86 @@ Alipay = 10, } +/** 浼佷笟閽卞寘浠h繘浠跺崟闄勪欢绫诲瀷 */ +export enum EnumEnterpriseWalletExpandindirectOrderFileType { + /**杞处鍦烘櫙鎴浘 */ + Scene = 10, + /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ + SceneQualification = 20, +} + +/** 浼佷笟閽卞寘浠h繘浠跺満鏅� */ +export enum EnumEnterpriseWalletExpandindirectOrderScene { + /**鐜伴噾钀ラ攢 */ + XIANJIN_YINGXIAO = 10, + /**琛屾斂琛ヨ创 */ + XINGZHENG_BUTIE = 20, + /**淇濋櫓鐞嗚禂 */ + BAOXIAN_LIPEI = 30, + /**浣i噾鎶ラ叕 */ + YONGJIN_BAOCHOU = 40, + /**浼佷笟璧斾粯 */ + QIYE_PEIFU = 50, + /**閲囪喘璐ф */ + CAIGOU_HUOKUAN = 60, + /**浜屾墜鍥炴敹 */ + ERSHOU_HUISHOU = 70, + /**鍏泭琛ュ姪 */ + GONGYI_BUZHU = 80, + /**鍏朵粬鍦烘櫙 */ + ZHUANZHANG_QITA = 90, +} + +/** 浼佷笟閽卞寘浠h繘浠跺崟鐘舵�� */ +export enum EnumEnterpriseWalletExpandindirectOrderStatus { + /**鏈繘浠� */ + Wait = 1, + /**瀹℃壒涓� */ + PROCESSING = 10, + /**宸茶繘浠� */ + VALID = 20, + /**瀹℃壒涓嶉�氳繃 */ + INVALID = 30, + /**宸插簾寮� */ + DISUSE = 40, + /**宸叉挙閿� */ + REVOKED = 50, +} + /** 浼佷笟閽卞寘绛剧害鐘舵�� */ export enum EnumEnterpriseWalletSignStatus { + /**鏈绾� */ + Wait = 1, /**鐢宠涓� */ Apply = 10, /**宸茬绾� */ Normal = 100, /**缁堟 */ Stop = 999, +} + +/** 浼佷笟閽卞寘浜ゆ槗鐘舵�� */ +export enum EnumEnterpriseWalletTransactionStatus { + /**寰呮彁浜� */ + WaitSubmit = 1, + /**寰呮敮浠� */ + WaitPay = 10, + /**澶勭悊涓� */ + Dealing = 20, + /**鎴愬姛 */ + Success = 30, + /**閫�绁� */ + Refund = 40, + /**澶辫触 */ + Fail = 50, +} + +/** 浼佷笟閽卞寘浜ゆ槗绫诲瀷 */ +export enum EnumEnterpriseWalletTransactionType { + /**鍏呭�� */ + Recharge = 10, + /**杞处 */ + Transfer = 20, } /** 鑿滃崟绫诲瀷 */ @@ -221,34 +301,38 @@ FlexJobServerTaskUser = 2, /**浠诲姟楠屾敹 */ FlexJobServerTaskCheckReceive = 3, + /**缂栧彿鍦板潃 */ + CommonServerCodeUrls = 4, /**鏂囦欢 */ - CommonServerFileUtils = 4, + CommonServerFileUtils = 5, /**鏂囧瓧璇嗗埆 */ - CommonServerOcrUtils = 5, + CommonServerOcrUtils = 6, /**鏃ュ織璁板綍 */ - CommonServerLogRecords = 6, + CommonServerLogRecords = 7, + /**鍚屾鏁版嵁搴� */ + CommonServerSyncDatabase = 8, /**鐢ㄦ埛璁よ瘉 */ - UserServerAuth = 7, + UserServerAuth = 9, /**鐢ㄦ埛鑿滃崟 */ - UserServerMenu = 8, + UserServerMenu = 10, /**鐢ㄦ埛璧勬簮 */ - UserServerResource = 9, + UserServerResource = 11, /**鐢ㄦ埛瑙掕壊 */ - UserServerRole = 10, + UserServerRole = 12, /**鐢ㄦ埛淇℃伅 */ - UserServerUser = 11, + UserServerUser = 13, /**鐢靛瓙绛� */ - UserServerElectronSign = 12, + UserServerElectronSign = 14, /**鐢ㄦ埛绠�鍘� */ - UserServerUserResume = 13, + UserServerUserResume = 15, /**浼佷笟淇℃伅 */ - UserServerEnterprise = 14, + UserServerEnterprise = 16, /**浼佷笟閽卞寘 */ - UserServerEnterpriseWallet = 15, + UserServerEnterpriseWallet = 17, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 16, + UserServerEnterpriseEmployee = 18, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 17, + ElectronSignServerElectronSign = 19, } /** 璧勬簮璇锋眰鏂瑰紡 */ @@ -323,10 +407,20 @@ Stopped = 100, } +/** 浠诲姟缁撶畻鍗曠姸鎬� */ +export enum EnumTaskSettlementOrderStatus { + /**寰呬笂浼� */ + Wait = 10, + /**宸蹭笂浼� */ + Completed = 20, +} + /** 浠诲姟缁撶畻鐘舵�� */ export enum EnumTaskSettlementStatus { /**寰呯粨绠� */ Wait = 10, + /**缁撶畻涓� */ + InProcess = 20, /**宸茬粨绠� */ Completed = 30, } diff --git a/packages/services/apiV2/codeUrl.ts b/packages/services/apiV2/codeUrl.ts new file mode 100644 index 0000000..2cb6939 --- /dev/null +++ b/packages/services/apiV2/codeUrl.ts @@ -0,0 +1,30 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ缂栧彿鍦板潃 GET /api/common/codeUrl/getCodeUrl */ +export async function getCodeUrl( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetCodeUrlParams, + options?: API.RequestConfig +) { + return request<API.GetCodeUrlQueryResult>('/api/common/codeUrl/getCodeUrl', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); +} + +/** 淇濆瓨缂栧彿鍦板潃 POST /api/common/codeUrl/saveCodeUrl */ +export async function saveCodeUrl(body: API.SaveCodeUrlCommand, options?: API.RequestConfig) { + return request<string>('/api/common/codeUrl/saveCodeUrl', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/packages/services/apiV2/enterpriseEmployee.ts b/packages/services/apiV2/enterpriseEmployee.ts index 874d511..286ed8a 100644 --- a/packages/services/apiV2/enterpriseEmployee.ts +++ b/packages/services/apiV2/enterpriseEmployee.ts @@ -158,6 +158,21 @@ ); } +/** 鍙戦�侀個璇风绾︾煭淇� POST /api/user/enterpriseEmployee/sendInviteElectronSignSms */ +export async function sendInviteElectronSignSms( + body: API.SendInviteElectronSignSmsCommand, + options?: API.RequestConfig +) { + return request<number>('/api/user/enterpriseEmployee/sendInviteElectronSignSms', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鐏靛伐瑙g害 POST /api/user/enterpriseEmployee/stopElectronSign */ export async function stopElectronSign( body: API.StopElectronSignCommand, diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts index 944d7dc..b03ba6d 100644 --- a/packages/services/apiV2/enterpriseWallet.ts +++ b/packages/services/apiV2/enterpriseWallet.ts @@ -2,21 +2,6 @@ // @ts-ignore import { request } from '@/utils/request'; -/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/alipayFundExpandindirectCreate */ -export async function alipayFundExpandindirectCreate( - body: API.AlipayFundExpandindirectCreateCommand, - options?: API.RequestConfig -) { - return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectCreate', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - }); -} - /** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠剁姸鎬侀�氱煡 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */ export async function alipayFundExpandindirectCreateNotify( body: { @@ -62,22 +47,31 @@ }); } -/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠舵枃浠朵笂浼犳帴鍙� POST /api/user/enterpriseWallet/alipayFundExpandindirectImageUpload */ -export async function alipayFundExpandindirectImageUpload( +/** 璧勯噾鍗曟嵁鐘舵�佸彉鏇撮�氱煡 POST /api/user/enterpriseWallet/alipayFundTransOrderChangedNotify */ +export async function alipayFundTransOrderChangedNotify( body: { - /** 浜у搧鐮� */ - ProductCode?: string; - /** 鍦烘櫙鐮� */ - BizScene?: string; + /** 閫氱煡ID */ + notify_id?: string; + /** 娑堟伅鍙戦�佹椂鐨勬湇鍔$鏃堕棿 */ + utc_timestamp?: string; + /** 娑堟伅鎺ュ彛鍚嶇О */ + msg_method?: string; + /** 娑堟伅鎺ュ彈鏂圭殑搴旂敤id */ + app_id?: string; + /** 鐗堟湰鍙�(1.1鐗堟湰涓烘爣鍑嗘秷鎭�) */ + version?: string; + /** 娑堟伅鎶ユ枃 */ + biz_content?: string; + /** 绛惧悕 */ + sign?: string; + /** 绛惧悕绫诲瀷 */ + sign_type?: string; + /** 缂栫爜闆嗭紝璇ュ瓧绗﹂泦涓洪獙绛惧拰瑙e瘑鎵�闇�瑕佺殑瀛楃闆� */ + charset?: string; }, - 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]; @@ -90,37 +84,10 @@ } }); - return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectImageUpload', { + return request<boolean>('/api/user/enterpriseWallet/alipayFundTransOrderChangedNotify', { method: 'POST', data: formData, requestType: 'form', - ...(options || {}), - }); -} - -/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟鍙栨秷鎺ュ彛 POST /api/user/enterpriseWallet/alipayFundExpandindirectOrderCancel */ -export async function alipayFundExpandindirectOrderCancel( - body: API.AlipayFundExpandindirectOrderCancelCommand, - options?: API.RequestConfig -) { - return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectOrderCancel', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - }); -} - -/** 杞处 POST /api/user/enterpriseWallet/alipayTransfer */ -export async function alipayTransfer(body: API.AlipayTransferCommand, options?: API.RequestConfig) { - return request<string>('/api/user/enterpriseWallet/alipayTransfer', { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, ...(options || {}), }); } @@ -198,22 +165,34 @@ }); } -/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getAlipayFundExpandindirectOrder */ -export async function getAlipayFundExpandindirectOrder( - // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) - params: API.APIgetAlipayFundExpandindirectOrderParams, +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/enterpriseWalletExpandindirectCreate */ +export async function enterpriseWalletExpandindirectCreate( + body: API.EnterpriseWalletExpandindirectCreateCommand, options?: API.RequestConfig ) { - return request<API.GetAlipayFundExpandindirectOrderQueryResult>( - '/api/user/enterpriseWallet/getAlipayFundExpandindirectOrder', - { - method: 'GET', - params: { - ...params, - }, - ...(options || {}), - } - ); + return request<string>('/api/user/enterpriseWallet/enterpriseWalletExpandindirectCreate', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟鍙栨秷鎺ュ彛 POST /api/user/enterpriseWallet/enterpriseWalletExpandindirectOrderCancel */ +export async function enterpriseWalletExpandindirectOrderCancel( + body: API.EnterpriseWalletExpandindirectOrderCancelCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterpriseWallet/enterpriseWalletExpandindirectOrderCancel', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); } /** 鏀粯瀹濋�氱煡鍥炰紶 GET /api/user/enterpriseWallet/getAlipayNotify */ @@ -260,6 +239,42 @@ ); } +/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */ +export async function getEnterpriseWalletExpandindirectOrder( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWalletExpandindirectOrderParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWalletExpandindirectOrderQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ浼佷笟閽卞寘浜ゆ槗璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWalletTransaction */ +export async function getEnterpriseWalletTransaction( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWalletTransactionParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWalletTransactionQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWalletTransaction', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** 寮�閫氫紒涓氶挶鍖� POST /api/user/enterpriseWallet/openEnterpriseWallet */ export async function openEnterpriseWallet( body: API.OpenEnterpriseWalletCommand, @@ -277,3 +292,36 @@ } ); } + +/** 浼佷笟閽卞寘鍏呭�� POST /api/user/enterpriseWallet/rechargeEnterpriseWallet */ +export async function rechargeEnterpriseWallet( + body: API.RechargeEnterpriseWalletCommand, + options?: API.RequestConfig +) { + return request<API.RechargeEnterpriseWalletCommandResult>( + '/api/user/enterpriseWallet/rechargeEnterpriseWallet', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 浼佷笟閽卞寘杞处 POST /api/user/enterpriseWallet/transferEnterpriseWallet */ +export async function transferEnterpriseWallet( + body: API.TransferEnterpriseWalletCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts index 96f40fc..2d2b182 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/index.ts @@ -6,11 +6,12 @@ import * as user from './user'; import * as role from './role'; import * as ocrUtils from './ocrUtils'; +import * as task from './task'; import * as enterprise from './enterprise'; import * as resource from './resource'; -import * as task from './task'; import * as dictionary from './dictionary'; import * as enterpriseWallet from './enterpriseWallet'; +import * as codeUrl from './codeUrl'; import * as electronSign from './electronSign'; import * as userResume from './userResume'; import * as auth from './auth'; @@ -19,16 +20,18 @@ import * as menu from './menu'; import * as logRecords from './logRecords'; import * as fileUtils from './fileUtils'; +import * as syncDatabase from './syncDatabase'; export default { enterpriseEmployee, user, role, ocrUtils, + task, enterprise, resource, - task, dictionary, enterpriseWallet, + codeUrl, electronSign, userResume, auth, @@ -37,4 +40,5 @@ menu, logRecords, fileUtils, + syncDatabase, }; diff --git a/packages/services/apiV2/syncDatabase.ts b/packages/services/apiV2/syncDatabase.ts new file mode 100644 index 0000000..b40e50d --- /dev/null +++ b/packages/services/apiV2/syncDatabase.ts @@ -0,0 +1,15 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鍚屾鏁版嵁搴� POST /api/common/syncDatabase/syncDatabase */ +export async function syncDatabase(body: API.SyncDatabaseCommand, options?: API.RequestConfig) { + return request<number>('/api/common/syncDatabase/syncDatabase', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/packages/services/apiV2/task.ts b/packages/services/apiV2/task.ts index 19f5179..06e974f 100644 --- a/packages/services/apiV2/task.ts +++ b/packages/services/apiV2/task.ts @@ -83,6 +83,36 @@ ); } +/** 鏌ヨ缁撶畻鍗曡鎯� GET /api/flexjob/task/getSettlementTask */ +export async function getSettlementTask( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetSettlementTaskParams, + options?: API.RequestConfig +) { + return request<API.GetSettlementTaskQueryResult>('/api/flexjob/task/getSettlementTask', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); +} + +/** 鏌ヨ缁撶畻浠诲姟鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/task/getSettlementTasks */ +export async function getSettlementTasks( + body: API.GetSettlementTasksQuery, + options?: API.RequestConfig +) { + return request<API.GetSettlementTasksQueryResult>('/api/flexjob/task/getSettlementTasks', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 鏌ヨ浠诲姟浼佷笟淇℃伅 GET /api/flexjob/task/getTaskEnterprise */ export async function getTaskEnterprise( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) @@ -116,6 +146,39 @@ /** 鏌ヨ浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/task/getTaskInfos */ export async function getTaskInfos(body: API.GetTaskInfosQuery, options?: API.RequestConfig) { return request<API.GetTaskInfosQueryResult>('/api/flexjob/task/getTaskInfos', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏌ヨ浠诲姟閫夋嫨鍣ㄦ暟鎹� GET /api/flexjob/task/getTaskSelect */ +export async function getTaskSelect( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetTaskSelectParams, + options?: API.RequestConfig +) { + return request<API.SelectOptionGuidGetTaskSelectQueryOption[]>( + '/api/flexjob/task/getTaskSelect', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鎾ゅ洖缁撶畻 POST /api/flexjob/task/revokeTaskSettlementOrder */ +export async function revokeTaskSettlementOrder( + body: API.RevokeTaskSettlementOrderCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/task/revokeTaskSettlementOrder', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -166,3 +229,33 @@ ...(options || {}), }); } + +/** 纭缁撶畻 POST /api/flexjob/task/sureTaskSettlement */ +export async function sureTaskSettlement( + body: API.SureTaskSettlementCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/task/sureTaskSettlement', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 纭缁撶畻鍗� POST /api/flexjob/task/sureTaskSettlementOrder */ +export async function sureTaskSettlementOrder( + body: API.SureTaskSettlementOrderCommand, + options?: API.RequestConfig +) { + return request<string>('/api/flexjob/task/sureTaskSettlementOrder', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/packages/services/apiV2/taskUser.ts b/packages/services/apiV2/taskUser.ts index 0edd5de..a66d30a 100644 --- a/packages/services/apiV2/taskUser.ts +++ b/packages/services/apiV2/taskUser.ts @@ -56,6 +56,24 @@ }); } +/** 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁 GET /api/flexjob/taskUser/getSettlementTaskUsers */ +export async function getSettlementTaskUsers( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetSettlementTaskUsersParams, + options?: API.RequestConfig +) { + return request<API.GetSettlementTaskUsersQueryResult>( + '/api/flexjob/taskUser/getSettlementTaskUsers', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + /** 鏌ヨ搴旇仒鎶ュ悕浜哄憳褰曠敤鐘舵�� GET /api/flexjob/taskUser/getTaskUserHireStatus */ export async function getTaskUserHireStatus( // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index e30cb0c..eab48c6 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -3,59 +3,9 @@ [key: string]: any; } - interface AlipayFundExpandindirectCreateCommand { - /** 浜у搧鐮� */ - productCode?: string; - /** 鍦烘櫙鐮� */ - bizScene?: string; - /** 澶栭儴鍗曞彿 */ - outBizNo?: string; - /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 */ - identity?: string; - /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 */ - identityType?: string; - /** 浜岀骇鍟嗘埛淇℃伅-濮撳悕 */ - name?: string; - /** 涓氬姟绫诲瀷 */ - bizType?: string; - /** 鍘熻繘浠跺崟id */ - originalOrderId?: string; - /** 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 */ - sceneCode?: string; - /** 杞处鍦烘櫙璇存槑 */ - sceneDirections?: string; - /** 杞处鍦烘櫙鎴浘 */ - sceneImage?: string; - /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ - sceneQualificationImage?: string; - sitesInfo?: AlipayFundExpandindirectCreateCommandSites; - /** Id */ - id?: string; - } - - interface AlipayFundExpandindirectCreateCommandSites { - website?: string; - app?: string; - gongzh?: string; - qita?: string; - xchengxU_ZHI?: string; - } - - interface AlipayFundExpandindirectOrderCancelCommand { - /** 浠h繘浠跺崟Id */ - id?: string; - } - - type AlipayTransferCommand = Record<string, any>; - interface APIcheckHealthParams { /** 鍋ュ悍鏍¢獙 */ request?: CheckHealthQuery; - } - - interface APIgetAlipayFundExpandindirectOrderParams { - /** 浠h繘浠跺崟Id */ - id?: string; } interface APIgetAliyunOSSAcsParams { @@ -77,6 +27,13 @@ taskInfoUserId?: string; /** 鏃ユ湡锛堢敤浜庝袱涓皬绋嬪簭 璺熸煇涓�涓狪d涓�璧蜂紶锛� */ date?: string; + } + + interface APIgetCodeUrlParams { + /** 鍦烘櫙 */ + scene?: EnumCodeUrlScene; + /** 缂栧彿 */ + code?: string; } interface APIgetContractTemplateParams { @@ -153,9 +110,21 @@ id?: string; } + interface APIgetEnterpriseWalletExpandindirectOrderParams { + /** 浼佷笟Id */ + enterpriseId?: string; + } + interface APIgetEnterpriseWalletParams { + /** 浼佷笟Id */ + enterpriseId?: string; /** 閫氶亾 */ access?: EnumEnterpriseWalletAccess; + } + + interface APIgetEnterpriseWalletTransactionParams { + /** 浜ゆ槗Id */ + id?: string; } interface APIgetFileUrlParams { @@ -182,6 +151,11 @@ interface APIgetPersonalLoginInfoParams { /** 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅 */ request?: GetPersonalLoginInfoQuery; + } + + interface APIgetPersonalUserBankCardParams { + /** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� */ + request?: GetPersonalUserBankCardQuery; } interface APIgetPersonalUserElectronSignParams { @@ -220,6 +194,18 @@ roleId?: string; } + interface APIgetSettlementTaskParams { + /** Id */ + id?: string; + } + + interface APIgetSettlementTaskUsersParams { + /** 浠诲姟Id */ + taskInfoId?: string; + /** 缁撶畻鍗曞湴鍧� */ + settlementOrderUrl?: string; + } + interface APIgetTaskEnterpriseParams { /** 浼佷笟Id */ id?: string; @@ -228,6 +214,11 @@ interface APIgetTaskInfoParams { /** Id */ id?: string; + } + + interface APIgetTaskSelectParams { + /** 鍏抽敭瀛� */ + keywords?: string; } interface APIgetTaskUserHireStatusParams { @@ -371,6 +362,8 @@ type ClearTaskCollectCommand = Record<string, any>; interface CloseEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; access?: EnumEnterpriseWalletAccess; } @@ -460,6 +453,45 @@ signContractLongUrl?: string; } + interface EnterpriseWalletExpandindirectCreateCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + /** 鏀粯瀹濈櫥褰曡处鍙� */ + identity?: string; + /** 鏀粯瀹濆鍚� */ + name?: string; + scene?: EnumEnterpriseWalletExpandindirectOrderScene; + /** 杞处鍦烘櫙璇存槑 */ + sceneDirections?: string; + sitesInfo?: EnterpriseWalletExpandindirectCreateCommandSites; + /** 闄勪欢 */ + files?: EnterpriseWalletExpandindirectCreateCommandFile[]; + } + + interface EnterpriseWalletExpandindirectCreateCommandFile { + type?: EnumEnterpriseWalletExpandindirectOrderFileType; + /** 闄勪欢 */ + file?: string; + } + + interface EnterpriseWalletExpandindirectCreateCommandSites { + /** 缃戠珯 */ + website?: string; + /** APP */ + app?: string; + /** 鍏紬鍙� */ + gongzh?: string; + /** 鏀粯瀹濆皬绋嬪簭 */ + xchengxU_ZHI?: string; + /** 鍏朵粬 */ + qita?: string; + } + + interface EnterpriseWalletExpandindirectOrderCancelCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + } + enum EnumBillingMethod { /**鎸夋湀 */ Month = 10, @@ -476,6 +508,13 @@ PcWeb = 10, /**寰俊灏忕▼搴� */ Wxmp = 20, + } + + enum EnumCodeUrlScene { + /**閭�璇风绾� */ + InviteElectronSign = 1, + /**绛剧害鍦板潃 */ + ElectronSignUrl = 10, } enum EnumContractTemplateStatus { @@ -548,13 +587,80 @@ Alipay = 10, } + enum EnumEnterpriseWalletExpandindirectOrderFileType { + /**杞处鍦烘櫙鎴浘 */ + Scene = 10, + /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ + SceneQualification = 20, + } + + enum EnumEnterpriseWalletExpandindirectOrderScene { + /**鐜伴噾钀ラ攢 */ + XIANJIN_YINGXIAO = 10, + /**琛屾斂琛ヨ创 */ + XINGZHENG_BUTIE = 20, + /**淇濋櫓鐞嗚禂 */ + BAOXIAN_LIPEI = 30, + /**浣i噾鎶ラ叕 */ + YONGJIN_BAOCHOU = 40, + /**浼佷笟璧斾粯 */ + QIYE_PEIFU = 50, + /**閲囪喘璐ф */ + CAIGOU_HUOKUAN = 60, + /**浜屾墜鍥炴敹 */ + ERSHOU_HUISHOU = 70, + /**鍏泭琛ュ姪 */ + GONGYI_BUZHU = 80, + /**鍏朵粬鍦烘櫙 */ + ZHUANZHANG_QITA = 90, + } + + enum EnumEnterpriseWalletExpandindirectOrderStatus { + /**鏈繘浠� */ + Wait = 1, + /**瀹℃壒涓� */ + PROCESSING = 10, + /**宸茶繘浠� */ + VALID = 20, + /**瀹℃壒涓嶉�氳繃 */ + INVALID = 30, + /**宸插簾寮� */ + DISUSE = 40, + /**宸叉挙閿� */ + REVOKED = 50, + } + enum EnumEnterpriseWalletSignStatus { + /**鏈绾� */ + Wait = 1, /**鐢宠涓� */ Apply = 10, /**宸茬绾� */ Normal = 100, /**缁堟 */ Stop = 999, + } + + enum EnumEnterpriseWalletTransactionStatus { + /**寰呮彁浜� */ + WaitSubmit = 1, + /**寰呮敮浠� */ + WaitPay = 10, + /**澶勭悊涓� */ + Dealing = 20, + /**鎴愬姛 */ + Success = 30, + /**閫�绁� */ + Refund = 40, + /**澶辫触 */ + Fail = 50, + } + + enum EnumEnterpriseWalletTransactionType { + /**鍏呭�� */ + Recharge = 10, + /**杞处 */ + Transfer = 20, } enum EnumMenuType { @@ -656,34 +762,38 @@ FlexJobServerTaskUser = 2, /**浠诲姟楠屾敹 */ FlexJobServerTaskCheckReceive = 3, + /**缂栧彿鍦板潃 */ + CommonServerCodeUrls = 4, /**鏂囦欢 */ - CommonServerFileUtils = 4, + CommonServerFileUtils = 5, /**鏂囧瓧璇嗗埆 */ - CommonServerOcrUtils = 5, + CommonServerOcrUtils = 6, /**鏃ュ織璁板綍 */ - CommonServerLogRecords = 6, + CommonServerLogRecords = 7, + /**鍚屾鏁版嵁搴� */ + CommonServerSyncDatabase = 8, /**鐢ㄦ埛璁よ瘉 */ - UserServerAuth = 7, + UserServerAuth = 9, /**鐢ㄦ埛鑿滃崟 */ - UserServerMenu = 8, + UserServerMenu = 10, /**鐢ㄦ埛璧勬簮 */ - UserServerResource = 9, + UserServerResource = 11, /**鐢ㄦ埛瑙掕壊 */ - UserServerRole = 10, + UserServerRole = 12, /**鐢ㄦ埛淇℃伅 */ - UserServerUser = 11, + UserServerUser = 13, /**鐢靛瓙绛� */ - UserServerElectronSign = 12, + UserServerElectronSign = 14, /**鐢ㄦ埛绠�鍘� */ - UserServerUserResume = 13, + UserServerUserResume = 15, /**浼佷笟淇℃伅 */ - UserServerEnterprise = 14, + UserServerEnterprise = 16, /**浼佷笟閽卞寘 */ - UserServerEnterpriseWallet = 15, + UserServerEnterpriseWallet = 17, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 16, + UserServerEnterpriseEmployee = 18, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 17, + ElectronSignServerElectronSign = 19, } enum EnumResourceMethod { @@ -751,9 +861,18 @@ Stopped = 100, } + enum EnumTaskSettlementOrderStatus { + /**寰呬笂浼� */ + Wait = 10, + /**宸蹭笂浼� */ + Completed = 20, + } + enum EnumTaskSettlementStatus { /**寰呯粨绠� */ Wait = 10, + /**缁撶畻涓� */ + InProcess = 20, /**宸茬粨绠� */ Completed = 30, } @@ -877,24 +996,6 @@ timestamp?: number; } - interface FriendlyResultGetAlipayFundExpandindirectOrderQueryResult { - /** 璺熻釜Id */ - traceId?: string; - /** 鐘舵�佺爜 */ - code?: number; - /** 閿欒鐮� */ - errorCode?: string; - data?: GetAlipayFundExpandindirectOrderQueryResult; - /** 鎵ц鎴愬姛 */ - success?: boolean; - /** 閿欒淇℃伅 */ - msg?: any; - /** 闄勫姞鏁版嵁 */ - extras?: any; - /** 鏃堕棿鎴� */ - timestamp?: number; - } - interface FriendlyResultGetAliyunOSSAcsQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -993,6 +1094,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetCheckReceiveTaskUserSubmitsQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCodeUrlQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCodeUrlQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1201,6 +1320,24 @@ timestamp?: number; } + interface FriendlyResultGetEnterpriseWalletExpandindirectOrderQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWalletExpandindirectOrderQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetEnterpriseWalletQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -1209,6 +1346,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseWalletQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseWalletTransactionQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWalletTransactionQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1381,6 +1536,24 @@ timestamp?: number; } + interface FriendlyResultGetPersonalUserBankCardQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetPersonalUserBankCardQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetPersonalUserElectronSignQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -1497,6 +1670,60 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetRoleQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetSettlementTaskQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetSettlementTaskQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetSettlementTasksQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetSettlementTasksQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetSettlementTaskUsersQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetSettlementTaskUsersQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1987,6 +2214,25 @@ timestamp?: number; } + interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: SelectOptionGuidGetTaskSelectQueryOption[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultListSelectOptionStringGetDictionaryDataSelectQueryResultOption { /** 璺熻釜Id */ traceId?: string; @@ -2150,6 +2396,24 @@ timestamp?: number; } + interface FriendlyResultRechargeEnterpriseWalletCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: RechargeEnterpriseWalletCommandResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultString { /** 璺熻釜Id */ traceId?: string; @@ -2185,50 +2449,6 @@ extras?: any; /** 鏃堕棿鎴� */ timestamp?: number; - } - - interface GetAlipayFundExpandindirectOrderQueryResult { - /** Id */ - id?: string; - /** 浜у搧鐮� */ - productCode?: string; - /** 鍦烘櫙鐮� */ - bizScene?: string; - /** 澶栭儴鍗曞彿 */ - outBizNo?: string; - /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 */ - identity?: string; - /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 */ - identityType?: string; - /** 浜岀骇鍟嗘埛淇℃伅-濮撳悕 */ - name?: string; - /** 涓氬姟绫诲瀷 */ - bizType?: string; - /** 鍘熻繘浠跺崟id */ - originalOrderId?: string; - /** 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 */ - sceneCode?: string; - /** 杞处鍦烘櫙璇存槑 */ - sceneDirections?: string; - /** 杞处鍦烘櫙鎴浘 */ - sceneImage?: string; - /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ - sceneQualificationImage?: string; - /** 鍟嗘埛绔欑偣淇℃伅 */ - sites?: string; - /** 杩涗欢鍗昳d */ - orderId?: string; - /** 杩涗欢鍗曠姸鎬� -瀹℃壒涓�: PROCESSING -宸茬敓鏁�: VALID -瀹℃壒涓嶉�氳繃: INVALID -宸插簾寮�: DISUSE -宸叉挙閿�: REVOKED */ - status?: string; - /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */ - taskFinishTime?: string; - /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */ - riskReviewRemark?: string; } type GetAlipayNotifyCommand = Record<string, any>; @@ -2489,6 +2709,21 @@ endTime?: string; /** 浠诲姟鍦扮偣鍚嶇О */ addressName?: string; + } + + interface GetCodeUrlQueryResult { + /** 鍦板潃 */ + url?: string; + /** 鍙傛暟1 */ + paramValue1?: string; + /** 鍙傛暟2 */ + paramValue2?: string; + /** 鍙傛暟3 */ + paramValue3?: string; + /** 鍙傛暟4 */ + paramValue4?: string; + /** 鍙傛暟5 */ + paramValue5?: string; } interface GetContractTemplateEnterprisesQuery { @@ -3006,10 +3241,57 @@ isConfigured?: boolean; } + interface GetEnterpriseWalletExpandindirectOrderQueryResult { + /** 鍗曞彿 */ + outBizNo?: string; + /** 鏀粯瀹濈櫥褰曡处鍙� */ + identity?: string; + /** 鏀粯瀹濆鍚� */ + name?: string; + scene?: EnumEnterpriseWalletExpandindirectOrderScene; + /** 杞处鍦烘櫙璇存槑 */ + sceneDirections?: string; + /** 鍟嗘埛绔欑偣淇℃伅 */ + sites?: string; + /** 杩涗欢鍗昳d */ + orderId?: string; + orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus; + /** 杩涗欢鍗曚换鍔″畬缁撴椂闂� */ + taskFinishTime?: string; + /** 杩涗欢鍗曞鏍镐笉閫氳繃鍘熷洜 */ + riskReviewRemark?: string; + sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites; + /** 闄勪欢 */ + files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[]; + } + + interface GetEnterpriseWalletExpandindirectOrderQueryResultFile { + type?: EnumEnterpriseWalletExpandindirectOrderFileType; + /** 闄勪欢 */ + file?: string; + } + + interface GetEnterpriseWalletExpandindirectOrderQueryResultSites { + /** 缃戠珯 */ + website?: string; + /** APP */ + app?: string; + /** 鍏紬鍙� */ + gongzh?: string; + /** 鏀粯瀹濆皬绋嬪簭 */ + xchengxU_ZHI?: string; + /** 鍏朵粬 */ + qita?: string; + } + interface GetEnterpriseWalletQueryResult { /** 閽卞寘Id */ id?: string; access?: EnumEnterpriseWalletAccess; + /** 璐﹀彿 */ + account?: string; + /** 鍟嗘埛Id */ + merchantId?: string; /** 鍗忚鍙� */ code?: string; /** 閫氶亾鍗忚鍙� */ @@ -3021,6 +3303,22 @@ /** 鍗忚澶辨晥鏃堕棿 */ invalidTime?: string; signStatus?: EnumEnterpriseWalletSignStatus; + expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus; + } + + interface GetEnterpriseWalletTransactionQueryResult { + type?: EnumEnterpriseWalletTransactionType; + /** 璁㈠崟鍙� */ + code?: string; + /** 閲戦 */ + amount?: number; + /** 浣欓 */ + balance?: number; + /** 澶囨敞 */ + remark?: string; + /** 璁㈠崟鏀粯鏃堕棿 */ + transDate?: string; + transactionStatus?: EnumEnterpriseWalletTransactionStatus; } interface GetExceptionLogsQuery { @@ -3422,6 +3720,20 @@ hireRefuseTaskCount?: number; } + type GetPersonalUserBankCardQuery = Record<string, any>; + + interface GetPersonalUserBankCardQueryResult { + access?: EnumEnterpriseWalletAccess; + /** 閾惰鍗″彿 */ + code?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 鎵�灞炴敮琛� */ + bankBranch?: string; + /** 閾惰棰勭暀鎵嬫満鍙� */ + phoneNumber?: string; + } + interface GetPersonalUserElectronSignQueryResult { /** 鐏靛伐Id */ id?: string; @@ -3749,6 +4061,121 @@ isChecked?: boolean; } + interface GetSettlementTaskQueryResult { + /** Id */ + id?: string; + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + settlementOrderStatus?: EnumTaskSettlementOrderStatus; + /** 缁撶畻鍗曞悕绉� */ + settlementOrderName?: string; + /** 涓婁紶鏃堕棿 */ + settlementOrderTime?: string; + /** 瀹炲彂閲戦 */ + actualSettlementAmount?: number; + /** 缁撶畻閲戦 */ + settlementAmount?: number; + settlementStatus?: EnumTaskSettlementStatus; + /** 缁撶畻鏃堕棿 */ + settlementTime?: string; + /** 澶囨敞 */ + settlementRemark?: string; + } + + interface GetSettlementTasksQuery { + /** 鍏抽敭瀛� */ + keywords?: string; + settlementOrderStatus?: EnumTaskSettlementOrderStatus; + settlementStatus?: EnumTaskSettlementStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetSettlementTasksQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetSettlementTasksQueryResultItem[]; + } + + interface GetSettlementTasksQueryResultItem { + /** 浠诲姟Id */ + id?: string; + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + settlementOrderStatus?: EnumTaskSettlementOrderStatus; + /** 缁撶畻鍗曞悕绉� */ + settlementOrderName?: string; + /** 涓婁紶鏃堕棿 */ + settlementOrderTime?: string; + /** 瀹炲彂閲戦 */ + actualSettlementAmount?: number; + /** 缁撶畻閲戦 */ + settlementAmount?: number; + settlementStatus?: EnumTaskSettlementStatus; + /** 缁撶畻鏃堕棿 */ + settlementTime?: string; + /** 澶囨敞 */ + settlementRemark?: string; + /** 缁撶畻浜烘暟 */ + settlementUserCount?: number; + } + + interface GetSettlementTaskUsersQueryResult { + /** 缁撶畻鍚嶅崟 */ + data?: GetSettlementTaskUsersQueryResultItem[]; + /** 閿欒淇℃伅 */ + errors?: GetSettlementTaskUsersQueryResultError[]; + } + + interface GetSettlementTaskUsersQueryResultError { + /** 閿欒淇℃伅 */ + errorMessage?: string; + /** 濮撳悕 */ + name?: string; + /** 韬唤璇佸彿 */ + identity?: string; + /** 缁撶畻閲戦 */ + settlementAmount?: number; + /** 瀹炲彂閲戦 */ + actualSettlementAmount?: number; + /** 鏀舵璐︽埛 */ + receiveAccount?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 寮�鎴锋敮琛屽悕绉� */ + bankBranch?: string; + /** 浠诲姟鍚嶇О */ + taskName?: string; + } + + interface GetSettlementTaskUsersQueryResultItem { + /** 浠诲姟鐢ㄦ埛Id */ + id?: string; + /** 濮撳悕 */ + name?: string; + /** 韬唤璇佸彿 */ + identity?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + settlementStatus?: EnumTaskSettlementStatus; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 寮�鎴锋敮琛屽悕绉� */ + bankBranch?: string; + /** 鏀舵璐︽埛 */ + receiveAccount?: string; + /** 缁撶畻閲戦 */ + settlementAmount?: number; + /** 瀹炲彂閲戦 */ + actualSettlementAmount?: number; + /** 缁撶畻鏃堕棿 */ + settlementTime?: string; + } + interface GetTaskEnterpriseQueryResult { /** 浼佷笟鍏ㄧО */ enterpriseName?: string; @@ -3963,6 +4390,15 @@ inProcessReleaseCount?: number; /** 宸插仠姝㈡暟閲� */ stoppedReleaseCount?: number; + } + + interface GetTaskSelectQueryOption { + /** 浠诲姟Id */ + id?: string; + /** 浠诲姟鍗曞彿 */ + code?: string; + /** 浠诲姟鍚嶇О */ + name?: string; } interface GetTaskUserHireStatusQueryResult { @@ -4348,7 +4784,13 @@ } interface OpenEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; access?: EnumEnterpriseWalletAccess; + /** 璐﹀彿 */ + account?: string; + /** 鍟嗘埛Id */ + merchantId?: string; } interface OpenEnterpriseWalletCommandResult { @@ -4424,8 +4866,10 @@ } interface PersonalUserElectronSignCommand { - /** 鐏靛伐Id */ + /** 鐏靛伐Id锛堜簩閫変竴锛� */ id?: string; + /** 閭�绾︾煭淇$紪鍙凤紙浜岄�変竴锛� */ + smsCode?: string; } interface PersonalUserElectronSignCommandResult { @@ -4461,6 +4905,21 @@ verifyCode: string; } + interface RechargeEnterpriseWalletCommand { + /** 浼佷笟Id */ + enterpriseId?: string; + access?: EnumEnterpriseWalletAccess; + /** 閲戦 */ + amount?: number; + /** 鍏呭�煎娉� */ + remark?: string; + } + + interface RechargeEnterpriseWalletCommandResult { + /** 鏀粯鍦板潃 */ + payUrl?: string; + } + interface RegisterPersonalUserCommand { /** 鎵嬫満鍙风爜 */ phoneNumber: string; @@ -4471,6 +4930,29 @@ interface ResendResourceCommand { /** 璧勬簮鏃ュ織Id */ id?: string; + } + + interface RevokeTaskSettlementOrderCommand { + /** 浠诲姟Id */ + taskInfoId?: string; + } + + interface SaveCodeUrlCommand { + scene?: EnumCodeUrlScene; + /** 鍦板潃 */ + url?: string; + /** 鍙傛暟1 */ + paramValue1?: string; + /** 鍙傛暟2 */ + paramValue2?: string; + /** 鍙傛暟3 */ + paramValue3?: string; + /** 鍙傛暟4 */ + paramValue4?: string; + /** 鍙傛暟5 */ + paramValue5?: string; + /** 杩囨湡鏃堕棿 */ + expiredTime?: string; } interface SaveContractTemplateCommand { @@ -4723,6 +5205,18 @@ id?: string; } + interface SavePersonalUserBankCardCommand { + access?: EnumEnterpriseWalletAccess; + /** 閾惰鍗″彿 */ + code?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 鎵�灞炴敮琛� */ + bankBranch?: string; + /** 閾惰棰勭暀鎵嬫満鍙� */ + phoneNumber?: string; + } + interface SaveRoleCommand { /** Id */ id?: string; @@ -4854,12 +5348,25 @@ data?: GetEnterpriseContractTemplateSelectQueryOption; } + interface SelectOptionGuidGetTaskSelectQueryOption { + /** 鍊� */ + value?: string; + /** 鏍囩 */ + label?: string; + data?: GetTaskSelectQueryOption; + } + interface SelectOptionStringGetDictionaryDataSelectQueryResultOption { /** 鍊� */ value?: string; /** 鏍囩 */ label?: string; data?: GetDictionaryDataSelectQueryResultOption; + } + + interface SendInviteElectronSignSmsCommand { + /** Id */ + ids?: string[]; } interface SendLoginOrRegisterVerifyCodeCommand { @@ -4986,6 +5493,39 @@ files?: string[]; } + interface SureTaskSettlementCommand { + /** 浠诲姟Id */ + taskInfoId?: string; + } + + interface SureTaskSettlementOrderCommand { + /** 浠诲姟Id */ + taskInfoId?: string; + /** 缁撶畻鍗曞湴鍧� */ + settlementOrderUrl?: string; + /** 缁撶畻鍚嶅崟 */ + taskInfoUsers?: SureTaskSettlementOrderCommandUser[]; + } + + interface SureTaskSettlementOrderCommandUser { + /** 浠诲姟鐢ㄦ埛Id */ + id?: string; + /** 濮撳悕 */ + name?: string; + /** 鎵�灞為摱琛� */ + bank?: string; + /** 寮�鎴锋敮琛屽悕绉� */ + bankBranch?: string; + /** 鏀舵璐︽埛 */ + receiveAccount: string; + /** 缁撶畻閲戦 */ + settlementAmount: number; + /** 瀹炲彂閲戦 */ + actualSettlementAmount: number; + } + + type SyncDatabaseCommand = Record<string, any>; + interface SyncElectronSignSettingsCommand { /** 椤� */ items?: SyncElectronSignSettingsCommandItem[]; @@ -5109,6 +5649,14 @@ remark?: string; } + interface TransferEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + /** 閲戦 */ + amount?: number; + /** 鍏呭�煎娉� */ + remark?: string; + } + interface UpdatePhoneNumberVerifyCodeCommand { /** 鎵嬫満鍙风爜 */ phoneNumber: string; diff --git a/packages/services/apiV2/user.ts b/packages/services/apiV2/user.ts index 43f20b8..99c7719 100644 --- a/packages/services/apiV2/user.ts +++ b/packages/services/apiV2/user.ts @@ -20,6 +20,23 @@ ); } +/** 鏌ヨ涓汉鐢ㄦ埛閾惰鍗′俊鎭� GET /api/user/user/getPersonalUserBankCard */ +export async function getPersonalUserBankCard( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetPersonalUserBankCardParams, + options?: API.RequestConfig +) { + return request<API.GetPersonalUserBankCardQueryResult>('/api/user/user/getPersonalUserBankCard', { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + }); +} + /** 鏌ヨC绔汉鍛樺垎椤靛垪琛ㄦ暟鎹� POST /api/user/user/getPersonalUserInfos */ export async function getPersonalUserInfos( body: API.GetPersonalUserInfosQuery, @@ -68,6 +85,21 @@ }); } +/** 淇濆瓨鐢ㄦ埛閾惰鍗′俊鎭� POST /api/user/user/savePersonalUserBankCard */ +export async function savePersonalUserBankCard( + body: API.SavePersonalUserBankCardCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/user/savePersonalUserBankCard', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + /** 璁剧疆鐢ㄦ埛淇℃伅瑙掕壊 PUT /api/user/user/setUserInfoRoles */ export async function setUserInfoRoles( body: API.SetUserInfoRolesCommand, diff --git a/packages/utils/message.tsx b/packages/utils/message.tsx index 1ddf523..fb8abd6 100644 --- a/packages/utils/message.tsx +++ b/packages/utils/message.tsx @@ -25,6 +25,7 @@ title?: string; message?: string | VNode; confirmText?: string; + cancelText?: string; showCancelBtn?: boolean; }; @@ -34,6 +35,7 @@ title = '鎻愮ず', message = '纭畾瑕佸垹闄よ鏁版嵁鍚�?', confirmText = '纭', + cancelText = '鍙栨秷', showCancelBtn = true, } = options; return new Promise((resolve, reject) => { @@ -49,6 +51,7 @@ visible={open.value} content={message} showCancelBtn={showCancelBtn} + cancelText={cancelText} onCancel={() => { onClose(); reject(); -- Gitblit v1.9.1