From 60b9c62a3165f304a933cbac304ac3d43a24f722 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 17 四月 2025 09:25:09 +0800 Subject: [PATCH] fix: 优化 --- packages/core/src/lifeRechargeServices.ts | 418 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 396 insertions(+), 22 deletions(-) diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts index 865a7e2..b66a533 100644 --- a/packages/core/src/lifeRechargeServices.ts +++ b/packages/core/src/lifeRechargeServices.ts @@ -1,15 +1,36 @@ import { BlLifeRechargeServicesOptions } from './types'; import { LifeRechargeConstants } from './lifeRechargeConstants'; import { Request, IRequest } from 'senior-request'; +import { BlLifeRecharge } from './lifeRecharge'; export interface RequestConfig {} export class BlLifeRechargeServices<TResponse = any, TRequestOptions = any> { private request: IRequest; - constructor({ axiosConfig }: BlLifeRechargeServicesOptions<TResponse, TRequestOptions>) { + ctx: BlLifeRecharge<TResponse, TRequestOptions>; + + constructor( + ctx: BlLifeRecharge<TResponse, TRequestOptions>, + { axiosConfig }: BlLifeRechargeServicesOptions<TResponse, TRequestOptions> + ) { + this.ctx = ctx; this.request = Request.create({ ...axiosConfig, // baseURL: process.env.NODE_ENV === 'development' ? '/' : 'https://api.81812333.com', + requestInterceptors: [ + [ + (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, headers: { Accept: 'application/json, text/plain, */*', @@ -21,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 */ @@ -40,25 +64,37 @@ } /** 鑾峰彇鐢佃垂鍏呭�煎尯鍩� GET /api/LifePay/GetElectricSupportArea */ - async getElectricSupportArea(options?: RequestConfig) { + async getElectricSupportArea(body: ChannelsBaseInput, options?: RequestConfig) { return this.request<ElectricSupportAreaResponse>('/api/LifePay/GetElectricSupportArea', { - method: 'GET', + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, ...(options || {}), }); } - /** 鑾峰彇鐢佃垂闈㈠�� GET /api/LifePay/GetElectricParValue */ - async getElectricParValue(options?: RequestConfig) { + /** 鑾峰彇鐢佃垂闈㈠�� POST /api/LifePay/GetElectricParValue */ + async getElectricParValue(body: ChannelsBaseInput, options?: RequestConfig) { return this.request<ElectricParValueResponse>('/api/LifePay/GetElectricParValue', { - method: 'GET', + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, ...(options || {}), }); } /** 鑾峰彇璇濊垂闈㈠�� GET /api/LifePay/GetPhoneParValue */ - async getPhoneParValue(options?: RequestConfig) { + async getPhoneParValue(body: ChannelsBaseInput, options?: RequestConfig) { return this.request<PhoneParValueResponse>('/api/LifePay/GetPhoneParValue', { - method: 'GET', + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, ...(options || {}), }); } @@ -94,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 || {}), } ); @@ -169,6 +206,18 @@ }); } + /** 鑾峰彇鎴戠殑鎴峰彿鍒楄〃 POST /api/LifePay/GetUserAccountList */ + async getUserAccountList(body: QueryUserAccountListInput, options?: RequestConfig) { + return this.request<UserAccountListOutputPageOutput>('/api/LifePay/GetUserAccountList', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); + } + /** 娣诲姞鎴栦慨鏀规垜鐨勬埛鍙� POST /api/LifePay/AddUpdateUserAccount */ async addUpdateUserAccount(body: AddUpdateUserAccountInput, options?: RequestConfig) { return this.request<number>('/api/LifePay/AddUpdateUserAccount', { @@ -194,9 +243,155 @@ } /** 鑾峰彇鐕冩皵闈㈠�� GET /api/LifePay/GetGasParValue */ - async getGasParValue(options?: RequestConfig) { + async getGasParValue(body: ChannelsBaseInput, options?: RequestConfig) { return this.request<GasParValueResponse>('/api/LifePay/GetGasParValue', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); + } + + /** 鐢ㄦ埛鍙戣捣鐢熸椿缂磋垂閫�娆� POST /api/LifePay/RefundUserLifePayOrder */ + async refundUserLifePayOrder(body: RefundUserLifePayOrderInput, options?: RequestConfig) { + return this.request<number>('/api/LifePay/RefundUserLifePayOrder', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); + } + + /** 鍒犻櫎鎴戠殑鎴峰彿 POST /api/LifePay/DeleteUserAccount */ + async deleteUserAccount( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: APIdeleteUserAccountParams, + options?: RequestConfig + ) { + return this.request<number>('/api/LifePay/DeleteUserAccount', { + method: 'POST', + params: { + ...params, + }, + ...(options || {}), + }); + } + + /** 鑾峰彇鎴戠殑鎴峰彿璇︽儏 GET /api/LifePay/GetUserAccountDetail */ + async getUserAccountDetail( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: APIgetUserAccountDetailParams, + options?: RequestConfig + ) { + return this.request<UserAccountOutput>('/api/LifePay/GetUserAccountDetail', { method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); + } + + /** 鑾峰彇鎴戠殑璁㈠崟璇︽儏 GET /api/LifePay/GetUserLifePayOrderDetail */ + async getUserLifePayOrderDetail( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: APIgetUserLifePayOrderDetailParams, + options?: RequestConfig + ) { + return this.request<UserLifePayOrderOutput>('/api/LifePay/GetUserLifePayOrderDetail', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); + } + + /** 鎼滅储绠$悊--鍒楄〃(鍖哄煙绠$悊) GET /api/Area/GetRegionalManagementList */ + async getRegionalManagementList(options?: RequestConfig) { + return this.request<AreaInfo[]>('/api/Area/GetRegionalManagementList', { + method: 'GET', + ...(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(body: QueryLifePayChannlesInput, options?: RequestConfig) { + return this.request<CreateEditPayChannelsInput[]>('/api/LifePay/GetLifePayChannlesAllList', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(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 || {}), }); } @@ -263,6 +458,8 @@ export interface LifePhoneDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifePhoneData; } @@ -283,6 +480,8 @@ export interface LifeElectricDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifeElectricData; } @@ -372,6 +571,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 { @@ -484,6 +694,8 @@ export interface LifeGasDataCreateLifePayOrderInput { userId?: string; + /** 娓犻亾Id */ + channelId?: string; productData?: LifeGasData; } @@ -512,7 +724,7 @@ code?: string; message?: string; detail?: string; - gasParValue?: GasParValueOutput; + gasParValue?: GasParValueOutput[]; } export interface GasParValueOutput { @@ -522,3 +734,165 @@ rate?: number; comments?: string; } + +export interface RefundUserLifePayOrderInput { + id?: string; + /** 鐢ㄦ埛Id */ + userId?: string; + refundApplyRemark?: string; +} + +export interface QueryUserAccountListInput { + pageModel?: Pagination; + /** 鐢ㄦ埛Id */ + userId?: string; + lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum; +} + +export interface UserAccountListOutputPageOutput { + pageModel?: Pagination; + objectData?: any; + data?: UserAccountListOutput[]; +} + +export interface APIdeleteUserAccountParams { + id?: string; +} + +export interface APIgetUserAccountDetailParams { + id?: string; +} + +export interface UserAccountOutput { + id?: string; + lifePayType?: LifeRechargeConstants.LifePayOrderTypeEnum; + /** 杩愯惀鍟� */ + operators?: string; + /** 鎵嬫満鍙�/鎴峰彿 */ + content?: string; + /** 鐪� */ + province?: string; + /** 甯� */ + city?: string; + /** 鎷撳睍瀛楁锛堢數璐圭被鍨嬶級 */ + extraProperties?: string; + /** 澶囨敞 */ + remark?: string; + /** 鍒涘缓鏃堕棿 */ + creationTime?: string; + isDeleted?: boolean; +} + +export interface APIgetUserLifePayOrderDetailParams { + orderNo?: string; +} + +export interface ChannelsBaseInput { + checkChannelId?: string; +} + +export interface AreaInfo { + areaCode?: number; + parentId?: number; + areaName?: string; + /** 1鐪� 2甯� 3鍖� 4闀� */ + layer?: number; + sort?: number; + children?: AreaInfo[]; + /** 绠�鏄撴嫾闊� */ + simpleSpelling?: string; + /** 蹇�熸绱� */ + 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; +} + +export interface QueryLifePayChannlesInput { + status?: LifeRechargeConstants.LifePayChannelsStatsEnum; +} -- Gitblit v1.9.1