Skip to content

Commit

Permalink
fix: pay error catch
Browse files Browse the repository at this point in the history
  • Loading branch information
c121914yu committed Jul 4, 2023
1 parent f382b21 commit deb9be4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion client/src/pages/api/user/checkPayResult.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/service/response';
import { connectToDatabase, User, Pay, TrainingData } from '@/service/mongo';
import { authUser } from '@/service/utils/auth';
import { PaySchema, UserModelSchema } from '@/types/mongoSchema';
import { PaySchema } from '@/types/mongoSchema';
import dayjs from 'dayjs';
import { getPayResult } from '@/service/utils/wxpay';
import { pushPromotionRecord } from '@/service/utils/promotion';
Expand Down
34 changes: 21 additions & 13 deletions client/src/service/utils/wxpay.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
// @ts-ignore
import Payment from 'wxpay-v3';

export const getPayment = () => {
return new Payment({
export const getPayment = () =>
new Payment({
appid: process.env.WX_APPID,
mchid: process.env.WX_MCHID,
private_key: process.env.WX_PRIVATE_KEY?.replace(/\\n/g, '\n'),
serial_no: process.env.WX_SERIAL_NO,
apiv3_private_key: process.env.WX_V3_CODE,
notify_url: process.env.WX_NOTIFY_URL
});
};

export const nativePay = (amount: number, payId: string): Promise<string> =>
getPayment()
.native({
export const nativePay = async (amount: number, payId: string) => {
try {
const res = await getPayment().native({
description: 'Fast GPT 余额充值',
out_trade_no: payId,
amount: {
total: amount
}
})
.then((res: any) => JSON.parse(res.data).code_url);
});
return JSON.parse(res.data).code_url as string;
} catch (error) {
return Promise.reject(error);
}
};

export const getPayResult = (payId: string) =>
getPayment()
.getTransactionsByOutTradeNo({
export const getPayResult = async (payId: string) => {
try {
const res = await getPayment().getTransactionsByOutTradeNo({
out_trade_no: payId
})
.then((res: any) => JSON.parse(res.data));
});

return JSON.parse(res.data);
} catch (error) {
return Promise.reject(error);
}
};

0 comments on commit deb9be4

Please sign in to comment.