From b289b531521f3f3e67b1ca0251c75e41e51fc88f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 16 Mar 2022 17:00:12 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index a7c1c69..684578f 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -110,6 +110,7 @@
     public void modify(EntrustOrderAddDto modifyDto) {
         MemberEntity member = LoginUserUtils.getAppLoginUser();
         OtcEntrustOrder otcEntrustOrder = OtcEntrustOrderMapper.INSTANCE.entrustOrderDtoToEntity(modifyDto);
+        BigDecimal remainAmount = otcEntrustOrder.getRemainCoinAmount();
         otcEntrustOrder.setMemberId(member.getId());
 
         otcEntrustOrder.setRemainCoinAmount(modifyDto.getAmount());
@@ -139,13 +140,14 @@
         otcEntrustOrder.setTotalAmount(totalAmount);
         if (OtcEntrustOrder.ORDER_TYPE_S.equals(modifyDto.getType())) {
             MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
-            coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().add(coinWallet.getFrozenBalance()));
+            coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().add(remainAmount));
             if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {
                 throw new GlobalException("可用金额不足");
             }
 
+            BigDecimal frozen = coinWallet.getFrozenBalance().subtract(remainAmount);
             coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().subtract(totalAmount));
-            coinWallet.setFrozenBalance(totalAmount);
+            coinWallet.setFrozenBalance(frozen.add(totalAmount));
             memberWalletCoinDao.updateById(coinWallet);
         }
 

--
Gitblit v1.9.1