#0

src/main/java/devut/buzzerbidder/domain/deal/service/LiveDealService.java

@@ -17,6 +17,7 @@
 import devut.buzzerbidder.domain.user.entity.User;
 import devut.buzzerbidder.domain.user.repository.DeliveryAddressRepository;
 import devut.buzzerbidder.domain.user.service.UserService;
+import devut.buzzerbidder.domain.wallet.enums.WalletTransactionType;
 import devut.buzzerbidder.domain.wallet.service.WalletService;
 import devut.buzzerbidder.global.exeption.BusinessException;
 import devut.buzzerbidder.global.exeption.ErrorCode;
@@ -155,7 +156,7 @@ public void completePayment(User currentUser, Long dealId) {
         User seller = userService.findById(deal.getItem().getSellerUserId());
 
         // Wallet에서 잔금 이체 (구매자 -> 판매자)
-        walletService.transferBizz(currentUser, seller, remainingAmount);
+        walletService.transferBizz(currentUser, seller, remainingAmount, WalletTransactionType.PAY_SETTLEMENT);
 
         // Deal 상태 변경
         deal.updateStatus(DealStatus.PAID);

src/main/java/devut/buzzerbidder/domain/liveBid/service/LiveBidService.java

@@ -108,13 +108,6 @@ private LiveBidResponse handleBidResult(
                 walletService.refundBidBizz(bidder, depositAmount);
             }
 
-            walletHistoryService.recordWalletHistory(
-                    bidder,
-                    depositAmount,
-                    WalletTransactionType.BID,
-                    balanceBefore,
-                    balanceAfter
-            );
             walletHistoryService.recordWalletHistory(
                     bidder,
                     depositAmount,

src/main/java/devut/buzzerbidder/domain/liveitem/service/LiveItemService.java

@@ -672,9 +672,8 @@ public void endAuction(Long itemId) {
                 }
             }
 
-            User buyer = userService.findById(currentBidderId);
             User seller = userService.findById(liveItem.getSellerUserId());
-            walletService.transferBizz(buyer, seller, winnerDeposit);
+            walletService.receiveDeposit(seller, winnerDeposit);
 
             liveDealService.createDeal(itemId, currentBidderId, maxBidPrice, winnerDeposit);
         }

src/main/java/devut/buzzerbidder/domain/wallet/enums/WalletTransactionType.java

@@ -8,18 +8,23 @@
 public enum WalletTransactionType {
 
     // 증가 계열
-    CHARGE(true),              // 충전
-    REFUND(true),              // 취소/실패 환불
-    BID_REFUND(true),          // 입찰 실패 시 환불
-    RECEIVE_FROM_USER(true),   // 다른 유저에게서 받음,
-    DEAL_SETTLEMENT(true),     // 경매/즉시구매 판매자 정산
-    ADMIN_GRANT(true),         // 관리자 지급
+    CHARGE(true),               // 충전
+    RECEIVE_FROM_USER(true),    // 다른 유저에게서 받음,
+    BID_REFUND(true),           // 입찰 실패 시 환불
+    RECIEVE_DEPOSIT(true),      // 보증금 수령
+    REFUND(true),               // 취소/실패 환불
+    RECEIVE_SETTLEMENT(true),   // 경매 정산 받기
+    ADMIN_GRANT(true),          // 관리자 지급
 
     // 감소 계열
     PAY_TO_USER(false),         // 다른 유저에게 보냄
-    BID(false),            // 입찰 시 코인 차감
+    BID(false),                 // 입찰 시 코인 차감
     WITHDRAW(false),            // 출금
-    ADMIN_DEDUCT(false);        // 관리자 차감
+    PAY_SETTLEMENT(false),      // 경매 정산 하기
+    ADMIN_DEDUCT(false),
+
+    // 안 쓰는 값(DB에는 남아있기 때문에 지우지 않음)
+    DEAL_SETTLEMENT(true);
 
     private final boolean isIncrease;
 }

src/main/java/devut/buzzerbidder/domain/wallet/service/WalletService.java

