From 6a5d66d21df56c4549648b259609419e357e9470 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 三月 2025 17:17:00 +0800
Subject: [PATCH] fix: 三期需求
---
packages/components/src/utils/common.ts | 14 +
packages/services/api/typings.d.ts | 251 +++++++++++++++++++++++++++++++++++
packages/core/src/lifeRechargeConstants.ts | 32 +++
packages/core/src/lifeRechargeServices.ts | 2
packages/services/api/UserRole.ts | 15 ++
packages/components/src/hooks/index.ts | 6
packages/services/api/LifePay.ts | 70 +++++++++
7 files changed, 374 insertions(+), 16 deletions(-)
diff --git a/packages/components/src/hooks/index.ts b/packages/components/src/hooks/index.ts
index 805b447..d8ff400 100644
--- a/packages/components/src/hooks/index.ts
+++ b/packages/components/src/hooks/index.ts
@@ -127,7 +127,11 @@
});
res.data = res.data.map((x) => ({
...x,
- frontStatus: convertOrderFrontStatus(x.payStatus, x.lifePayOrderStatus),
+ frontStatus: convertOrderFrontStatus(
+ x.payStatus,
+ x.lifePayOrderStatus,
+ x.lifePayRefundStatus
+ ),
}));
return res;
},
diff --git a/packages/components/src/utils/common.ts b/packages/components/src/utils/common.ts
index cece529..c89bd69 100644
--- a/packages/components/src/utils/common.ts
+++ b/packages/components/src/utils/common.ts
@@ -132,7 +132,7 @@
lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
) {
if (
- (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
+ (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 &&
payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
) {
@@ -152,10 +152,11 @@
export function convertOrderFrontStatus(
payStatus?: LifeRechargeConstants.LifePayStatusEnum,
- lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum
+ lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum,
+ lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum
) {
if (
- (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.寰呯‘璁� &&
+ (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 &&
payStatus === LifeRechargeConstants.LifePayStatusEnum.宸叉敮浠�) ||
payStatus === LifeRechargeConstants.LifePayStatusEnum.寰呴��娆�
) {
@@ -167,10 +168,13 @@
) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.宸查��娆�;
}
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳) {
+ if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆句腑) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧緟瀹℃牳;
}
- if (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐�) {
+ if (
+ lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐� ||
+ lifePayRefundStatus === LifeRechargeConstants.LifePayRefundStatusEnum.閫�娆鹃┏鍥�
+ ) {
return LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�;
}
if (
diff --git a/packages/core/src/lifeRechargeConstants.ts b/packages/core/src/lifeRechargeConstants.ts
index 610436a..2d30c16 100644
--- a/packages/core/src/lifeRechargeConstants.ts
+++ b/packages/core/src/lifeRechargeConstants.ts
@@ -35,26 +35,28 @@
}
export enum LifePayOrderStatusEnum {
- 寰呯‘璁� = 10,
+ 鍏呭�间腑 = 10,
- 宸插け璐� = 20,
+ // 宸插け璐� = 20,
宸插畬鎴� = 30,
- 閫�娆惧緟瀹℃牳 = 40,
+ 寰呴��娆� = 40,
宸查��娆� = 50,
閫�娆惧け璐� = 60,
+ 閫�娆句腑 = 70,
}
export const LifePayOrderStatusEnumText = {
- [LifePayOrderStatusEnum.寰呯‘璁: '寰呯‘璁�',
- [LifePayOrderStatusEnum.宸插け璐: '宸插け璐�',
+ [LifePayOrderStatusEnum.鍏呭�间腑]: '鍏呭�间腑',
+ // [LifePayOrderStatusEnum.宸插け璐: '宸插け璐�',
[LifePayOrderStatusEnum.宸插畬鎴怾: '宸插畬鎴�',
- [LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳]: '閫�娆惧緟瀹℃牳',
+ [LifePayOrderStatusEnum.寰呴��娆綸: '寰呴��娆�',
[LifePayOrderStatusEnum.宸查��娆綸: '宸查��娆�',
[LifePayOrderStatusEnum.閫�娆惧け璐: '閫�娆惧け璐�',
+ [LifePayOrderStatusEnum.閫�娆句腑]: '閫�娆句腑',
};
export enum LifePayOrderFrontStatusEnum {
@@ -158,4 +160,22 @@
*/
WXContent,
}
+
+ /**骞冲彴閫�娆剧姸鎬� */
+ export enum LifePayRefundStatusEnum {
+ 鏃犻渶閫�娆� = 0,
+ 寰呴��娆� = 10,
+ 閫�娆句腑 = 20,
+ 宸查��娆� = 30,
+ 閫�娆鹃┏鍥� = 40,
+ }
+
+ export enum ACOOLYStatusEnum {
+ 鍏呭�间腑 = 10,
+ 鍏呭�兼垚鍔� = 20,
+ 宸插畬鎴� = 30,
+ 閮ㄥ垎鍏呭�兼垚鍔� = 40,
+ 鍏呭�煎け璐� = 50,
+ 宸查��娆� = 60,
+ }
}
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index 90b6604..908687f 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -509,6 +509,8 @@
/** 娓犻亾娴佹按鍙� */
acoolyOrderNo?: string;
frontStatus?: LifeRechargeConstants.LifePayOrderFrontStatusEnum;
+ lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum;
+ acoolyStatus?: LifeRechargeConstants.ACOOLYStatusEnum;
}
export interface ElectricSupportAreaResponse {
diff --git a/packages/services/api/LifePay.ts b/packages/services/api/LifePay.ts
index 684ae8d..4b405d6 100644
--- a/packages/services/api/LifePay.ts
+++ b/packages/services/api/LifePay.ts
@@ -161,6 +161,21 @@
});
}
+/** 姝ゅ鍚庣娌℃湁鎻愪緵娉ㄩ噴 GET /api/LifePay/GetBillErceiptExport */
+export async function getBillErceiptExport(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetBillErceiptExportParams,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/LifePay/GetBillErceiptExport', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇鐢佃垂闈㈠�� POST /api/LifePay/GetElectricParValue */
export async function getElectricParValue(
body: API.ChannelsBaseInput,
@@ -265,6 +280,21 @@
});
}
+/** 鑾峰彇璁㈠崟璇︽儏 GET /api/LifePay/GetLifePayOrderDetail */
+export async function getLifePayOrderDetail(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetLifePayOrderDetailParams,
+ options?: API.RequestConfig
+) {
+ return request<API.LifePayOrderOutput>('/api/LifePay/GetLifePayOrderDetail', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇璁㈠崟鍒嗛〉鏁版嵁 POST /api/LifePay/GetLifePayOrderPage */
export async function getLifePayOrderPage(
body: API.QueryLifePayOrderListInput,
@@ -286,6 +316,36 @@
options?: API.RequestConfig
) {
return request<any>('/api/LifePay/GetLifePayOrderPageExport', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇閫�娆捐鍗曡鎯� GET /api/LifePay/GetLifePayRefundOrderDetail */
+export async function getLifePayRefundOrderDetail(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetLifePayRefundOrderDetailParams,
+ options?: API.RequestConfig
+) {
+ return request<API.LifePayRefundOrderOutput>('/api/LifePay/GetLifePayRefundOrderDetail', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇閫�娆捐鍗曞垎椤垫暟鎹� POST /api/LifePay/GetLifePayRefundOrderPage */
+export async function getLifePayRefundOrderPage(
+ body: API.QueryLifePayRefundOrderListInput,
+ options?: API.RequestConfig
+) {
+ return request<API.LifePayOrderListOutputPageOutput>('/api/LifePay/GetLifePayRefundOrderPage', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -348,6 +408,14 @@
/** 鑾峰彇鎶樻墸 GET /api/LifePay/GetRate */
export async function getRate(options?: API.RequestConfig) {
return request<API.LifePayRateListOutput[]>('/api/LifePay/GetRate', {
+ method: 'GET',
+ ...(options || {}),
+ });
+}
+
+/** 鑾峰彇椤堕儴缁熻鏁版嵁 GET /api/LifePay/GetTopStatistics */
+export async function getTopStatistics(options?: API.RequestConfig) {
+ return request<API.TopStatisticsOutput>('/api/LifePay/GetTopStatistics', {
method: 'GET',
...(options || {}),
});
@@ -444,7 +512,7 @@
}
/** 鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁 POST /api/LifePay/GetUserPage */
-export async function getUserPage(body: API.PageInput, options?: API.RequestConfig) {
+export async function getUserPage(body: API.QueryUserPageInput, options?: API.RequestConfig) {
return request<API.UserListOutputPageOutput>('/api/LifePay/GetUserPage', {
method: 'POST',
headers: {
diff --git a/packages/services/api/UserRole.ts b/packages/services/api/UserRole.ts
index 37b6b26..2071439 100644
--- a/packages/services/api/UserRole.ts
+++ b/packages/services/api/UserRole.ts
@@ -86,6 +86,21 @@
});
}
+/** 閲嶇疆瀵嗙爜 POST /api/UserRole/ResetUserPassword */
+export async function resetUserPassword(
+ body: API.ResetPasswordBaseInput,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/UserRole/ResetUserPassword', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 瑙掕壊鍚敤/绂佺敤 POST /api/UserRole/RoleEnableOrForbid */
export async function roleEnableOrForbid(
body: API.RoleEnableOrForbidInput,
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index 757003d..1b3458a 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -15,6 +15,8 @@
scope?: string;
}
+ type ACOOLYStatusEnum = 10 | 20 | 30 | 40 | 50 | 60;
+
interface ActionApiDescriptionModel {
uniqueName?: string;
name?: string;
@@ -152,6 +154,10 @@
moduleId?: string;
}
+ interface APIgetBillErceiptExportParams {
+ orderNo?: string;
+ }
+
interface APIgetCountParams {
filter?: string;
}
@@ -174,6 +180,14 @@
interface APIgetLifePayChannlesDtoParams {
id?: string;
+ }
+
+ interface APIgetLifePayOrderDetailParams {
+ orderNo?: string;
+ }
+
+ interface APIgetLifePayRefundOrderDetailParams {
+ orderNo?: string;
}
interface APIgetLifePayWxIndentityParams {
@@ -444,11 +458,14 @@
name?: string;
/** 鎵嬫満鍙� */
phoneNumber?: string;
+ password?: string;
/** 璐︽埛 */
userName?: string;
remark?: string;
/** 瑙掕壊 */
roleNames?: string[];
+ /** 娓犻亾鍒楄〃 */
+ channlesId?: string[];
/** 缁勭粐鏋舵瀯鍏徃id */
companyOrgId?: string;
/** 缁勭粐鏋舵瀯閮ㄩ棬id */
@@ -1054,12 +1071,16 @@
orderNo?: string;
/** 鍏呭�奸噾棰� */
rechargeAmount?: number;
+ /** 瀹為檯鍏呭�奸噾棰� */
+ actualRechargeAmount?: number;
/** 浼樻儬閲戦 */
discountAmount?: number;
/** 瀹炰粯閲戦 */
payAmount?: number;
/** 鏀粯鏃堕棿 */
payTime?: string;
+ /** 骞冲彴鎵ｆ閲戦 */
+ platformDeductionAmount?: number;
payStatus?: LifePayStatusEnum;
/** 澶栭儴璁㈠崟鍙� */
outOrderNo?: string;
@@ -1068,13 +1089,22 @@
finishTime?: string;
/** 閫�娆惧嚟璇� */
refundCredentialsImgUrl?: string;
+ /** 閫�娆鹃噾棰� */
+ refundPrice?: number;
/** 涓嬪崟鏃堕棿 */
creationTime?: string;
/** 閫�娆炬椂闂� */
refundTime?: string;
+ /** 鐢宠閫�娆惧師鍥� */
refundApplyRemark?: string;
+ /** 閫�娆剧敵璇锋椂闂� */
+ refundApplyTime?: string;
+ /** 椹冲洖鍘熷洜 */
refundCheckRemark?: string;
+ /** 渚涘簲鍟嗚鍗曞彿 */
acoolyOrderNo?: string;
+ acoolyStatus?: ACOOLYStatusEnum;
+ lifePayRefundStatus?: LifePayRefundStatusEnum;
}
interface LifePayOrderListOutputPageOutput {
@@ -1083,7 +1113,76 @@
data?: LifePayOrderListOutput[];
}
- type LifePayOrderStatusEnum = 10 | 20 | 30 | 40 | 50 | 60;
+ interface LifePayOrderOutput {
+ id?: string;
+ /** 鐢ㄦ埛璐﹀彿 */
+ userPhoneNumber?: string;
+ userName?: string;
+ lifePayChannle?: string;
+ lifePayType?: LifePayTypeEnum;
+ lifePayOrderType?: LifePayOrderTypeEnum;
+ /** 閫�娆捐鍗曞彿 */
+ refundOrderNo?: string;
+ /** 璁㈠崟鍙� */
+ orderNo?: string;
+ /** 鍏呭�奸噾棰� */
+ rechargeAmount?: number;
+ /** 浼樻儬閲戦 */
+ discountAmount?: number;
+ /** 瀹炰粯閲戦 */
+ payAmount?: number;
+ /** 鏀粯鏃堕棿 */
+ payTime?: string;
+ payStatus?: LifePayStatusEnum;
+ status?: LifePayOrderStatusEnum;
+ /** 瀹屾垚鏃堕棿 */
+ finishTime?: string;
+ /** 澶栭儴璁㈠崟鍙� */
+ outOrderNo?: string;
+ /** 璁㈠崟璇︾粏鏁版嵁 */
+ orderParamDetailJsonStr?: string;
+ /** 涓嬪崟鏃堕棿 */
+ creationTime?: string;
+ /** 閫�娆炬椂闂� */
+ refundTime?: string;
+ /** 閫�娆惧嚟璇� */
+ refundCredentialsImgUrl?: string;
+ /** 閫�娆惧師鍥� */
+ refundApplyRemark?: string;
+ /** 椹冲洖鍘熷洜 */
+ refundCheckRemark?: string;
+ /** 娓犻亾娴佹按鍙� */
+ acoolyOrderNo?: string;
+ lifePayRefundStatus?: LifePayRefundStatusEnum;
+ /** 瀹為檯鍏呭�奸噾棰� */
+ actualRechargeAmount?: number;
+ /** 瀹為檯鍒拌处閲戦 */
+ actualReceivedAmount?: number;
+ /** 閫�娆鹃噾棰� */
+ refundPrice?: number;
+ /** 骞冲彴鎶樻墸姣斾緥 */
+ platformRate?: number;
+ /** 骞冲彴鎵ｆ閲戦 */
+ platformPrice?: number;
+ /** 娓犻亾鎶樻墸 */
+ channleRate?: number;
+ /** 娓犻亾浣ｉ噾姣斾緥 */
+ channlesRakeRate?: number;
+ /** 娓犻亾浣ｉ噾 */
+ channlesRakePrice?: number;
+ /** 鎵嬬画璐规瘮渚� */
+ premiumRate?: number;
+ /** 鎵嬬画璐� */
+ premiumPrice?: number;
+ /** 骞冲彴鍒╂鼎 */
+ profit?: number;
+ /** 鍥炲崟鍦板潃 */
+ elecBillUrl?: string;
+ /** 閫�娆惧洖鍗曞湴鍧� */
+ refundElecBillUrl?: string;
+ }
+
+ type LifePayOrderStatusEnum = 10 | 20 | 30 | 40 | 50 | 60 | 70;
type LifePayOrderTypeEnum = 10 | 20 | 30;
@@ -1120,7 +1219,64 @@
type LifePayRateTypeEnum = 10 | 20 | 30 | 40;
- type LifePayStatusEnum = 10 | 20 | 30 | 40;
+ interface LifePayRefundOrderOutput {
+ id?: string;
+ /** 鐢ㄦ埛璐﹀彿 */
+ userPhoneNumber?: string;
+ userName?: string;
+ lifePayChannle?: string;
+ lifePayType?: LifePayTypeEnum;
+ lifePayOrderType?: LifePayOrderTypeEnum;
+ /** 璁㈠崟鍙� */
+ orderNo?: string;
+ /** 鍏呭�奸噾棰� */
+ rechargeAmount?: number;
+ /** 浼樻儬閲戦 */
+ discountAmount?: number;
+ /** 瀹炰粯閲戦 */
+ payAmount?: number;
+ /** 鏀粯鏃堕棿 */
+ payTime?: string;
+ payStatus?: LifePayStatusEnum;
+ status?: LifePayOrderStatusEnum;
+ /** 瀹屾垚鏃堕棿 */
+ finishTime?: string;
+ /** 澶栭儴璁㈠崟鍙� */
+ outOrderNo?: string;
+ /** 涓嬪崟鏃堕棿 */
+ creationTime?: string;
+ /** 閫�娆炬椂闂� */
+ refundTime?: string;
+ /** 閫�娆惧嚟璇� */
+ refundCredentialsImgUrl?: string;
+ /** 閫�娆剧敵璇峰師鍥� */
+ refundApplyRemark?: string;
+ /** 閫�娆剧敵璇锋椂闂� */
+ refundApplyTime?: string;
+ /** 閫�娆鹃┏鍥炲師鍥� */
+ refundCheckRemark?: string;
+ /** 閫�娆捐鍗曞彿 */
+ refundOrderNo?: string;
+ /** 娓犻亾娴佹按鍙� */
+ acoolyOrderNo?: string;
+ lifePayRefundStatus?: LifePayRefundStatusEnum;
+ /** 瀹為檯鍏呭�奸噾棰� */
+ actualRechargeAmount?: number;
+ /** 瀹為檯鍒拌处閲戦 */
+ actualReceivedAmount?: number;
+ /** 閫�娆鹃噾棰� */
+ refundPrice?: number;
+ /** 鍥炲崟鍦板潃 */
+ elecBillUrl?: string;
+ /** 閫�娆惧洖鍗曞湴鍧� */
+ refundElecBillUrl?: string;
+ }
+
+ type LifePayRefundStatusEnum = 0 | 10 | 20 | 30 | 40;
+
+ type LifePayRefundTypeEnum = 10 | 20;
+
+ type LifePayStatusEnum = 10 | 20 | 30 | 40 | 50;
type LifePaySwitchTypeEnum = 10 | 20 | 30;
@@ -1317,7 +1473,8 @@
| 31
| 32
| 40
- | 42;
+ | 42
+ | 43;
interface OrderInput {
property?: string;
@@ -1444,11 +1601,34 @@
/** 缁撴潫鏀粯鏃堕棿 */
endPayTime?: string;
payStatus?: LifePayStatusEnum;
+ acoolyStatus?: ACOOLYStatusEnum;
lifePayOrderStatus?: LifePayOrderStatusEnum;
/** 寮�濮嬪畬鎴愭椂闂� */
beginFinishTime?: string;
/** 缁撴潫瀹屾垚鏃堕棿 */
endFinishTime?: string;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 鎼滅储鍏抽敭璇� */
+ keyWords?: string;
+ }
+
+ interface QueryLifePayRefundOrderListInput {
+ pageModel?: Pagination;
+ checkChannelId?: string;
+ lifePayOrderType?: LifePayOrderTypeEnum;
+ lifePayType?: LifePayTypeEnum;
+ /** 寮�濮嬬敵璇烽��娆炬椂闂� */
+ beginRefundApplyTime?: string;
+ /** 缁撴潫鐢宠閫�娆炬椂闂� */
+ endRefundApplyTime?: string;
+ /** 寮�濮嬪畬鎴愭椂闂� */
+ beginFinishTime?: string;
+ /** 缁撴潫瀹屾垚鏃堕棿 */
+ endFinishTime?: string;
+ payStatus?: LifePayStatusEnum;
+ acoolyStatus?: ACOOLYStatusEnum;
+ lifePayOrderStatus?: LifePayOrderStatusEnum;
/** 鐢ㄦ埛Id */
userId?: string;
/** 鎼滅储鍏抽敭璇� */
@@ -1477,10 +1657,25 @@
lifePayOrderType?: LifePayOrderTypeEnum;
}
+ interface QueryUserPageInput {
+ pageModel?: Pagination;
+ checkChannelId?: string;
+ /** 鎵嬫満鍙�/鐢ㄦ埛鍚� */
+ queryCondition?: string;
+ /** 娉ㄥ唽鏃堕棿 */
+ creationTimeBegin?: string;
+ creationTimeEnd?: string;
+ }
+
interface RefundLifePayOrderInput {
id?: string;
+ /** 涓婁紶鍑瘉 */
refundCredentialsImgUrl?: string;
+ /** 閫�娆鹃┏鍥炲師鍥� */
refundCheckRemark?: string;
+ lifePayRefundType?: LifePayRefundTypeEnum;
+ /** 閫�娆鹃噾棰� */
+ refundPrice?: number;
}
interface RefundUserLifePayOrderInput {
@@ -1516,6 +1711,11 @@
interface RemoteServiceValidationErrorInfo {
message?: string;
members?: string[];
+ }
+
+ interface ResetPasswordBaseInput {
+ userId?: string;
+ password?: string;
}
interface ResetPasswordDto {
@@ -1652,6 +1852,31 @@
timeZone?: TimeZone;
}
+ interface TopStatisticsOutput {
+ /** 鍒涘缓鏃堕棿 */
+ creationTime?: string;
+ /** 璐︽埛浣欓 */
+ amount?: number;
+ /** 绱鏀舵 */
+ accumulatedReceipts?: number;
+ /** 鏄ㄦ棩鏀舵 */
+ receiptsYesterday?: number;
+ /** 绱鏀跺叆 */
+ accumulatedIncome?: number;
+ /** 绱涓嬪崟 */
+ accumulatedOrders?: number;
+ /** 鏄ㄦ棩涓嬪崟 */
+ ordersNumYesterday?: number;
+ /** 鏄ㄦ棩鎴愬姛 */
+ yesterdaySuccess?: number;
+ /** 鏄ㄦ棩澶辫触 */
+ yesterdayFail?: number;
+ /** 绱鐢ㄦ埛 */
+ accumulatedUsers?: number;
+ /** 鏄ㄦ棩娲昏穬鐢ㄦ埛 */
+ yesterdayActiveUsers?: number;
+ }
+
interface TypeApiDescriptionModel {
baseType?: string;
isEnum?: boolean;
@@ -1666,11 +1891,14 @@
name?: string;
/** 鎵嬫満鍙� */
phoneNumber?: string;
+ password?: string;
/** 璐︽埛 */
userName?: string;
remark?: string;
/** 瑙掕壊 */
roleNames?: string[];
+ /** 娓犻亾鍒楄〃 */
+ channlesId?: string[];
/** 缁勭粐鏋舵瀯鍏徃id */
companyOrgId?: string;
/** 缁勭粐鏋舵瀯閮ㄩ棬id */
@@ -1743,6 +1971,13 @@
data?: UserAccountOutput[];
}
+ interface UserChannleDto {
+ /** 娓犻亾Id */
+ id?: string;
+ /** 娓犻亾鍚� */
+ name?: string;
+ }
+
interface UserData {
id?: string;
tenantId?: string;
@@ -1778,6 +2013,8 @@
isLocked?: boolean;
/** 瑙掕壊淇℃伅 */
roles?: RoleDto[];
+ /** 瑙掕壊淇℃伅 */
+ channles?: UserChannleDto[];
/** 澶囨敞 */
remark?: string;
/** 缁勭粐鏋舵瀯鍏徃id */
@@ -1822,6 +2059,8 @@
refundCheckRemark?: string;
/** 娓犻亾娴佹按鍙� */
acoolyOrderNo?: string;
+ lifePayRefundStatus?: LifePayRefundStatusEnum;
+ acoolyStatus?: ACOOLYStatusEnum;
}
interface UserLifePayOrderOutputPageOutput {
@@ -1846,6 +2085,12 @@
id?: string;
/** 鐢ㄦ埛鎵嬫満鍙� */
phoneNumber?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鏈�鍚庣櫥褰曟笭閬� */
+ creationChannle?: string;
+ /** 鏈�鍚庣櫥褰曟笭閬� */
+ lastLoginChannle?: string;
lastLoginTime?: string;
creationTime?: string;
}
--
Gitblit v1.9.1