diff --git a/Web/src/api-services/apis/sys-wechat-pay-api.ts b/Web/src/api-services/apis/sys-wechat-pay-api.ts index 2bb91d93..36620a41 100644 --- a/Web/src/api-services/apis/sys-wechat-pay-api.ts +++ b/Web/src/api-services/apis/sys-wechat-pay-api.ts @@ -17,9 +17,14 @@ import { Configuration } from '../configuration'; // Some imports not used depending on template conditions // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base'; +import { AdminResultCreatePayTransactionOutput } from '../models'; +import { AdminResultGetRefundDomesticRefundByOutRefundNumberResponse } from '../models'; import { AdminResultObject } from '../models'; +import { AdminResultSqlSugarPagedListSysWechatPay } from '../models'; import { AdminResultSysWechatPay } from '../models'; import { AdminResultWechatPayOutput } from '../models'; +import { PageSysWechatPayInput } from '../models'; +import { RefundRequestInput } from '../models'; import { WechatPayParaInput } from '../models'; import { WechatPayTransactionInput } from '../models'; /** @@ -76,6 +81,54 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config options: localVarRequestOptions, }; }, + /** + * + * @summary 获取支付记录列表(分页) + * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + apiSysWechatPayPagePost: async (body?: PageSysWechatPayInput, options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/api/sysWechatPay/page`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, 'https://example.com'); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication Bearer required + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? await configuration.accessToken() + : await configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + + localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + + const query = new URLSearchParams(localVarUrlObj.search); + for (const key in localVarQueryParameter) { + query.set(key, localVarQueryParameter[key]); + } + for (const key in options.params) { + query.set(key, options.params[key]); + } + localVarUrlObj.search = (new URLSearchParams(query)).toString(); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json'; + localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); + + return { + url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, + options: localVarRequestOptions, + }; + }, /** * * @summary 微信支付成功回调(商户直连) 🔖 @@ -259,6 +312,104 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config options: localVarRequestOptions, }; }, + /** + * + * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id} + * @param {string} transactionId + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + apiSysWechatPayPayTransactionByIdTransactionIdGet: async (transactionId: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'transactionId' is not null or undefined + if (transactionId === null || transactionId === undefined) { + throw new RequiredError('transactionId','Required parameter transactionId was null or undefined when calling apiSysWechatPayPayTransactionByIdTransactionIdGet.'); + } + const localVarPath = `/api/sysWechatPay/payTransactionById/{transactionId}` + .replace(`{${"transactionId"}}`, encodeURIComponent(String(transactionId))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, 'https://example.com'); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication Bearer required + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? await configuration.accessToken() + : await configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + + const query = new URLSearchParams(localVarUrlObj.search); + for (const key in localVarQueryParameter) { + query.set(key, localVarQueryParameter[key]); + } + for (const key in options.params) { + query.set(key, options.params[key]); + } + localVarUrlObj.search = (new URLSearchParams(query)).toString(); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, + options: localVarRequestOptions, + }; + }, + /** + * + * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no} + * @param {string} outTradeNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet: async (outTradeNumber: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'outTradeNumber' is not null or undefined + if (outTradeNumber === null || outTradeNumber === undefined) { + throw new RequiredError('outTradeNumber','Required parameter outTradeNumber was null or undefined when calling apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet.'); + } + const localVarPath = `/api/sysWechatPay/payTransactionByOutTradeNumber/{outTradeNumber}` + .replace(`{${"outTradeNumber"}}`, encodeURIComponent(String(outTradeNumber))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, 'https://example.com'); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication Bearer required + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? await configuration.accessToken() + : await configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + + const query = new URLSearchParams(localVarUrlObj.search); + for (const key in localVarQueryParameter) { + query.set(key, localVarQueryParameter[key]); + } + for (const key in options.params) { + query.set(key, options.params[key]); + } + localVarUrlObj.search = (new URLSearchParams(query)).toString(); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, + options: localVarRequestOptions, + }; + }, /** * * @summary 微信支付统一下单获取Id(商户直连) 🔖 @@ -302,6 +453,103 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json'; localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); + return { + url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, + options: localVarRequestOptions, + }; + }, + /** + * + * @summary 查询单笔退款(通过商户退款单号) https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html + * @param {string} outRefundNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet: async (outRefundNumber: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'outRefundNumber' is not null or undefined + if (outRefundNumber === null || outRefundNumber === undefined) { + throw new RequiredError('outRefundNumber','Required parameter outRefundNumber was null or undefined when calling apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet.'); + } + const localVarPath = `/api/sysWechatPay/refundByOutRefundNumber/{outRefundNumber}` + .replace(`{${"outRefundNumber"}}`, encodeURIComponent(String(outRefundNumber))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, 'https://example.com'); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication Bearer required + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? await configuration.accessToken() + : await configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + + const query = new URLSearchParams(localVarUrlObj.search); + for (const key in localVarQueryParameter) { + query.set(key, localVarQueryParameter[key]); + } + for (const key in options.params) { + query.set(key, options.params[key]); + } + localVarUrlObj.search = (new URLSearchParams(query)).toString(); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, + options: localVarRequestOptions, + }; + }, + /** + * + * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html + * @param {RefundRequestInput} [body] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + apiSysWechatPayRefundPost: async (body?: RefundRequestInput, options: AxiosRequestConfig = {}): Promise => { + const localVarPath = `/api/sysWechatPay/refund`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, 'https://example.com'); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication Bearer required + // http bearer authentication required + if (configuration && configuration.accessToken) { + const accessToken = typeof configuration.accessToken === 'function' + ? await configuration.accessToken() + : await configuration.accessToken; + localVarHeaderParameter["Authorization"] = "Bearer " + accessToken; + } + + localVarHeaderParameter['Content-Type'] = 'application/json-patch+json'; + + const query = new URLSearchParams(localVarUrlObj.search); + for (const key in localVarQueryParameter) { + query.set(key, localVarQueryParameter[key]); + } + for (const key in options.params) { + query.set(key, options.params[key]); + } + localVarUrlObj.search = (new URLSearchParams(query)).toString(); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json'; + localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); + return { url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, options: localVarRequestOptions, @@ -330,6 +578,20 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) { return axios.request(axiosRequestArgs); }; }, + /** + * + * @summary 获取支付记录列表(分页) + * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPagePost(body, options); + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return axios.request(axiosRequestArgs); + }; + }, /** * * @summary 微信支付成功回调(商户直连) 🔖 @@ -377,13 +639,41 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, + /** + * + * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id} + * @param {string} transactionId + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options); + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return axios.request(axiosRequestArgs); + }; + }, + /** + * + * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no} + * @param {string} outTradeNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options); + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return axios.request(axiosRequestArgs); + }; + }, /** * * @summary 微信支付统一下单获取Id(商户直连) 🔖 @@ -391,13 +681,41 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionPost(body, options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); }; }, + /** + * + * @summary 查询单笔退款(通过商户退款单号) https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html + * @param {string} outRefundNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options); + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return axios.request(axiosRequestArgs); + }; + }, + /** + * + * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html + * @param {RefundRequestInput} [body] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayRefundPost(body, options); + return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { + const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; + return axios.request(axiosRequestArgs); + }; + }, } }; @@ -417,6 +735,16 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise> { return SysWechatPayApiFp(configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(axios, basePath)); }, + /** + * + * @summary 获取支付记录列表(分页) + * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig): Promise> { + return SysWechatPayApiFp(configuration).apiSysWechatPayPagePost(body, options).then((request) => request(axios, basePath)); + }, /** * * @summary 微信支付成功回调(商户直连) 🔖 @@ -452,9 +780,29 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> { + async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> { return SysWechatPayApiFp(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(axios, basePath)); }, + /** + * + * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id} + * @param {string} transactionId + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig): Promise> { + return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options).then((request) => request(axios, basePath)); + }, + /** + * + * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no} + * @param {string} outTradeNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig): Promise> { + return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options).then((request) => request(axios, basePath)); + }, /** * * @summary 微信支付统一下单获取Id(商户直连) 🔖 @@ -462,9 +810,29 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> { + async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> { return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(axios, basePath)); }, + /** + * + * @summary 查询单笔退款(通过商户退款单号) https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html + * @param {string} outRefundNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig): Promise> { + return SysWechatPayApiFp(configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options).then((request) => request(axios, basePath)); + }, + /** + * + * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html + * @param {RefundRequestInput} [body] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig): Promise> { + return SysWechatPayApiFp(configuration).apiSysWechatPayRefundPost(body, options).then((request) => request(axios, basePath)); + }, }; }; @@ -486,6 +854,17 @@ export class SysWechatPayApi extends BaseAPI { public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise> { return SysWechatPayApiFp(this.configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @summary 获取支付记录列表(分页) + * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof SysWechatPayApi + */ + public async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig) : Promise> { + return SysWechatPayApiFp(this.configuration).apiSysWechatPayPagePost(body, options).then((request) => request(this.axios, this.basePath)); + } /** * * @summary 微信支付成功回调(商户直连) 🔖 @@ -525,9 +904,31 @@ export class SysWechatPayApi extends BaseAPI { * @throws {RequiredError} * @memberof SysWechatPayApi */ - public async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> { + public async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> { return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id} + * @param {string} transactionId + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof SysWechatPayApi + */ + public async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig) : Promise> { + return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options).then((request) => request(this.axios, this.basePath)); + } + /** + * + * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no} + * @param {string} outTradeNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof SysWechatPayApi + */ + public async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig) : Promise> { + return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options).then((request) => request(this.axios, this.basePath)); + } /** * * @summary 微信支付统一下单获取Id(商户直连) 🔖 @@ -536,7 +937,29 @@ export class SysWechatPayApi extends BaseAPI { * @throws {RequiredError} * @memberof SysWechatPayApi */ - public async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> { + public async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> { return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @summary 查询单笔退款(通过商户退款单号) https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html + * @param {string} outRefundNumber + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof SysWechatPayApi + */ + public async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig) : Promise> { + return SysWechatPayApiFp(this.configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options).then((request) => request(this.axios, this.basePath)); + } + /** + * + * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html + * @param {RefundRequestInput} [body] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof SysWechatPayApi + */ + public async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig) : Promise> { + return SysWechatPayApiFp(this.configuration).apiSysWechatPayRefundPost(body, options).then((request) => request(this.axios, this.basePath)); + } } diff --git a/Web/src/api-services/models/add-code-gen-input.ts b/Web/src/api-services/models/add-code-gen-input.ts index e9d0db3d..a79ea25f 100644 --- a/Web/src/api-services/models/add-code-gen-input.ts +++ b/Web/src/api-services/models/add-code-gen-input.ts @@ -203,4 +203,12 @@ export interface AddCodeGenInput { * @memberof AddCodeGenInput */ generateMenu: boolean; + + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof AddCodeGenInput + */ + isApiService?: boolean; } diff --git a/Web/src/api-services/models/add-open-access-input.ts b/Web/src/api-services/models/add-open-access-input.ts index a8b2345a..166ab4cd 100644 --- a/Web/src/api-services/models/add-open-access-input.ts +++ b/Web/src/api-services/models/add-open-access-input.ts @@ -12,6 +12,7 @@ * Do not edit the class manually. */ +import { SysUser } from './sys-user'; /** * * @@ -92,6 +93,12 @@ export interface AddOpenAccessInput { */ bindTenantId?: number; + /** + * @type {SysUser} + * @memberof AddOpenAccessInput + */ + bindUser?: SysUser; + /** * 身份标识 * diff --git a/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts b/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts new file mode 100644 index 00000000..50f92dcd --- /dev/null +++ b/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { CreatePayTransactionOutput } from './create-pay-transaction-output'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultCreatePayTransactionOutput + */ +export interface AdminResultCreatePayTransactionOutput { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultCreatePayTransactionOutput + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + message?: string | null; + + /** + * @type {CreatePayTransactionOutput} + * @memberof AdminResultCreatePayTransactionOutput + */ + result?: CreatePayTransactionOutput; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultCreatePayTransactionOutput + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultCreatePayTransactionOutput + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..51706d2a --- /dev/null +++ b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GetRefundDomesticRefundByOutRefundNumberResponse } from './get-refund-domestic-refund-by-out-refund-number-response'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {GetRefundDomesticRefundByOutRefundNumberResponse} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + result?: GetRefundDomesticRefundByOutRefundNumberResponse; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts new file mode 100644 index 00000000..acbc3877 --- /dev/null +++ b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SqlSugarPagedListSysWechatPay } from './sql-sugar-paged-list-sys-wechat-pay'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultSqlSugarPagedListSysWechatPay + */ +export interface AdminResultSqlSugarPagedListSysWechatPay { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + message?: string | null; + + /** + * @type {SqlSugarPagedListSysWechatPay} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + result?: SqlSugarPagedListSysWechatPay; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + time?: Date; +} diff --git a/Web/src/api-services/models/amount.ts b/Web/src/api-services/models/amount.ts new file mode 100644 index 00000000..64ff0985 --- /dev/null +++ b/Web/src/api-services/models/amount.ts @@ -0,0 +1,83 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { From } from './from'; + /** + * + * + * @export + * @interface Amount + */ +export interface Amount { + + /** + * @type {number} + * @memberof Amount + */ + total?: number; + + /** + * @type {number} + * @memberof Amount + */ + refund?: number; + + /** + * @type {string} + * @memberof Amount + */ + currency?: string | null; + + /** + * @type {number} + * @memberof Amount + */ + payerTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + payerRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + discountRefund?: number; + + /** + * @type {Array} + * @memberof Amount + */ + from?: Array | null; + + /** + * @type {number} + * @memberof Amount + */ + refundFee?: number | null; +} diff --git a/Web/src/api-services/models/code-gen-input.ts b/Web/src/api-services/models/code-gen-input.ts index bdaf3756..d9cd1baf 100644 --- a/Web/src/api-services/models/code-gen-input.ts +++ b/Web/src/api-services/models/code-gen-input.ts @@ -203,4 +203,12 @@ export interface CodeGenInput { * @memberof CodeGenInput */ printName?: string | null; + + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof CodeGenInput + */ + isApiService?: boolean; } diff --git a/Web/src/api-services/models/create-pay-transaction-output.ts b/Web/src/api-services/models/create-pay-transaction-output.ts new file mode 100644 index 00000000..3d23b334 --- /dev/null +++ b/Web/src/api-services/models/create-pay-transaction-output.ts @@ -0,0 +1,34 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface CreatePayTransactionOutput + */ +export interface CreatePayTransactionOutput { + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + prepayId?: string | null; + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + outTradeNumber?: string | null; +} diff --git a/Web/src/api-services/models/db-type.ts b/Web/src/api-services/models/db-type.ts index 44de8445..c3867028 100644 --- a/Web/src/api-services/models/db-type.ts +++ b/Web/src/api-services/models/db-type.ts @@ -42,6 +42,8 @@ export enum DbType { NUMBER_21 = 21, NUMBER_22 = 22, NUMBER_23 = 23, + NUMBER_24 = 24, + NUMBER_25 = 25, NUMBER_900 = 900 } diff --git a/Web/src/api-services/models/from.ts b/Web/src/api-services/models/from.ts new file mode 100644 index 00000000..42f776c1 --- /dev/null +++ b/Web/src/api-services/models/from.ts @@ -0,0 +1,34 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface From + */ +export interface From { + + /** + * @type {number} + * @memberof From + */ + amount?: number; + + /** + * @type {string} + * @memberof From + */ + account?: string | null; +} diff --git a/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..d7484ac6 --- /dev/null +++ b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,114 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Amount } from './amount'; +import { Promotion } from './promotion'; + /** + * + * + * @export + * @interface GetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface GetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {{ [key: string]: any; }} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + detail?: { [key: string]: any; } | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + refundId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outRefundNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + transactionId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outTradeNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + channel?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + userReceivedAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + fundsAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + status?: string | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + successTime?: Date | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + createTime?: Date; + + /** + * @type {Amount} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + amount?: Amount; + + /** + * @type {Array} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + promotionDetail?: Array | null; +} diff --git a/Web/src/api-services/models/goods-detail.ts b/Web/src/api-services/models/goods-detail.ts new file mode 100644 index 00000000..93a561af --- /dev/null +++ b/Web/src/api-services/models/goods-detail.ts @@ -0,0 +1,58 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface GoodsDetail + */ +export interface GoodsDetail { + + /** + * @type {string} + * @memberof GoodsDetail + */ + merchantGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + wechatpayGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + goodsName?: string | null; + + /** + * @type {number} + * @memberof GoodsDetail + */ + unitPrice?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundAmount?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundQuantity?: number; +} diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index eb8039df..f323cc24 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -19,9 +19,11 @@ export * from './add-sys-ldap-input'; export * from './add-tenant-input'; export * from './add-user-input'; export * from './admin-result-boolean'; +export * from './admin-result-create-pay-transaction-output'; export * from './admin-result-data-set'; export * from './admin-result-data-table'; export * from './admin-result-dictionary-string-string'; +export * from './admin-result-get-refund-domestic-refund-by-out-refund-number-response'; export * from './admin-result-iaction-result'; export * from './admin-result-int32'; export * from './admin-result-int64'; @@ -82,6 +84,7 @@ export * from './admin-result-sql-sugar-paged-list-sys-online-user'; export * from './admin-result-sql-sugar-paged-list-sys-plugin'; export * from './admin-result-sql-sugar-paged-list-sys-print'; export * from './admin-result-sql-sugar-paged-list-sys-region'; +export * from './admin-result-sql-sugar-paged-list-sys-wechat-pay'; export * from './admin-result-sql-sugar-paged-list-tenant-output'; export * from './admin-result-sql-sugar-paged-list-user-output'; export * from './admin-result-string'; @@ -101,6 +104,7 @@ export * from './admin-result-visual-db-table'; export * from './admin-result-wechat-pay-output'; export * from './admin-result-wx-open-id-output'; export * from './admin-result-wx-phone-output'; +export * from './amount'; export * from './api-output'; export * from './assembly'; export * from './base-api-input'; @@ -121,6 +125,7 @@ export * from './compare-info'; export * from './const-output'; export * from './constructor-info'; export * from './create-entity-input'; +export * from './create-pay-transaction-output'; export * from './create-seed-data-input'; export * from './culture-info'; export * from './culture-level-enum'; @@ -179,10 +184,13 @@ export * from './field-attributes'; export * from './field-info'; export * from './file-input'; export * from './file-output'; +export * from './from'; export * from './gen-auth-url-input'; export * from './gender-enum'; export * from './generate-signature-input'; export * from './generic-parameter-attributes'; +export * from './get-refund-domestic-refund-by-out-refund-number-response'; +export * from './goods-detail'; export * from './http-method-enum'; export * from './iaction-result'; export * from './icomponent'; @@ -243,6 +251,7 @@ export * from './page-print-input'; export * from './page-region-input'; export * from './page-role-input'; export * from './page-role-output'; +export * from './page-sys-wechat-pay-input'; export * from './page-tenant-input'; export * from './page-user-input'; export * from './parameter-attributes'; @@ -250,8 +259,10 @@ export * from './parameter-info'; export * from './platform-type-enum'; export * from './pos-output'; export * from './print-type-enum'; +export * from './promotion'; export * from './property-attributes'; export * from './property-info'; +export * from './refund-request-input'; export * from './reset-pwd-user-input'; export * from './role-api-input'; export * from './role-input'; @@ -290,6 +301,7 @@ export * from './sql-sugar-paged-list-sys-online-user'; export * from './sql-sugar-paged-list-sys-plugin'; export * from './sql-sugar-paged-list-sys-print'; export * from './sql-sugar-paged-list-sys-region'; +export * from './sql-sugar-paged-list-sys-wechat-pay'; export * from './sql-sugar-paged-list-tenant-output'; export * from './sql-sugar-paged-list-user-output'; export * from './status-enum'; diff --git a/Web/src/api-services/models/member-info.ts b/Web/src/api-services/models/member-info.ts index 983879e9..b1fbee1e 100644 --- a/Web/src/api-services/models/member-info.ts +++ b/Web/src/api-services/models/member-info.ts @@ -30,12 +30,6 @@ export interface MemberInfo { */ memberType?: MemberTypes; - /** - * @type {string} - * @memberof MemberInfo - */ - name?: string | null; - /** * @type {Type} * @memberof MemberInfo @@ -48,6 +42,12 @@ export interface MemberInfo { */ reflectedType?: Type; + /** + * @type {string} + * @memberof MemberInfo + */ + name?: string | null; + /** * @type {Module} * @memberof MemberInfo diff --git a/Web/src/api-services/models/open-access-output.ts b/Web/src/api-services/models/open-access-output.ts index 1b482e70..262b2c21 100644 --- a/Web/src/api-services/models/open-access-output.ts +++ b/Web/src/api-services/models/open-access-output.ts @@ -12,6 +12,7 @@ * Do not edit the class manually. */ +import { SysUser } from './sys-user'; /** * * @@ -116,6 +117,12 @@ export interface OpenAccessOutput { */ bindUserId?: number; + /** + * @type {SysUser} + * @memberof OpenAccessOutput + */ + bindUser?: SysUser; + /** * 绑定用户账号 * diff --git a/Web/src/api-services/models/page-sys-wechat-pay-input.ts b/Web/src/api-services/models/page-sys-wechat-pay-input.ts new file mode 100644 index 00000000..83363150 --- /dev/null +++ b/Web/src/api-services/models/page-sys-wechat-pay-input.ts @@ -0,0 +1,102 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface PageSysWechatPayInput + */ +export interface PageSysWechatPayInput { + + /** + * 当前页码 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + page?: number; + + /** + * 页码容量 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + pageSize?: number; + + /** + * 排序字段 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + field?: string | null; + + /** + * 排序方向 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + order?: string | null; + + /** + * 降序排序 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + descStr?: string | null; + + /** + * order_id + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderId?: number | null; + + /** + * order_status + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderStatus?: number | null; + + /** + * out_trade_number + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + outTradeNumber?: string | null; + + /** + * success_time范围 + * + * @type {Array} + * @memberof PageSysWechatPayInput + */ + successTimeRange?: Array | null; + + /** + * expire_time范围 + * + * @type {Array} + * @memberof PageSysWechatPayInput + */ + expireTimeRange?: Array | null; +} diff --git a/Web/src/api-services/models/promotion.ts b/Web/src/api-services/models/promotion.ts new file mode 100644 index 00000000..4b8e3d99 --- /dev/null +++ b/Web/src/api-services/models/promotion.ts @@ -0,0 +1,59 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GoodsDetail } from './goods-detail'; + /** + * + * + * @export + * @interface Promotion + */ +export interface Promotion { + + /** + * @type {string} + * @memberof Promotion + */ + promotionId?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + scope?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + type?: string | null; + + /** + * @type {number} + * @memberof Promotion + */ + amount?: number; + + /** + * @type {number} + * @memberof Promotion + */ + refundAmount?: number; + + /** + * @type {Array} + * @memberof Promotion + */ + goodsDetail?: Array | null; +} diff --git a/Web/src/api-services/models/refund-request-input.ts b/Web/src/api-services/models/refund-request-input.ts new file mode 100644 index 00000000..0d24f8f0 --- /dev/null +++ b/Web/src/api-services/models/refund-request-input.ts @@ -0,0 +1,126 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface RefundRequestInput + */ +export interface RefundRequestInput { + + /** + * 商户订单号(原支付交易对应的付款单号) + * + * @type {string} + * @memberof RefundRequestInput + */ + outTradeNumber?: string | null; + + /** + * 原订单金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + total?: number; + + /** + * 退款金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + refund?: number; + + /** + * 退款原因 + * + * @type {string} + * @memberof RefundRequestInput + */ + reason?: string | null; + + /** + * 关联的商户订单号 + * + * @type {number} + * @memberof RefundRequestInput + */ + orderId?: number; + + /** + * 关联的商户订单状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) + * + * @type {number} + * @memberof RefundRequestInput + */ + orderStatus?: number; + + /** + * 关联的商户商品编码 + * + * @type {string} + * @memberof RefundRequestInput + */ + merchantGoodsId?: string | null; + + /** + * 关联的商户商品名称 + * + * @type {string} + * @memberof RefundRequestInput + */ + goodsName?: string | null; + + /** + * 关联的商户商品单价 + * + * @type {number} + * @memberof RefundRequestInput + */ + unitPrice?: number; + + /** + * 关联的商户商品退款金额 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundAmount?: number; + + /** + * 关联的商户商品退货数量 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundQuantity?: number; + + /** + * 附加数据 + * + * @type {string} + * @memberof RefundRequestInput + */ + attachment?: string | null; + + /** + * 备注 + * + * @type {string} + * @memberof RefundRequestInput + */ + remark?: string | null; +} diff --git a/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts b/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts new file mode 100644 index 00000000..dcb7a6b0 --- /dev/null +++ b/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts @@ -0,0 +1,79 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SysWechatPay } from './sys-wechat-pay'; + /** + * 分页泛型集合 + * + * @export + * @interface SqlSugarPagedListSysWechatPay + */ +export interface SqlSugarPagedListSysWechatPay { + + /** + * 页码 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + page?: number; + + /** + * 页容量 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + pageSize?: number; + + /** + * 总条数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + total?: number; + + /** + * 总页数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + totalPages?: number; + + /** + * 当前页集合 + * + * @type {Array} + * @memberof SqlSugarPagedListSysWechatPay + */ + items?: Array | null; + + /** + * 是否有上一页 + * + * @type {boolean} + * @memberof SqlSugarPagedListSysWechatPay + */ + hasPrevPage?: boolean; + + /** + * 是否有下一页 + * + * @type {boolean} + * @memberof SqlSugarPagedListSysWechatPay + */ + hasNextPage?: boolean; +} diff --git a/Web/src/api-services/models/sys-code-gen.ts b/Web/src/api-services/models/sys-code-gen.ts index 8017f169..4d68550a 100644 --- a/Web/src/api-services/models/sys-code-gen.ts +++ b/Web/src/api-services/models/sys-code-gen.ts @@ -211,4 +211,12 @@ export interface SysCodeGen { * @memberof SysCodeGen */ printName?: string | null; + + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof SysCodeGen + */ + isApiService?: boolean; } diff --git a/Web/src/api-services/models/sys-wechat-pay.ts b/Web/src/api-services/models/sys-wechat-pay.ts index b1244f11..c7fb08f9 100644 --- a/Web/src/api-services/models/sys-wechat-pay.ts +++ b/Web/src/api-services/models/sys-wechat-pay.ts @@ -84,6 +84,22 @@ export interface SysWechatPay { */ isDelete?: boolean; + /** + * 关联的商户订单号 + * + * @type {number} + * @memberof SysWechatPay + */ + orderId?: number; + + /** + * 关联的商户订单状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) + * + * @type {number} + * @memberof SysWechatPay + */ + orderStatus?: number; + /** * 微信商户号 * diff --git a/Web/src/api-services/models/update-code-gen-input.ts b/Web/src/api-services/models/update-code-gen-input.ts index 616f60b7..fdb84a08 100644 --- a/Web/src/api-services/models/update-code-gen-input.ts +++ b/Web/src/api-services/models/update-code-gen-input.ts @@ -204,6 +204,14 @@ export interface UpdateCodeGenInput { */ printName?: string | null; + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof UpdateCodeGenInput + */ + isApiService?: boolean; + /** * 代码生成器Id * diff --git a/Web/src/api-services/models/update-open-access-input.ts b/Web/src/api-services/models/update-open-access-input.ts index 7b4d29db..cc6cf06e 100644 --- a/Web/src/api-services/models/update-open-access-input.ts +++ b/Web/src/api-services/models/update-open-access-input.ts @@ -12,6 +12,7 @@ * Do not edit the class manually. */ +import { SysUser } from './sys-user'; /** * * @@ -92,6 +93,12 @@ export interface UpdateOpenAccessInput { */ bindTenantId?: number; + /** + * @type {SysUser} + * @memberof UpdateOpenAccessInput + */ + bindUser?: SysUser; + /** * 身份标识 * diff --git a/Web/src/api-services/models/wechat-pay-output.ts b/Web/src/api-services/models/wechat-pay-output.ts index 621ca70a..1becf524 100644 --- a/Web/src/api-services/models/wechat-pay-output.ts +++ b/Web/src/api-services/models/wechat-pay-output.ts @@ -28,6 +28,30 @@ export interface WechatPayOutput { */ openId?: string | null; + /** + * 商户(支付交易)单号,微信唯一 + * + * @type {string} + * @memberof WechatPayOutput + */ + outTradeNumber?: string | null; + + /** + * 关联的商户(商品交易)订单号 + * + * @type {number} + * @memberof WechatPayOutput + */ + orderId?: number; + + /** + * 关联的商户订单状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) + * + * @type {number} + * @memberof WechatPayOutput + */ + orderStatus?: number; + /** * 订单金额 * @@ -51,4 +75,36 @@ export interface WechatPayOutput { * @memberof WechatPayOutput */ goodsTag?: string | null; + + /** + * 支付发起时间 + * + * @type {Date} + * @memberof WechatPayOutput + */ + createTime?: Date; + + /** + * 支付完成时间 + * + * @type {Date} + * @memberof WechatPayOutput + */ + successTime?: Date; + + /** + * 交易状态(支付成功后,微信返回) + * + * @type {string} + * @memberof WechatPayOutput + */ + tradeState?: string | null; + + /** + * 交易状态描述(支付成功后,微信返回) + * + * @type {string} + * @memberof WechatPayOutput + */ + tradeStateDescription?: string | null; } diff --git a/Web/src/api-services/models/wechat-pay-transaction-input.ts b/Web/src/api-services/models/wechat-pay-transaction-input.ts index 03f3ef8e..7ca3936e 100644 --- a/Web/src/api-services/models/wechat-pay-transaction-input.ts +++ b/Web/src/api-services/models/wechat-pay-transaction-input.ts @@ -59,4 +59,20 @@ export interface WechatPayTransactionInput { * @memberof WechatPayTransactionInput */ goodsTag?: string | null; + + /** + * 关联的商户订单号 + * + * @type {number} + * @memberof WechatPayTransactionInput + */ + orderId?: number; + + /** + * 关联的商户订单付款状态(或者为第几次支付,有些订单涉及多次支付,比如先付预付款,后补尾款) + * + * @type {number} + * @memberof WechatPayTransactionInput + */ + orderStatus?: number; }