Skip to content

Commit 17fd8ba

Browse files
committed
fix: Member 엔티티 필드 Point로 통합
1 parent 8c01f58 commit 17fd8ba

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/main/java/_ITHON/ReturnZone/domain/member/entity/Member.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ public class Member {
5151
@Column(nullable = false)
5252
private BigDecimal totalPoint = BigDecimal.ZERO;
5353

54-
@Column(nullable = false)
55-
private BigDecimal exchangeablePoint = BigDecimal.ZERO;
56-
5754
public Member(SignupRequestDto signupRequestDto, String encodedPassword) {
5855
this.email = signupRequestDto.getEmail();
5956
this.username = signupRequestDto.getUsername();

src/main/java/_ITHON/ReturnZone/domain/payment/PaymentService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public void payReward(Long payerId, Long receiverId, BigDecimal rewardAmount) {
3737
// 지급자 포인트 차감
3838
payer.setTotalPoint(payer.getTotalPoint().subtract(rewardAmount));
3939
// 환전 가능 포인트는 총 포인트보다 많을 수 없으므로 조정 (음수 방지)
40-
payer.setExchangeablePoint(payer.getExchangeablePoint().min(payer.getTotalPoint()));
41-
if (payer.getExchangeablePoint().compareTo(BigDecimal.ZERO) < 0) {
42-
payer.setExchangeablePoint(BigDecimal.ZERO);
40+
payer.setPoint(payer.getPoint().min(payer.getTotalPoint()));
41+
if (payer.getPoint().compareTo(BigDecimal.ZERO) < 0) {
42+
payer.setPoint(BigDecimal.ZERO);
4343
}
4444

4545

4646
// 수령자 포인트 적립
4747
receiver.setTotalPoint(receiver.getTotalPoint().add(rewardAmount));
48-
receiver.setExchangeablePoint(receiver.getExchangeablePoint().add(rewardAmount));
48+
receiver.setPoint(receiver.getPoint().add(rewardAmount));
4949

5050
memberRepository.save(payer);
5151
memberRepository.save(receiver);
@@ -64,7 +64,7 @@ public void addPoints(Long memberId, BigDecimal points) { // BigDecimal로 변
6464
.orElseThrow(() -> new IllegalArgumentException("회원 정보를 찾을 수 없습니다."));
6565

6666
member.setTotalPoint(member.getTotalPoint().add(points));
67-
member.setExchangeablePoint(member.getExchangeablePoint().add(points));
67+
member.setPoint(member.getPoint().add(points));
6868

6969
memberRepository.save(member);
7070

0 commit comments

Comments
 (0)