From 092c2e1355241276b5ecbd3f18e1fcb2bf2e1f96 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Mon, 27 Nov 2023 04:05:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=EA=B2=B0=EC=A0=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../readyvery/readyverydemo/src/order/OrderServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java index 2f36f79..a2855e2 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java @@ -452,7 +452,8 @@ private Order makeOrder(UserInfo user, Store store, Long amount, Cart cart, Coup String orderName = cart.getCartItems().get(0).getFoodie().getName() + " * " + cart.getCartItems().get(0).getCount(); if (cart.getCartItems().size() > 1) { - orderName += " 외 " + (cart.getCartItems().size() - 1) + "개"; + orderName += " 외 " + + (cart.getCartItems().stream().filter(cartItem -> !cartItem.getIsDeleted()).count() - 1) + "개"; } return Order.builder() .userInfo(user) From 8304842b146983f99d9c99a52dd8ca604ce64f11 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Mon, 27 Nov 2023 05:18:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20=EC=84=B1=EA=B3=B5,=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b46c52c..9302dd8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -34,5 +34,5 @@ spring.security.oauth2.client.provider.kakao.user-name-attribute=id ##tosspay payment.toss.client_key=test_ck_pP2YxJ4K87By0b4RZeo0rRGZwXLO payment.toss.secret_key=test_sk_pP2YxJ4K87BbBaQPDwEJrRGZwXLO -payment.toss.success_url=http://localhost:8080/api/v1/order/toss/success -payment.toss.fail_url=http://localhost:8080/api/v1/order/toss/fail +payment.toss.success_url=http://localhost:3000/payment/success +payment.toss.fail_url=http://localhost:3000/payment/fail