diff --git a/src/api/user.ts b/src/api/user.ts index 5f904ba83..19b7f631a 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,8 +1,11 @@ import { GET, POST, PUT } from './request'; -import { createHashPassword } from '@/utils/tools'; +import { createHashPassword, Obj2Query } from '@/utils/tools'; import { ResLogin } from './response/user'; import { EmailTypeEnum } from '@/constants/common'; import { UserType, UserUpdateParams } from '@/types/user'; +import type { PagingData, RequestPaging } from '@/types'; +import { BillSchema } from '@/types/mongoSchema'; +import { adaptBill } from '@/utils/adapt'; export const sendCodeToEmail = ({ email, type }: { email: string; type: `${EmailTypeEnum}` }) => GET('/user/sendEmail', { email, type }); @@ -46,3 +49,9 @@ export const postLogin = ({ email, password }: { email: string; password: string }); export const putUserInfo = (data: UserUpdateParams) => PUT('/user/update', data); + +export const getUserBills = (data: RequestPaging) => + GET>(`/user/getBill?${Obj2Query(data)}`).then((res) => ({ + ...res, + data: res.data.map((bill) => adaptBill(bill)) + })); diff --git a/src/hooks/usePaging.ts b/src/hooks/usePaging.ts new file mode 100644 index 000000000..4209ad541 --- /dev/null +++ b/src/hooks/usePaging.ts @@ -0,0 +1,60 @@ +import { useState, useCallback } from 'react'; +import type { PagingData } from '../types/index'; +import { useQuery } from '@tanstack/react-query'; + +export const usePaging = ({ + api, + pageSize = 10, + params +}: { + api: (data: any) => Promise>; + pageSize?: number; + params?: Record; +}) => { + const [data, setData] = useState([]); + const [pageNum, setPageNum] = useState(1); + const [total, setTotal] = useState(0); + const [isLoadAll, setIsLoadAll] = useState(false); + const [requesting, setRequesting] = useState(false); + + const getData = useCallback( + async (init = false) => { + if (requesting) return; + if (!init && isLoadAll) return; + setRequesting(true); + + try { + const res = await api({ + pageNum, + pageSize, + ...(params ? params : {}) + }); + setData((state) => { + const data = init ? res.data : state.concat(res.data); + if (data.length >= res.total) { + setIsLoadAll(true); + } + return data; + }); + setTotal(res.total); + } catch (error) { + console.log(error); + } + + setRequesting(false); + return null; + }, + [api, isLoadAll, pageNum, pageSize, params, requesting] + ); + + useQuery(['init', pageNum], () => getData(pageNum === 1)); + + return { + pageNum, + pageSize, + setPageNum, + total, + data, + getData + }; +}; diff --git a/src/pages/api/user/getBill.ts b/src/pages/api/user/getBill.ts new file mode 100644 index 000000000..126a4f9ba --- /dev/null +++ b/src/pages/api/user/getBill.ts @@ -0,0 +1,51 @@ +// Next.js API route support: https://nextjs.org/docs/api-routes/introduction +import type { NextApiRequest, NextApiResponse } from 'next'; +import { jsonRes } from '@/service/response'; +import { connectToDatabase, Bill } from '@/service/mongo'; +import { authToken } from '@/service/utils/tools'; +import type { BillSchema } from '@/types/mongoSchema'; + +export default async function handler(req: NextApiRequest, res: NextApiResponse) { + try { + const { authorization } = req.headers; + let { pageNum = 1, pageSize = 10 } = req.query as { pageNum: string; pageSize: string }; + + pageNum = +pageNum; + pageSize = +pageSize; + + if (!authorization) { + throw new Error('缺少登录凭证'); + } + + const userId = await authToken(authorization); + + await connectToDatabase(); + + // 根据 id 获取用户账单 + const bills = await Bill.find({ + userId + }) + .sort({ createdAt: -1 }) // 按照创建时间倒序排列 + .skip((pageNum - 1) * pageSize) + .limit(pageSize); + + // 获取total + const total = await Bill.countDocuments({ + userId + }); + + jsonRes(res, { + data: { + pageNum, + pageSize, + data: bills, + total + } + }); + } catch (err) { + jsonRes(res, { + code: 500, + error: err + }); + } +} diff --git a/src/pages/chat/components/SlideBar.tsx b/src/pages/chat/components/SlideBar.tsx index fa3fc4bf2..97e63c617 100644 --- a/src/pages/chat/components/SlideBar.tsx +++ b/src/pages/chat/components/SlideBar.tsx @@ -85,7 +85,7 @@ const SlideBar = ({ : {})} onClick={() => { if (item.chatId === chatId) return; - router.push(`/chat?chatId=${item.chatId}`); + router.replace(`/chat?chatId=${item.chatId}`); onClose(); }} > @@ -187,7 +187,7 @@ const SlideBar = ({ : {})} onClick={async () => { if (item.name === name) return; - router.push(`/chat?chatId=${await getChatSiteId(item._id)}`); + router.replace(`/chat?chatId=${await getChatSiteId(item._id)}`); onClose(); }} > diff --git a/src/pages/chat/index.tsx b/src/pages/chat/index.tsx index 26a86f013..ab1b53733 100644 --- a/src/pages/chat/index.tsx +++ b/src/pages/chat/index.tsx @@ -152,7 +152,7 @@ const Chat = ({ chatId }: { chatId: string }) => { const resetChat = useCallback(async () => { if (!chatData) return; try { - router.push(`/chat?chatId=${await getChatSiteId(chatData.modelId)}`); + router.replace(`/chat?chatId=${await getChatSiteId(chatData.modelId)}`); } catch (error: any) { toast({ title: error?.message || '生成新对话失败', diff --git a/src/pages/number/setting.tsx b/src/pages/number/setting.tsx index 2d4b39f05..2e0fa5f65 100644 --- a/src/pages/number/setting.tsx +++ b/src/pages/number/setting.tsx @@ -18,11 +18,13 @@ import { import { DeleteIcon } from '@chakra-ui/icons'; import { useForm, useFieldArray } from 'react-hook-form'; import { UserUpdateParams } from '@/types/user'; -import { putUserInfo } from '@/api/user'; +import { putUserInfo, getUserBills } from '@/api/user'; import { useToast } from '@/hooks/useToast'; import { useGlobalStore } from '@/store/global'; import { useUserStore } from '@/store/user'; import { UserType } from '@/types/user'; +import { usePaging } from '@/hooks/usePaging'; +import type { UserBillType } from '@/types/user'; const NumberSetting = () => { const { userInfo, updateUserInfo } = useUserStore(); @@ -39,7 +41,11 @@ const NumberSetting = () => { control, name: 'accounts' }); - + const { setPageNum, data: bills } = usePaging({ + api: getUserBills, + pageSize: 20 + }); + console.log(bills); const onclickSave = useCallback( async (data: UserUpdateParams) => { setLoading(true); @@ -156,41 +162,19 @@ const NumberSetting = () => { - - - + + + - - {accounts.map((item, i) => ( + + {bills.map((item) => ( - + - + ))} diff --git a/src/types/index.d.ts b/src/types/index.d.ts index 003a22551..2f38065e9 100644 --- a/src/types/index.d.ts +++ b/src/types/index.d.ts @@ -3,4 +3,12 @@ import type { Mongoose } from 'mongoose'; declare global { var mongodb: Mongoose | string | null; } -export {}; + +export type PagingData = { + pageNum; + pageSize; + data: T[]; + total; +}; + +export type RequestPaging = { pageNum: number; pageSize: number }; diff --git a/src/types/mongoSchema.d.ts b/src/types/mongoSchema.d.ts index b2a7930c6..d69dcbfa2 100644 --- a/src/types/mongoSchema.d.ts +++ b/src/types/mongoSchema.d.ts @@ -75,3 +75,12 @@ export interface ChatPopulate extends ChatSchema { userId: UserModelSchema; modelId: ModelSchema; } + +export interface BillSchema { + _id: string; + userId: string; + chatId: string; + time: number; + textLen: number; + price: number; +} diff --git a/src/types/user.d.ts b/src/types/user.d.ts index 73e9540a2..85c49be75 100644 --- a/src/types/user.d.ts +++ b/src/types/user.d.ts @@ -19,3 +19,12 @@ export interface UserUpdateParams { value: string; }[]; } + +export interface UserBillType { + id: string; + time: string; + textLen: number; + userId: string; + chatId: string; + price: number; +} diff --git a/src/utils/adapt.ts b/src/utils/adapt.ts new file mode 100644 index 000000000..f821ccea7 --- /dev/null +++ b/src/utils/adapt.ts @@ -0,0 +1,15 @@ +import { formatPrice } from './user'; +import dayjs from 'dayjs'; +import type { BillSchema } from '../types/mongoSchema'; +import type { UserBillType } from '@/types/user'; + +export const adaptBill = (bill: BillSchema): UserBillType => { + return { + id: bill._id, + userId: bill.userId, + chatId: bill.chatId, + time: dayjs(bill.time).format('YYYY/MM/DD hh:mm:ss'), + textLen: bill.textLen, + price: formatPrice(bill.price) + }; +}; diff --git a/src/utils/tools.ts b/src/utils/tools.ts index 9ead516ed..dc3f563b1 100644 --- a/src/utils/tools.ts +++ b/src/utils/tools.ts @@ -41,6 +41,14 @@ export const createHashPassword = (text: string) => { return hash; }; +export const Obj2Query = (obj: Record) => { + const queryParams = new URLSearchParams(); + for (const key in obj) { + queryParams.append(key, `${obj[key]}`); + } + return queryParams.toString(); +}; + /** * 读取文件内容 */
账号类型时间内容长度消费
- - {item.time} - - - } - colorScheme={'red'} - onClick={() => { - removeAccount(i); - handleSubmit(onclickSave)(); - }} - /> + {item.textLen} {item.price}元