From 98f8b079822227d46b0f0de7445dd46dc42c073e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 17:55:41 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 13 ++-----------
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 33 ++++++++++++++++++++++-----------
2 files changed, 24 insertions(+), 22 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 62304eb..6d4d740 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
@@ -83,17 +83,8 @@
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) {
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
index 72d212c..66fbe07 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
@@ -31,22 +31,33 @@
@Override
public void add() {
MemberEntity member = LoginUserUtils.getAppLoginUser();
+ member = memberDao.selectById(member.getId());
- OtcMarketBussiness mb = this.baseMapper.selectMarketBussinessByMemberId(member.getId());
- if (mb != null) {
- throw new GlobalException("该用户已经是市商或正在审核");
+ if (MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
+ throw new GlobalException("已经是市商");
}
+ OtcMarketBussiness mb = this.baseMapper.selectMarketBussinessByMemberId(member.getId());
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_WAIT);
+ if (mb != null) {
+ if (OtcMarketBussiness.CHECK_PASS.equals(mb.getStatus()) || OtcMarketBussiness.CHECK_WAIT.equals(mb.getStatus())) {
+ throw new GlobalException("已经是市商或正在审核");
+ }
- this.baseMapper.insert(otcMb);
+ otcMb = mb;
+ otcMb.setStatus(OtcMarketBussiness.CHECK_WAIT);
+ this.baseMapper.updateById(otcMb);
+ } else {
+ otcMb.setMemberId(member.getId());
+ otcMb.setAvgCoinTime(0);
+ otcMb.setAvgPayTime(0);
+ otcMb.setTotalOrderCnt(0);
+ otcMb.setBuyCnt(0);
+ otcMb.setFinishRatio(BigDecimal.ZERO);
+ otcMb.setStatus(OtcMarketBussiness.CHECK_WAIT);
+
+ this.baseMapper.insert(otcMb);
+ }
}
@Override
--
Gitblit v1.9.1