From af8558dd3376fa2ac0674a9b9792aecb7a00342f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 14:42:08 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 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 13940f2..2df1c07 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,12 +33,15 @@
import com.xcong.excoin.modules.otc.vo.EntrustListVo;
import com.xcong.excoin.modules.otc.vo.EntrustOrderDetailVo;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import netscape.javascript.JSObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
+@Slf4j
@Service
@RequiredArgsConstructor
public class OtcEntrustOrderServiceImpl extends ServiceImpl<OtcEntrustOrderDao, OtcEntrustOrder> implements OtcEntrustOrderService {
@@ -70,30 +74,22 @@
BigDecimal totalAmount = addDto.getUnitPrice().multiply(addDto.getAmount());
otcEntrustOrder.setTotalAmount(totalAmount);
- if (addDto.getMax().compareTo(totalAmount) < 0) {
+ if (totalAmount.compareTo(addDto.getMax()) < 0) {
throw new GlobalException("最大限额应小于总金额");
}
if (OtcEntrustOrder.ORDER_TYPE_S.equals(addDto.getType())) {
MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
- if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {
+// BigDecimal multiply = addDto.getUnitPrice().multiply(coinWallet.getAvailableBalance());
+ if(coinWallet.getAvailableBalance().compareTo(addDto.getAmount()) < 0) {
throw new GlobalException("可用金额不足");
}
memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
}
- OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
- if (mb == null) {
- OtcMarketBussiness otcMb = new OtcMarketBussiness();
- otcMb.setMemberId(member.getId());
- otcMb.setAvgCoinTime(0);
- otcMb.setAvgPayTime(0);
- otcMb.setTotalOrderCnt(0);
- otcMb.setBuyCnt(0);
- otcMb.setFinishRatio(BigDecimal.ZERO);
- otcMb.setStatus(OtcMarketBussiness.CHECK_PASS);
- otcMarketBussinessDao.insert(otcMb);
+ if (!MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
+ throw new GlobalException("不是市商");
}
if (member.getIsTrader() == 2) {
@@ -160,10 +156,10 @@
public IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
Page<EntrustListVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
- List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
- if (CollUtil.isNotEmpty(blackLists)) {
+// List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
+// if (CollUtil.isNotEmpty(blackLists)) {
dto.setMemberId(member.getId());
- }
+// }
return this.baseMapper.selectEntrustListInPage(dto, page);
}
@@ -200,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();
--
Gitblit v1.9.1