Skip to content

Commit 0fb97d7

Browse files
authored
Merge pull request #168 from prgrms-web-devcourse-final-project/feat#167
[Feat]: 결제 성공 시 상태 전이
2 parents 94c3a3b + d8e97f5 commit 0fb97d7

File tree

19 files changed

+55
-28
lines changed

19 files changed

+55
-28
lines changed

src/main/java/com/backend/domain/bid/service/BidPaymentService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.backend.domain.bid.dto.BidPayResponseDto;
44
import com.backend.domain.bid.entity.Bid;
5+
import com.backend.domain.bid.enums.BidStatus;
56
import com.backend.domain.bid.repository.BidRepository;
7+
import com.backend.domain.cash.enums.RelatedType;
68
import com.backend.domain.cash.service.CashService;
79
import com.backend.domain.member.entity.Member;
810
import com.backend.domain.product.entity.Product;
@@ -79,19 +81,21 @@ private RsData<BidPayResponseDto> processPayment(Bid bid, Member bidder, Product
7981
var tx = cashService.withdraw(
8082
bidder,
8183
finalPrice,
82-
com.backend.domain.cash.constant.RelatedType.BID,
84+
RelatedType.BID,
8385
bid.getId()
8486
);
8587

8688
// 결제 기록
8789
bid.setPaidAt(LocalDateTime.now());
8890
bid.setPaidAmount(finalPrice);
91+
bid.setStatus(BidStatus.PAID);
92+
product.setStatus("결제 완료");
8993

9094
// 응답
9195
BidPayResponseDto response = new BidPayResponseDto(
9296
bid.getId(),
9397
product.getId(),
94-
finalPrice,
98+
finalPrice, // 낙찰/결제 금액..
9599
bid.getPaidAt(),
96100
tx.getId(),
97101
tx.getBalanceAfter()

src/main/java/com/backend/domain/cash/entity/CashTransaction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backend.domain.cash.entity;
22

3-
import com.backend.domain.cash.constant.CashTxType;
4-
import com.backend.domain.cash.constant.RelatedType;
3+
import com.backend.domain.cash.enums.CashTxType;
4+
import com.backend.domain.cash.enums.RelatedType;
55
import com.backend.global.jpa.entity.BaseEntity;
66
import jakarta.persistence.*;
77
import lombok.*;

src/main/java/com/backend/domain/cash/constant/CashTxType.java renamed to src/main/java/com/backend/domain/cash/enums/CashTxType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.backend.domain.cash.constant;
1+
package com.backend.domain.cash.enums;
22

33
public enum CashTxType {
44
DEPOSIT, // 입금(돈 들어옴)..

src/main/java/com/backend/domain/cash/constant/RelatedType.java renamed to src/main/java/com/backend/domain/cash/enums/RelatedType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.backend.domain.cash.constant;
1+
package com.backend.domain.cash.enums;
22

33
public enum RelatedType {
44
PAYMENT,

src/main/java/com/backend/domain/cash/repository/CashTransactionRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.backend.domain.cash.repository;
22

3-
import com.backend.domain.cash.constant.RelatedType;
3+
import com.backend.domain.cash.enums.RelatedType;
44
import com.backend.domain.cash.entity.Cash;
55
import com.backend.domain.cash.entity.CashTransaction;
66
import org.springframework.data.domain.Page;

src/main/java/com/backend/domain/cash/service/CashService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.backend.domain.cash.service;
22

33
import com.backend.domain.bid.repository.BidRepository;
4-
import com.backend.domain.cash.constant.CashTxType;
5-
import com.backend.domain.cash.constant.RelatedType;
4+
import com.backend.domain.cash.enums.CashTxType;
5+
import com.backend.domain.cash.enums.RelatedType;
66
import com.backend.domain.cash.dto.CashResponse;
77
import com.backend.domain.cash.dto.CashTransactionItemResponse;
88
import com.backend.domain.cash.dto.CashTransactionResponse;
@@ -20,7 +20,6 @@
2020
import org.springframework.transaction.annotation.Transactional;
2121
import org.springframework.web.server.ResponseStatusException;
2222

23-
import java.time.Instant;
2423
import java.time.format.DateTimeFormatter;
2524
import java.util.List;
2625

src/main/java/com/backend/domain/payment/entity/Payment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backend.domain.payment.entity;
22

33
import com.backend.domain.member.entity.Member;
4-
import com.backend.domain.payment.constant.PaymentStatus;
4+
import com.backend.domain.payment.enums.PaymentStatus;
55
import com.backend.global.jpa.entity.BaseEntity;
66
import jakarta.persistence.*;
77
import lombok.*;

src/main/java/com/backend/domain/payment/entity/PaymentMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backend.domain.payment.entity;
22

33
import com.backend.domain.member.entity.Member;
4-
import com.backend.domain.payment.constant.PaymentMethodType;
4+
import com.backend.domain.payment.enums.PaymentMethodType;
55
import com.backend.global.jpa.entity.BaseEntity;
66
import jakarta.persistence.*;
77
import lombok.*;

src/main/java/com/backend/domain/payment/constant/PaymentMethodType.java renamed to src/main/java/com/backend/domain/payment/enums/PaymentMethodType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.backend.domain.payment.constant;
1+
package com.backend.domain.payment.enums;
22

33
public enum PaymentMethodType {
44
CARD, // 카드..

src/main/java/com/backend/domain/payment/constant/PaymentStatus.java renamed to src/main/java/com/backend/domain/payment/enums/PaymentStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.backend.domain.payment.constant;
1+
package com.backend.domain.payment.enums;
22

33
public enum PaymentStatus {
44
PENDING, // 아직 처리 중..

0 commit comments

Comments
 (0)