From 0d30c93d000413c6eb34f489ef17688ad4175201 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 29 Apr 2024 18:18:21 +0800
Subject: [PATCH] 55测试环境
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 07a6a0c..a7c1c69 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
@@ -78,7 +78,6 @@
throw new GlobalException("最大限额应小于总金额");
}
- log.info("----->>>{}", JSONObject.toJSONString(addDto));
if (OtcEntrustOrder.ORDER_TYPE_S.equals(addDto.getType())) {
MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
// BigDecimal multiply = addDto.getUnitPrice().multiply(coinWallet.getAvailableBalance());
@@ -86,8 +85,7 @@
throw new GlobalException("可用金额不足");
}
- int i =memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
- log.info("=========>{}", i);
+ memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
}
if (!MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
@@ -198,7 +196,7 @@
if (OtcEntrustOrder.ORDER_TYPE_S.equals(otcEntrustOrder.getOrderType())) {
MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
- memberWalletCoinDao.subFrozenBalance(member.getId(), wallet.getId(), wallet.getFrozenBalance());
+ memberWalletCoinDao.subFrozenBalance(member.getId(), wallet.getId(), otcEntrustOrder.getRemainCoinAmount());
}
otcEntrustOrder = new OtcEntrustOrder();
@@ -219,8 +217,13 @@
OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
EntrustOrderDetailVo detail = OtcEntrustOrderMapper.INSTANCE.entityToOrderDetail(otcEntrustOrder);
detail.setName(member.getName());
- detail.setOrderCnt(mb.getBuyCnt());
- detail.setFinishRatio(mb.getFinishRatio());
+ if (OtcEntrustOrder.ORDER_TYPE_S.equals(otcEntrustOrder.getOrderType())) {
+ detail.setOrderCnt(mb.getSaleOrderCnt());
+ detail.setFinishRatio(mb.getSaleFinishRatio());
+ } else {
+ detail.setOrderCnt(mb.getBuyOrderCnt());
+ detail.setFinishRatio(mb.getFinishRatio());
+ }
detail.setPayType(defualtMethod.getPaymentType());
return Result.ok(detail);
}
--
Gitblit v1.9.1