@@ -112,11 +112,15 @@ public void refundBidBizz(User user, Long amount) {
 
     // 경매/즉시구매 거래 완료시 판매자 정산
     public void settleDealToSeller(User seller, Long amount) {
-        changeBizz(seller, amount, WalletTransactionType.DEAL_SETTLEMENT);
+        changeBizz(seller, amount, WalletTransactionType.RECEIVE_SETTLEMENT);
+    }
+
+    public void receiveDeposit(User user, Long amount) {
+        changeBizz(user, amount, WalletTransactionType.RECIEVE_DEPOSIT);
     }
 
     // A유저 -> B유저 송금
-    public void transferBizz(User fromUser, User toUser, Long amount) {
+    public void transferBizz(User fromUser, User toUser, Long amount, WalletTransactionType sendType) {
         if (fromUser == null || toUser == null) {
             throw new BusinessException(ErrorCode.USER_NOT_FOUND);
         }
@@ -126,6 +130,12 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
             throw new BusinessException(ErrorCode.INVALID_TRANSFER);
         }
 
+        WalletTransactionType receiveType = switch(sendType) {
+            case PAY_SETTLEMENT -> receiveType = WalletTransactionType.RECEIVE_SETTLEMENT;
+            case PAY_TO_USER ->  receiveType = WalletTransactionType.RECEIVE_FROM_USER;
+            default -> throw new BusinessException(ErrorCode.INVALID_WALLET_TRANSACTION_TYPE);
+        };
+
         Long fromId = fromUser.getId();
         Long toId = toUser.getId();
 
@@ -142,16 +152,16 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
             // 지갑 히스토리 남기기
             Long fromBalanceBefore = r.fromBefore();
             Long frombalanceAfter = r.fromAfter();
-            walletHistoryService.recordWalletHistory(fromUser, amount, WalletTransactionType.PAY_TO_USER, fromBalanceBefore, frombalanceAfter);
+            walletHistoryService.recordWalletHistory(fromUser, amount, sendType, fromBalanceBefore, frombalanceAfter);
             Long toBalanceBefore = r.toBefore();
             Long tobalanceAfter = r.toAfter();
-            walletHistoryService.recordWalletHistory(toUser, amount, WalletTransactionType.RECEIVE_FROM_USER, toBalanceBefore, tobalanceAfter);
+            walletHistoryService.recordWalletHistory(toUser, amount, receiveType, toBalanceBefore, tobalanceAfter);
             return;
         }
 
         // 둘 다 DB => DB 처리
         if (!fromRedis && !toRedis) {
-            transferDbFallback(fromUser, toUser, amount);
+            transferDbFallback(fromUser, toUser, amount, sendType, receiveType);
             return;
         }
 
@@ -161,14 +171,14 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
                     walletRedisService.changeBizzIfPresent(fromId, amount, false, "TransferBizz_OUT", null);
 
             if (!out.hit()) {
-                transferDbFallback(fromUser, toUser, amount);
+                transferDbFallback(fromUser, toUser, amount, sendType, receiveType);
                 return;
             }
 
             try {
                 // 1) DB 입금 시도
                 Wallet toWallet = findByUserIdWithLockOrThrow(toId);
-                updateBizzAndRecordHistory(toWallet, toUser, amount, WalletTransactionType.RECEIVE_FROM_USER);
+                updateBizzAndRecordHistory(toWallet, toUser, amount, receiveType);
 
                 // 2) "DB입금 성공 이후에만" 롤백 훅 등록
                 runAfterRollback(() -> {
@@ -192,7 +202,7 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
             // 히스토리
             Long fromBalanceBefore = out.before();
             Long fromBalanceAfter = out.after();
-            walletHistoryService.recordWalletHistory(fromUser, amount, WalletTransactionType.PAY_TO_USER, fromBalanceBefore, fromBalanceAfter);
+            walletHistoryService.recordWalletHistory(fromUser, amount, sendType, fromBalanceBefore, fromBalanceAfter);
 
             return;
         }
@@ -201,7 +211,7 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
         if (!fromRedis && toRedis) {
             // DB 차감
             Wallet fromWallet = findByUserIdWithLockOrThrow(fromId);
-            updateBizzAndRecordHistory(fromWallet, fromUser, amount, WalletTransactionType.PAY_TO_USER);
+            updateBizzAndRecordHistory(fromWallet, fromUser, amount, sendType);
 
             // to는 Redis가 진실이므로 Redis에 입금
             WalletRedisService.RedisBizzChangeResult in =
@@ -214,7 +224,7 @@ public void transferBizz(User fromUser, User toUser, Long amount) {
 
             Long toBalanceBefore = in.before();
             Long toBalanceAfter = in.after();
-            walletHistoryService.recordWalletHistory(toUser, amount, WalletTransactionType.RECEIVE_FROM_USER, toBalanceBefore, toBalanceAfter);
+            walletHistoryService.recordWalletHistory(toUser, amount, receiveType, toBalanceBefore, toBalanceAfter);
 
             // 롤백되면 Redis 입금 되돌리기
             runAfterRollback(() -> {
@@ -269,7 +279,7 @@ public HistoriesPageResponseDto getHistories(Long userId, int page) {
 
     /* ==================== 이 밑으로는 헬퍼 메서드 ==================== */
 
-    private void transferDbFallback(User fromUser, User toUser, Long amount) {
+    private void transferDbFallback(User fromUser, User toUser, Long amount, WalletTransactionType sendType, WalletTransactionType receiveType) {
         // ID 순서대로 락 획득하여 데드락 방지
         Long smallerId = Math.min(fromUser.getId(), toUser.getId());
         Long largerId = Math.max(fromUser.getId(), toUser.getId());
@@ -284,8 +294,8 @@ private void transferDbFallback(User fromUser, User toUser, Long amount) {
                 ? firstWallet : secondWallet;
 
         // 송금 실행
-        updateBizzAndRecordHistory(fromWallet, fromUser, amount, WalletTransactionType.PAY_TO_USER);
-        updateBizzAndRecordHistory(toWallet, toUser, amount, WalletTransactionType.RECEIVE_FROM_USER);
+        updateBizzAndRecordHistory(fromWallet, fromUser, amount, sendType);
+        updateBizzAndRecordHistory(toWallet, toUser, amount, receiveType);
     }
 
     /** 트랜잭션이 "롤백"으로 끝나면 실행할 보상 로직 */