Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 결제 이름 수정 #100

Merged
merged 2 commits into from
Nov 26, 2023
Merged

Fix: 결제 이름 수정 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092c2e1
Fix: 결제 이름 수정
marinesnow34 Nov 26, 2023
8304842
Fix: 성공,실패 url 변경
marinesnow34 Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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