From 074b4c463c4be9bf5df11fa08779a523fdb983b1 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 01 四月 2025 17:11:01 +0800 Subject: [PATCH] fix: 四期需求 --- packages/core/src/lifeRechargeServices.ts | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 200 insertions(+), 19 deletions(-) diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts index ef65c43..a7e60aa 100644 --- a/packages/core/src/lifeRechargeServices.ts +++ b/packages/core/src/lifeRechargeServices.ts @@ -18,12 +18,17 @@ ...axiosConfig, // baseURL: process.env.NODE_ENV === 'development' ? '/' : 'https://api.81812333.com', requestInterceptors: [ - // [ - // (config) => { - // console.log('config2: ', config); - // return config; - // }, - // ], + [ + (config) => { + if (config.params) { + config.params.checkChannelId = this.ctx.accountModel.channlesNum; + } + if (config.data) { + config.data.checkChannelId = this.ctx.accountModel.channlesNum; + } + return config; + }, + ], ...axiosConfig.requestInterceptors, ], timeout: 10 * 1000, @@ -37,14 +42,17 @@ } async lifePayPhoneMesssageCodeLogin(body: PhoneMesssageCodeLoginInput, options?: RequestConfig) { - return this.request<string>('/api/Account/LifePayPhoneMesssageCodeLogin', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - data: body, - ...(options || {}), - }); + return this.request<LifePayPhoneMesssageCodeLoginOutput>( + '/api/Account/LifePayPhoneMesssageCodeLogin', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + } + ); } /** 鑾峰彇鎶樻墸 GET /api/LifePay/GetRate */ @@ -122,14 +130,15 @@ } /** 鏍规嵁璁㈠崟鍙疯幏鍙栨敮浠樼姸鎬� GET /api/LifePay/GetPayStatusByOrderNo */ - async getPayStatusByOrderNo(params: APIgetPayStatusByOrderNoParams, options?: RequestConfig) { + async getPayStatusByOrderNo(body: GetPayStatusByOrderNoInput, options?: RequestConfig) { return this.request<LifeRechargeConstants.LifePayStatusEnum>( '/api/LifePay/GetPayStatusByOrderNo', { - method: 'GET', - params: { - ...params, + method: 'POST', + headers: { + 'Content-Type': 'application/json', }, + data: body, ...(options || {}), } ); @@ -309,6 +318,79 @@ ...(options || {}), }); } + + /** 鑾峰彇椤荤煡 GET /api/LifePay/GetIntroInfo */ + async getIntroInfo(params: APIgetIntroInfoParams, options?: RequestConfig) { + return this.request<LifePayIntroInfoOutput[]>('/api/LifePay/GetIntroInfo', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); + } + + /** 鑾峰彇娓犻亾鎶樻墸 GET /api/LifePay/GetChannelRate */ + async getChannelRate(body: ChannelsBaseInput, options?: RequestConfig) { + return this.request<ChannelRateOutput>('/api/LifePay/GetChannelRate', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); + } + + /** 鑾峰彇鍦ㄧ嚎瀹㈡湇 GET /api/LifePay/GetOnlineService */ + async getOnlineService(options?: RequestConfig) { + return this.request<string>('/api/LifePay/GetOnlineService', { + method: 'GET', + ...(options || {}), + }); + } + + /** 鑾峰彇鍏ㄩ儴缂磋垂娓犻亾 GET /api/LifePay/GetLifePayChannlesAllList */ + async getLifePayChannlesAllList(options?: RequestConfig) { + return this.request<CreateEditPayChannelsInput[]>('/api/LifePay/GetLifePayChannlesAllList', { + method: 'GET', + ...(options || {}), + }); + } + + /** 鏍规嵁鐢ㄦ埛ID鑾峰彇鐢ㄦ埛鏄惁涓哄悗鍙扮鐞嗗憳 POST /api/Account/LifePayUserMesssageByIduser */ + async lifePayUserMesssageByIduser( + body: LifePayUserMesssageByIduserInput, + options?: RequestConfig + ) { + return this.request<LifePayPhoneMesssageCodeLoginOutput>( + '/api/Account/LifePayUserMesssageByIduser', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + } + ); + } + + /** 鑾峰彇椤堕儴缁熻鏁版嵁 GET /api/LifePay/GetTopStatistics */ + async getTopStatistics( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + body: TopStatisticsInput, + options?: RequestConfig + ) { + return this.request<TopStatisticsOutput>('/api/LifePay/GetTopStatistics', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); + } } export interface PhoneMesssageCodeLoginInput { @@ -372,6 +454,8 @@ export interface LifePhoneDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifePhoneData; } @@ -392,6 +476,8 @@ export interface LifeElectricDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifeElectricData; } @@ -481,12 +567,17 @@ creationTime?: string; /** 閫�娆炬椂闂� */ refundTime?: string; + /** 閫�娆剧敵璇锋椂闂� */ + refundApplyTime?: string; /** 閫�娆惧嚟璇� */ refundCredentialsImgUrl?: string; refundApplyRemark?: string; refundCheckRemark?: string; /** 娓犻亾娴佹按鍙� */ acoolyOrderNo?: string; + frontStatus?: LifeRechargeConstants.LifePayOrderFrontStatusEnum; + lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum; + acoolyStatus?: LifeRechargeConstants.ACOOLYStatusEnum; } export interface ElectricSupportAreaResponse { @@ -599,6 +690,8 @@ export interface LifeGasDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifeGasData; } @@ -691,7 +784,7 @@ } export interface ChannelsBaseInput { - channelId?: string; + checkChannelId?: string; } export interface AreaInfo { @@ -707,3 +800,91 @@ /** 蹇�熸绱� */ quickQuery?: string; } + +export interface GetPayStatusByOrderNoInput { + checkChannelId?: string; + orderNo?: string; +} + +export interface APIgetIntroInfoParams { + type?: LifeRechargeConstants.LifePayOrderTypeEnum; +} + +export interface LifePayIntroInfoOutput { + type?: IntroInfoTypeEnum; + lifePayType?: LifeRechargeConstants.LifePayOrderTypeEnum; + /** 鎽樿 */ + contentSummary?: string; + /** 鏂囨湰鍐呭 */ + content?: string; + /** 鍥剧墖/瑙嗛璺緞 */ + path?: string; + /** 鎺掑簭 */ + sequence?: number; +} + +export type IntroInfoTypeEnum = 0 | 1 | 2 | 3 | 4; + +export interface ChannelRateOutput { + channlesRate?: number; +} + +export interface CreateEditPayChannelsInput { + id?: string; + channlesName?: string; + channlesNum?: string; + channlesRate?: number; + channlesRakeRate?: number; +} + +export interface LifePayPhoneMesssageCodeLoginOutput { + /** 鐢ㄦ埛Id */ + userId?: string; + /** 鏄惁鏄悗鍙扮敤鎴� */ + isBackClientUser?: boolean; + /** 娓犻亾鍙� */ + channlesNum?: ChannelOutput[]; +} + +export interface ChannelOutput { + name?: string; + channlesNum?: string; + channlesId?: string; + switchType?: LifeRechargeConstants.LifePaySwitchTypeEnum; +} + +export interface LifePayUserMesssageByIduserInput { + pageModel?: Pagination; + checkChannelId?: string; + /** 鐢ㄦ埛缂栧彿 */ + id?: string; +} + +export interface TopStatisticsInput { + channleList?: string[]; +} + +export interface TopStatisticsOutput { + /** 鍒涘缓鏃堕棿 */ + creationTime?: string; + /** 璐︽埛浣欓 */ + amount?: number; + /** 绱鏀舵 */ + accumulatedReceipts?: number; + /** 鏄ㄦ棩鏀舵 */ + receiptsYesterday?: number; + /** 绱鏀跺叆 */ + accumulatedIncome?: number; + /** 绱涓嬪崟 */ + accumulatedOrders?: number; + /** 鏄ㄦ棩涓嬪崟 */ + ordersNumYesterday?: number; + /** 鏄ㄦ棩鎴愬姛 */ + yesterdaySuccess?: number; + /** 鏄ㄦ棩澶辫触 */ + yesterdayFail?: number; + /** 绱鐢ㄦ埛 */ + accumulatedUsers?: number; + /** 鏄ㄦ棩娲昏穬鐢ㄦ埛 */ + yesterdayActiveUsers?: number; +} -- Gitblit v1.9.1