Skip to content

Feat/trade core #163

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

Merged
caniro merged 2 commits into from
Jun 13, 2025
Merged

Feat/trade core #163

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
99ded72
add: 봇 자산 초기화 시 주문, 체결과 동일하게 트랜잭션 격리 수준 변경(Read Committed)
caniro Jun 13, 2025
2229a56
fix: Deadlock 방지를 위한 account 접근 순서 변경
caniro Jun 13, 2025
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
7 changes: 4 additions & 3 deletions src/main/java/com/cleanengine/coin/trade/application/TradeExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,16 @@ public void executeTrade(WaitingOrders waitingOrders, TradePair<Order, Order> tr
tradeService.updateOrder(sellOrder);

// 예수금 처리
// - 매도 예수금 처리
this.increaseAccountCash(sellOrder, totalTradedPrice);

// - 매수 잔여금액 반환
if (!isMarketOrder(buyOrder) && buyOrder.getPrice() > tradedPrice) { // 매도 호가보다 높은 가격에 매수를 시도한 경우, 차액 반환
log.debug("[{}] 매도 호가보다 높은 가격에 매수를 시도한 경우, 차액 반환", Thread.currentThread().threadId());
double totalRefundAmount = (buyOrder.getPrice() - tradedPrice) * tradedSize;
this.increaseAccountCash(buyOrder, totalRefundAmount);
}

// - 매도 예수금 처리
this.increaseAccountCash(sellOrder, totalTradedPrice);

// 지갑 누적계산
this.updateWalletAfterTrade(buyOrder, ticker, tradedSize, totalTradedPrice);
this.updateWalletAfterTrade(sellOrder, ticker, tradedSize, totalTradedPrice);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/cleanengine/coin/user/info/application/AccountService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.cleanengine.coin.user.info.infra.WalletRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;

import java.util.Optional;
Expand Down Expand Up @@ -38,7 +39,7 @@ public Account createNewAccount(Integer userId, double cash) {
return accountRepository.save(account);
}

@Transactional
@Transactional(isolation = Isolation.READ_COMMITTED)
public void resetBot(String ticker) {
Account sellBotAccount = accountRepository.findByUserId(SELL_ORDER_BOT_ID).orElseThrow();
sellBotAccount.setCash(0.0);
Expand Down
Loading