Merge pull request #100 from marinesnow34/name

Fix: 결제 이름 수정
readyvery · Nov 26, 2023 · 7fd2c84 · 7fd2c84
2 parents a09adab + 8304842
commit 7fd2c84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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)

diff --git 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