From 62467438f17f552b7f2e72e7e13968a398d55863 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 03 九月 2025 15:08:12 +0800 Subject: [PATCH] fix: bug --- packages/services/apiV2/index.ts | 4 packages/services/apiV2/enterpriseWallet.ts | 241 +++++++++++++++++++++++++++++ apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 2 apps/cMiniApp/project.config.json | 4 packages/services/apiV2/typings.d.ts | 209 ++++++++++++++++++++----- packages/constants/apiEnum.ts | 16 ++ 6 files changed, 419 insertions(+), 57 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/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue index 6b779fe..ad97b52 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue @@ -132,7 +132,7 @@ try { // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) { let params: API.PersonalUserElectronSignCommand = { - id: id, + id: detail.value?.id, }; let res = await enterpriseEmployeeServices.personalUserElectronSign(params); if (res) { diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 0181980..3303086 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -95,6 +95,22 @@ Identity4 = 20, } +/** 浼佷笟閽卞寘閫氶亾 */ +export enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + Alipay = 10, +} + +/** 浼佷笟閽卞寘绛剧害鐘舵�� */ +export enum EnumEnterpriseWalletSignStatus { + /**鐢宠涓� */ + Apply = 10, + /**宸茬绾� */ + Normal = 100, + /**缁堟 */ + Stop = 999, +} + /** 鑿滃崟绫诲瀷 */ export enum EnumMenuType { /**鑿滃崟 */ diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts index 3016da8..944d7dc 100644 --- a/packages/services/apiV2/enterpriseWallet.ts +++ b/packages/services/apiV2/enterpriseWallet.ts @@ -7,7 +7,7 @@ body: API.AlipayFundExpandindirectCreateCommand, options?: API.RequestConfig ) { - return request<boolean>('/api/user/enterpriseWallet/alipayFundExpandindirectCreate', { + return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectCreate', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -17,12 +17,105 @@ }); } -/** 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠剁姸鎬侀�氱煡鎺ュ彛 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */ +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠剁姸鎬侀�氱煡 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */ export async function alipayFundExpandindirectCreateNotify( - body: API.AlipayFundExpandindirectCreateNotifyCommand, + body: { + /** 閫氱煡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; + }, options?: API.RequestConfig ) { - return request<boolean>('/api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify', { + const formData = new FormData(); + + 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<string>('/api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify', { + method: 'POST', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠舵枃浠朵笂浼犳帴鍙� POST /api/user/enterpriseWallet/alipayFundExpandindirectImageUpload */ +export async function alipayFundExpandindirectImageUpload( + body: { + /** 浜у搧鐮� */ + ProductCode?: string; + /** 鍦烘櫙鐮� */ + BizScene?: 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]; + + if (item !== undefined && item !== null) { + formData.append( + ele, + typeof item === 'object' && !(item instanceof File) ? JSON.stringify(item) : item + ); + } + }); + + return request<string>('/api/user/enterpriseWallet/alipayFundExpandindirectImageUpload', { + 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', @@ -34,10 +127,68 @@ /** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 POST /api/user/enterpriseWallet/alipayUserAgreementPageSignNotify */ export async function alipayUserAgreementPageSignNotify( - body: API.AlipayUserAgreementPageSignNotifyQuery, + body: { + notify_id?: string; + notify_time?: string; + sign_type?: string; + sign?: string; + invalid_time?: string; + sign_scene?: string; + sign_time?: string; + alipay_user_id?: string; + status?: string; + forex_eligible?: string; + external_logon_id?: string; + app_id?: string; + auth_app_id?: string; + external_agreement_no?: string; + personal_product_code?: string; + valid_time?: string; + agreement_no?: string; + zm_open_id?: string; + alipay_open_id?: string; + merchant_app_id?: string; + alipay_logon_id?: string; + notify_type?: string; + zm_score?: string; + single_quota?: string; + login_token?: string; + device_id?: string; + credit_auth_mode?: string; + specified_sort_assets?: string; + partner_id?: string; + modify_type?: string; + next_deduct_time?: string; + }, options?: API.RequestConfig ) { + const formData = new FormData(); + + 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<boolean>('/api/user/enterpriseWallet/alipayUserAgreementPageSignNotify', { + method: 'POST', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鍏抽棴浼佷笟閽卞寘 POST /api/user/enterpriseWallet/closeEnterpriseWallet */ +export async function closeEnterpriseWallet( + body: API.CloseEnterpriseWalletCommand, + options?: API.RequestConfig +) { + return request<string>('/api/user/enterpriseWallet/closeEnterpriseWallet', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -46,3 +197,83 @@ ...(options || {}), }); } + +/** 鏌ヨ鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠跺崟璇︽儏 GET /api/user/enterpriseWallet/getAlipayFundExpandindirectOrder */ +export async function getAlipayFundExpandindirectOrder( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetAlipayFundExpandindirectOrderParams, + options?: API.RequestConfig +) { + return request<API.GetAlipayFundExpandindirectOrderQueryResult>( + '/api/user/enterpriseWallet/getAlipayFundExpandindirectOrder', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏀粯瀹濋�氱煡鍥炰紶 GET /api/user/enterpriseWallet/getAlipayNotify */ +export async function getAlipayNotify( + body: API.GetAlipayNotifyCommand, + options?: API.RequestConfig +) { + const formData = new FormData(); + + 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<boolean>('/api/user/enterpriseWallet/getAlipayNotify', { + method: 'GET', + data: formData, + requestType: 'form', + ...(options || {}), + }); +} + +/** 鏌ヨ浼佷笟閽卞寘璇︽儏 GET /api/user/enterpriseWallet/getEnterpriseWallet */ +export async function getEnterpriseWallet( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWalletParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWalletQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWallet', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 寮�閫氫紒涓氶挶鍖� POST /api/user/enterpriseWallet/openEnterpriseWallet */ +export async function openEnterpriseWallet( + body: API.OpenEnterpriseWalletCommand, + options?: API.RequestConfig +) { + return request<API.OpenEnterpriseWalletCommandResult>( + '/api/user/enterpriseWallet/openEnterpriseWallet', + { + 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 bd3d555..96f40fc 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/index.ts @@ -10,8 +10,8 @@ import * as resource from './resource'; import * as task from './task'; import * as dictionary from './dictionary'; -import * as electronSign from './electronSign'; import * as enterpriseWallet from './enterpriseWallet'; +import * as electronSign from './electronSign'; import * as userResume from './userResume'; import * as auth from './auth'; import * as taskCheckReceive from './taskCheckReceive'; @@ -28,8 +28,8 @@ resource, task, dictionary, - electronSign, enterpriseWallet, + electronSign, userResume, auth, taskCheckReceive, diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index 13ceaa8..e30cb0c 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -29,6 +29,8 @@ /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ sceneQualificationImage?: string; sitesInfo?: AlipayFundExpandindirectCreateCommandSites; + /** Id */ + id?: string; } interface AlipayFundExpandindirectCreateCommandSites { @@ -39,59 +41,21 @@ xchengxU_ZHI?: string; } - interface AlipayFundExpandindirectCreateNotifyCommand { - /** 閫氱煡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; + interface AlipayFundExpandindirectOrderCancelCommand { + /** 浠h繘浠跺崟Id */ + id?: string; } - interface AlipayUserAgreementPageSignNotifyQuery { - /** 鍗忚浜у搧鐮侊紝鍟嗘埛鍜屾敮浠樺疂绛剧害鏃剁‘瀹氾紝涓嶅悓涓氬姟鍦烘櫙瀵瑰簲涓嶅悓鐨勭绾︿骇鍝佺爜銆� */ - personal_product_code?: string; - /** 褰撳墠绛剧害鐨勫崗璁満鏅�� */ - sign_scene?: string; - /** NORMAL 鍗忚褰撳墠鐘舵�� 1. TEMP锛氭殏瀛橈紝鍗忚鏈敓鏁堣繃锛� 2. NORMAL锛氭甯革紱 3. STOP锛氭殏鍋� */ - status?: string; - /** 鐢ㄦ埛绛剧害鐨勬敮浠樺疂璐﹀彿瀵瑰簲鐨勬敮浠樺疂鍞竴鐢ㄦ埛鍙枫�� 浠�2088寮�澶寸殑16浣嶇函鏁板瓧缁勬垚銆� */ - alipay_user_id?: string; - /** 鏀粯瀹濈郴缁熶腑鐢ㄤ互鍞竴鏍囪瘑鐢ㄦ埛绛剧害璁板綍鐨勭紪鍙枫�� */ - agreement_no?: string; - /** 鏀粯瀹濅唬鎵e崗璁殑瀹為檯绛剧害鏃堕棿锛屾牸寮忎负yyyy-MM-dd HH:mm:ss銆� */ - sign_time?: string; - /** 鐢ㄦ埛鍦ㄥ晢鎴风綉绔欑殑鐧诲綍璐﹀彿锛屽鏋滃晢鎴锋帴鍙d腑鏈紶锛屽垯涓嶄細杩斿洖 */ - external_logon_id?: string; - /** 鏀粯瀹濆垎閰嶇粰寮�鍙戣�呯殑搴旂敤Id */ - app_id?: string; - /** 鏀粯瀹濆垎閰嶇粰鍟嗘埛鐨勫簲鐢↖d */ - auth_app_id?: string; - /** 浠f墸鍗忚涓爣绀虹敤鎴风殑鍞竴绛剧害鍙凤紙纭繚鍦ㄥ晢鎴风郴缁熶腑鍞竴锛夈�� */ - external_agreement_no?: string; - /** 鐢ㄦ埛浠f墸鍗忚鐨勫疄闄呯敓鏁堟椂闂达紝鏍煎紡涓簓yyy-MM-dd HH:mm:ss銆� */ - valid_time?: string; - /** 杩斿洖鑴辨晱鐨勬敮浠樺疂璐﹀彿銆� */ - alipay_logon_id?: string; - /** 鐢ㄦ埛绛剧害鎴愬姛閫氱煡绫诲瀷 */ - notify_type?: string; - } + type AlipayTransferCommand = Record<string, any>; interface APIcheckHealthParams { /** 鍋ュ悍鏍¢獙 */ request?: CheckHealthQuery; + } + + interface APIgetAlipayFundExpandindirectOrderParams { + /** 浠h繘浠跺崟Id */ + id?: string; } interface APIgetAliyunOSSAcsParams { @@ -187,6 +151,11 @@ interface APIgetEnterpriseSmsSettingParams { /** Id */ id?: string; + } + + interface APIgetEnterpriseWalletParams { + /** 閫氶亾 */ + access?: EnumEnterpriseWalletAccess; } interface APIgetFileUrlParams { @@ -401,6 +370,10 @@ type ClearTaskCollectCommand = Record<string, any>; + interface CloseEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + } + interface CollectTaskCommand { /** 浠诲姟Id */ ids?: string[]; @@ -568,6 +541,20 @@ Identity3 = 10, /**浼佷笟鍥涜绱� */ Identity4 = 20, + } + + enum EnumEnterpriseWalletAccess { + /**鏀粯瀹� */ + Alipay = 10, + } + + enum EnumEnterpriseWalletSignStatus { + /**鐢宠涓� */ + Apply = 10, + /**宸茬绾� */ + Normal = 100, + /**缁堟 */ + Stop = 999, } enum EnumMenuType { @@ -890,6 +877,24 @@ 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; @@ -1186,6 +1191,24 @@ /** 閿欒鐮� */ errorCode?: string; data?: GetEnterpriseSmsSettingQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseWalletQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWalletQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -2001,6 +2024,24 @@ timestamp?: number; } + interface FriendlyResultOpenEnterpriseWalletCommandResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: OpenEnterpriseWalletCommandResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultPagedListQueryResultGetDictionaryCategoriesQueryResultItem { /** 璺熻釜Id */ traceId?: string; @@ -2145,6 +2186,52 @@ /** 鏃堕棿鎴� */ 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>; type GetAliyunOSSAcsQuery = Record<string, any>; @@ -2919,6 +3006,23 @@ isConfigured?: boolean; } + interface GetEnterpriseWalletQueryResult { + /** 閽卞寘Id */ + id?: string; + access?: EnumEnterpriseWalletAccess; + /** 鍗忚鍙� */ + code?: string; + /** 閫氶亾鍗忚鍙� */ + agreementNo?: string; + /** 鍗忚绛剧害鏃堕棿 */ + signTime?: string; + /** 鍗忚鐢熸晥鏃堕棿 */ + validTime?: string; + /** 鍗忚澶辨晥鏃堕棿 */ + invalidTime?: string; + signStatus?: EnumEnterpriseWalletSignStatus; + } + interface GetExceptionLogsQuery { /** 璺熻釜Id */ traceId?: string; @@ -3319,6 +3423,8 @@ } interface GetPersonalUserElectronSignQueryResult { + /** 鐏靛伐Id */ + id?: string; /** 鍚堝悓缂栧彿 */ contractCode?: string; contractTemplateAccess?: EnumElectronSignAccess; @@ -4241,6 +4347,15 @@ isBindPhoneNumber?: boolean; } + interface OpenEnterpriseWalletCommand { + access?: EnumEnterpriseWalletAccess; + } + + interface OpenEnterpriseWalletCommandResult { + /** 绛剧害鍦板潃 */ + signUrl?: string; + } + interface PagedListQueryPageModel { /** 琛屾暟 */ rows?: number; -- Gitblit v1.9.1