From 074b4c463c4be9bf5df11fa08779a523fdb983b1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 01 四月 2025 17:11:01 +0800
Subject: [PATCH] fix: 四期需求
---
apps/taro/src/subpackages/my/shareQrcode/InnerPage.vue | 6 +++++-
packages/services/api/typings.d.ts | 12 ++++++++----
packages/core/src/lifeRecharge.ts | 1 +
packages/core/src/lifeRechargeConstants.ts | 7 +++++++
packages/components/src/views/Mine/Dashboard.vue | 2 +-
packages/core/src/lifeRechargeServices.ts | 14 ++++++++------
packages/services/api/LifePay.ts | 15 ++++++---------
7 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/apps/taro/src/subpackages/my/shareQrcode/InnerPage.vue b/apps/taro/src/subpackages/my/shareQrcode/InnerPage.vue
index e1c1c9d..36a3ffb 100644
--- a/apps/taro/src/subpackages/my/shareQrcode/InnerPage.vue
+++ b/apps/taro/src/subpackages/my/shareQrcode/InnerPage.vue
@@ -23,7 +23,11 @@
// const { virtualUserInfo } = useUser();
const { blLifeRecharge } = useLifeRechargeContext();
-const userChannles = computed(() => blLifeRecharge.accountModel.userChannles ?? []);
+const userChannles = computed(() =>
+ (blLifeRecharge.accountModel.userChannles ?? []).filter(
+ (x) => x.switchType !== blLifeRecharge.constants.LifePaySwitchTypeEnum.寰俊灏忕▼搴�
+ )
+);
const channlesType = ref(userChannles.value[0]?.channlesNum ?? '');
diff --git a/packages/components/src/views/Mine/Dashboard.vue b/packages/components/src/views/Mine/Dashboard.vue
index 90f4cec..b936761 100644
--- a/packages/components/src/views/Mine/Dashboard.vue
+++ b/packages/components/src/views/Mine/Dashboard.vue
@@ -75,7 +75,7 @@
queryFn: async () => {
return await blLifeRecharge.services.getTopStatistics(
{
- channleId: '',
+ channleList: blLifeRecharge.accountModel.userChannles.map((x) => x.channlesNum),
},
{
showLoading: false,
diff --git a/packages/core/src/lifeRecharge.ts b/packages/core/src/lifeRecharge.ts
index 38e3088..d523104 100644
--- a/packages/core/src/lifeRecharge.ts
+++ b/packages/core/src/lifeRecharge.ts
@@ -49,6 +49,7 @@
this.accountModel.setUserId('');
this.accountModel.setPhoneNumber('');
this.accountModel.setUserChannles([]);
+ this.accountModel.isBackClientUser = false;
}
isLogin() {
diff --git a/packages/core/src/lifeRechargeConstants.ts b/packages/core/src/lifeRechargeConstants.ts
index c852474..3a64d0e 100644
--- a/packages/core/src/lifeRechargeConstants.ts
+++ b/packages/core/src/lifeRechargeConstants.ts
@@ -183,4 +183,11 @@
鍏呭�煎け璐� = 50,
宸查��娆� = 60,
}
+
+ export enum LifePaySwitchTypeEnum {
+ H5 = 10,
+
+ 寰俊灏忕▼搴� = 20,
+ 寰俊鍏紬鍙� = 30,
+ }
}
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index b04c09d..a7e60aa 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -379,14 +379,15 @@
/** 鑾峰彇椤堕儴缁熻鏁版嵁 GET /api/LifePay/GetTopStatistics */
async getTopStatistics(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
- params: APIgetTopStatisticsParams,
+ body: TopStatisticsInput,
options?: RequestConfig
) {
return this.request<TopStatisticsOutput>('/api/LifePay/GetTopStatistics', {
- method: 'GET',
- params: {
- ...params,
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
},
+ data: body,
...(options || {}),
});
}
@@ -849,6 +850,7 @@
name?: string;
channlesNum?: string;
channlesId?: string;
+ switchType?: LifeRechargeConstants.LifePaySwitchTypeEnum;
}
export interface LifePayUserMesssageByIduserInput {
@@ -858,8 +860,8 @@
id?: string;
}
-export interface APIgetTopStatisticsParams {
- channleId?: string;
+export interface TopStatisticsInput {
+ channleList?: string[];
}
export interface TopStatisticsOutput {
diff --git a/packages/services/api/LifePay.ts b/packages/services/api/LifePay.ts
index a1b891b..763251e 100644
--- a/packages/services/api/LifePay.ts
+++ b/packages/services/api/LifePay.ts
@@ -548,17 +548,14 @@
});
}
-/** 鑾峰彇椤堕儴缁熻鏁版嵁 GET /api/LifePay/GetTopStatistics */
-export async function getTopStatistics(
- // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
- params: API.APIgetTopStatisticsParams,
- options?: API.RequestConfig
-) {
+/** 鑾峰彇椤堕儴缁熻鏁版嵁 POST /api/LifePay/GetTopStatistics */
+export async function getTopStatistics(body: API.TopStatisticsInput, options?: API.RequestConfig) {
return request<API.TopStatisticsOutput>('/api/LifePay/GetTopStatistics', {
- method: 'GET',
- params: {
- ...params,
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
},
+ data: body,
...(options || {}),
});
}
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index 83f7260..6408be4 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -318,10 +318,6 @@
id: string;
}
- interface APIgetTopStatisticsParams {
- channleId?: string;
- }
-
interface APIgetUserAccountDetailParams {
id?: string;
}
@@ -532,6 +528,7 @@
name?: string;
channlesNum?: string;
channlesId?: string;
+ switchType?: LifePaySwitchTypeEnum;
}
interface ChannelRateOutput {
@@ -1742,6 +1739,7 @@
interface OrderInQuiryInput {
outTradeNo?: string;
+ outRefundNo?: string;
}
type OrderTypeEnum = 0 | 1;
@@ -2135,6 +2133,10 @@
timeZone?: TimeZone;
}
+ interface TopStatisticsInput {
+ channleList?: string[];
+ }
+
interface TopStatisticsOutput {
/** 鍒涘缓鏃堕棿 */
creationTime?: string;
@@ -2285,6 +2287,8 @@
interface UserChannleDto {
/** 娓犻亾Id */
id?: string;
+ /** 娓犻亾num */
+ channlesNum?: string;
/** 娓犻亾鍚� */
name?: string;
}
--
Gitblit v1.9.1