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

Feat: 주문 번호 구현 #74

Merged
merged 1 commit into from
Nov 25, 2023
Merged

Feat: 주문 번호 구현 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/main/java/com/readyvery/readyverydemo/domain/repository/OrdersRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
package com.readyvery.readyverydemo.domain.repository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;

import com.readyvery.readyverydemo.domain.Order;
import com.readyvery.readyverydemo.domain.Progress;
import com.readyvery.readyverydemo.domain.UserInfo;

public interface OrdersRepository extends JpaRepository<Order, Long> {
Optional<Order> findByOrderId(String orderId);

Optional<List<Order>> findAllByUserInfo(UserInfo userInfo);

Long countByCreatedAtBetweenAndProgressNot(LocalDateTime localDateTime, LocalDateTime localDateTime1,
Progress progress);
}
12 changes: 11 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 @@ -291,11 +291,21 @@ private void applyOrderFail(Order order) {
}

private void applyTosspaymentDto(Order order, TosspaymentDto tosspaymentDto) {
//TODO: orderNumber 적용
order.setOrderNumber(getOrderNumber(order));
order.setPaymentKey(tosspaymentDto.getPaymentKey());
order.setMethod(tosspaymentDto.getMethod());
order.setProgress(Progress.ORDER);
order.setPayStatus(true);
order.getCart().setIsOrdered(true);
}

private String getOrderNumber(Order order) {
long todayOrder = ordersRepository.countByCreatedAtBetweenAndProgressNot(
order.getCreatedAt().toLocalDate().atStartOfDay(),
order.getCreatedAt().toLocalDate().atTime(23, 59, 59),
Progress.REQUEST
) + 1;
return Long.toString(todayOrder);
}

private void verifyOrder(Order order, Long amount) {
Expand Down