Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
seolsis committed Jun 24, 2024
1 parent f4abc91 commit dbb300c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/components/product/OptionBottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ export default function OptionBottomSheet({
};

const handleBuyButtonClick = async () => {
console.log(groupBuyingId);
let productList: QueryProduct[] = [];
for (let key of Object.keys(selectedOptionsObject)) {
const selectedIds = key.split(',');
Expand All @@ -250,6 +251,7 @@ export default function OptionBottomSheet({
}
queryClient.setQueryData(['cartData'], productList);
const response = queryClient.getQueryData(['cartData']);
console.log(response);
router.push('/payment');
};

Expand Down
11 changes: 7 additions & 4 deletions src/pages/payment/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import OrderDeliveryCard from '@/components/order/OrderDeliveryCard';
import { useRouter } from 'next/router';
import { Product } from '@/types/apis/product';
import { getCartData } from '@/queries/cartQueries';
import { useQuery } from '@tanstack/react-query';
import { queryClient } from '@/utils/queryClient';
import { useQuery, useQueryClient } from '@tanstack/react-query';
import { Product as QueryProduct } from '@/types/apis/product';

export async function getServerSideProps(context: GetServerSidePropsContext) {
const accessToken = context.req.cookies['accessToken'];
Expand Down Expand Up @@ -57,11 +57,14 @@ export default function Payment({ defaultDelivery }: { defaultDelivery: Delivery
const [products, setProducts] = useState<Product[]>([]);
const [delivery, setDelivery] = useState(defaultDelivery);
const router = useRouter();
const queryClient = useQueryClient();
const productList: QueryProduct[] = queryClient.getQueryData(['cartData']) || [];
console.log(productList);
const { data: selectedProducts } = useQuery({
queryKey: ['cartData'],
queryFn: () => getCartData(queryClient),
});

const groupBuyingId = productList[0].groupBuyingId ? productList[0].groupBuyingId : '';
const clientKey = `${process.env.NEXT_PUBLIC_TOSS_PAYMENTS_SECRET_KEY}`;
const orderId = nanoid(); // 주문 ID

Expand Down Expand Up @@ -93,7 +96,7 @@ export default function Payment({ defaultDelivery }: { defaultDelivery: Delivery
amount: totalPrice,
orderId: orderId,
orderName: orderName,
successUrl: `${window.location.origin}/payment/paymentSuccess`,
successUrl: `${window.location.origin}/payment/paymentSuccess?gbi=${groupBuyingId}`,
failUrl: `${window.location.origin}/payment/fail`,
});
};
Expand Down
12 changes: 10 additions & 2 deletions src/pages/payment/paymentSuccess.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ import styles from './PaymentSuccess.module.scss';
import Lottie from 'react-lottie-player';
import check from '@/assets/lotties/check.json';
import { completePayment } from '@/apis/paymentApi';
import { useQueryClient } from '@tanstack/react-query';

export default function PaymentSuccess() {
const router = useRouter();
const { paymentKey, orderId, amount } = router.query;
const { paymentKey, orderId, amount, gbi } = router.query;
console.log(gbi);
console.log(router.query);
const queryClient = useQueryClient();

const productList = queryClient.getQueryData(['cartData']);
console.log(productList);
useEffect(() => {
const deliveryMessage = sessionStorage.getItem('deliveryMessage') || '';
const selectedProductIds = sessionStorage.getItem('selectedProductIds') || '';
Expand All @@ -17,9 +23,11 @@ export default function PaymentSuccess() {
console.log(selectedProductIds);
const amountValue: number = parseFloat(amount as string);
const deliveryIdValue: number = parseInt(deliveryId, 10);
const gbiValue: number = parseInt(gbi as string, 10);
console.log(deliveryIdValue);

const sendPaymentData = async () => {
console.log(router.query);
if (paymentKey && orderId && amount) {
try {
const postData = {
Expand All @@ -28,7 +36,7 @@ export default function PaymentSuccess() {
paymentKey: paymentKey as string,
amount: amountValue,
selectedProductIds: selectedProductIds,
groupBuyingId: undefined,
groupBuyingId: gbiValue,
deliveryId: deliveryIdValue,
};
const response = await completePayment(postData);
Expand Down

0 comments on commit dbb300c

Please sign in to comment.