From 5fce1d858346c23417d926a7893950f80e3fc670 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Jun 2020 10:33:44 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 121 ++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index 7d610ce..8fff3e0 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -13,9 +13,12 @@
import javax.annotation.Resource;
import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;
+import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;
+
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.enumerates.MemberWalletCoinEnum;
@@ -41,6 +44,7 @@
import com.xcong.excoin.modules.member.entity.MemberSelectSymbolsEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.platform.dao.PlatformCnyUsdtExchangeDao;
+import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
import com.xcong.excoin.modules.platform.dao.TradeSettingDao;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.utils.CoinTypeConvert;
@@ -71,6 +75,8 @@
MemberAccountFlowEntityDao memberAccountFlowEntityDao;
@Resource
RedisUtils redisUtils;
+ @Resource
+ PlatformSymbolsCoinDao platformSymbolsCoinDao;
@Override
public String generateSimpleSerialno(String userId) {
@@ -197,15 +203,15 @@
order.setOrderNo(generateSimpleSerialno(memberId.toString()));
order.setOrderType(type);
order.setSymbol(symbol);
- order.setMarkPrice(nowPrice.setScale(4, BigDecimal.ROUND_DOWN));
- order.setEntrustCnt(amount.setScale(4, BigDecimal.ROUND_DOWN));
- order.setEntrustPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealCnt(amount.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealAmount(totalPayPrice.setScale(4, BigDecimal.ROUND_DOWN));
+ order.setMarkPrice(nowPrice);
+ order.setEntrustCnt(amount);
+ order.setEntrustPrice(price);
+ order.setDealCnt(amount);
+ order.setDealPrice(price);
+ order.setDealAmount(totalPayPrice);
order.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_DODING);
order.setTradeType(tradeType);
- order.setFeeAmount(closingPrice.setScale(4, BigDecimal.ROUND_DOWN));
+ order.setFeeAmount(closingPrice);
orderCoinsDao.insert(order);
//更新用户钱包信息
@@ -214,15 +220,15 @@
//如果是买入，所对应的币种增加，USDT账户减少金额
BigDecimal availableBalance = walletCoinUsdt.getAvailableBalance().subtract(totalPayPrice);
BigDecimal frozenBalance = walletCoinUsdt.getFrozenBalance().add(totalPayPrice);
- walletCoinUsdt.setAvailableBalance(availableBalance.setScale(4, BigDecimal.ROUND_DOWN));
- walletCoinUsdt.setFrozenBalance(frozenBalance.setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoinUsdt.setAvailableBalance(availableBalance);
+ walletCoinUsdt.setFrozenBalance(frozenBalance);
memberWalletCoinDao.updateById(walletCoinUsdt);
}else {
//如果是卖出，币种减少，USDT增加
BigDecimal availableBalance = walletCoin.getAvailableBalance().subtract(amount);
BigDecimal frozenBalance = walletCoin.getFrozenBalance().add(amount);
- walletCoin.setAvailableBalance(availableBalance.setScale(4, BigDecimal.ROUND_DOWN));
- walletCoin.setFrozenBalance(frozenBalance.setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoin.setAvailableBalance(availableBalance);
+ walletCoin.setFrozenBalance(frozenBalance);
memberWalletCoinDao.updateById(walletCoin);
}
} else {
@@ -231,15 +237,15 @@
order.setOrderNo(generateSimpleSerialno(memberId.toString()));
order.setOrderType(type);
order.setSymbol(symbol);
- order.setMarkPrice(nowPrice.setScale(4, BigDecimal.ROUND_DOWN));
- order.setEntrustCnt(amount.setScale(4, BigDecimal.ROUND_DOWN));
- order.setEntrustPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealCnt(amount.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- order.setDealAmount(totalPayPrice.setScale(4, BigDecimal.ROUND_DOWN));
+ order.setMarkPrice(nowPrice);
+ order.setEntrustCnt(amount);
+ order.setEntrustPrice(price);
+ order.setDealCnt(amount);
+ order.setDealPrice(price);
+ order.setDealAmount(totalPayPrice);
order.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_DONE);
order.setTradeType(tradeType);
- order.setFeeAmount(closingPrice.setScale(4, BigDecimal.ROUND_DOWN));
+ order.setFeeAmount(closingPrice);
orderCoinsDao.insert(order);
OrderCoinsDealEntity detail = new OrderCoinsDealEntity();
@@ -249,29 +255,29 @@
detail.setOrderType(type);
detail.setTradeType(tradeType);
detail.setSymbol(symbol);
- detail.setSymbolCnt(amount.setScale(4, BigDecimal.ROUND_DOWN));
- detail.setEntrustPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- detail.setDealPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
- detail.setDealAmount(totalPayPrice.setScale(4, BigDecimal.ROUND_DOWN));
- detail.setFeeAmount(closingPrice.setScale(4, BigDecimal.ROUND_DOWN));
+ detail.setSymbolCnt(amount);
+ detail.setEntrustPrice(price);
+ detail.setDealPrice(price);
+ detail.setDealAmount(totalPayPrice);
+ detail.setFeeAmount(closingPrice);
detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_DONE);
orderCoinDealDao.insert(detail);
if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) {
//如果是买入，所对应的币种增加，USDT账户减少金额
// 更新用户的可用金额
- walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(amount).setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(amount));
memberWalletCoinDao.updateById(walletCoin);
- walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().subtract(totalPayPrice).setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().subtract(totalPayPrice));
memberWalletCoinDao.updateById(walletCoinUsdt);
}else {
//如果是卖出，币种减少，USDT增加
- walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().subtract(amount).setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().subtract(amount));
memberWalletCoinDao.updateById(walletCoin);
BigDecimal subtract = totalPayPrice.subtract(closingPrice).subtract(closingPrice);
- walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(subtract).setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(subtract));
memberWalletCoinDao.updateById(walletCoinUsdt);
}
}
@@ -281,14 +287,14 @@
if (OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) {
record.setPrice(totalPayPrice.setScale(4, BigDecimal.ROUND_DOWN));
record.setSource(MemberAccountFlowEntity.SOURCE_BUY+symbol);
- record.setRemark(MemberAccountFlowEntity.REMARK_BUY+symbol+":"+amount.setScale(4, BigDecimal.ROUND_DOWN));
+ record.setRemark(MemberAccountFlowEntity.REMARK_BUY+symbol+":"+amount);
} else {
record.setPrice(totalPayPrice.negate().setScale(4, BigDecimal.ROUND_DOWN));
record.setSource(MemberAccountFlowEntity.SOURCE_SALE+symbol);
- record.setRemark(MemberAccountFlowEntity.REMARK_SALE+symbol+":"+amount.setScale(4, BigDecimal.ROUND_DOWN));
+ record.setRemark(MemberAccountFlowEntity.REMARK_SALE+symbol+":"+amount);
}
record.setSymbol(symbol);
- record.setBalance(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ record.setBalance(walletCoinUsdt.getAvailableBalance());
memberAccountFlowEntityDao.insert(record);
@@ -337,10 +343,10 @@
detail.setSymbol(symbol);
detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_CANCEL);
detail.setSymbolCnt(orderCoinsEntity.getEntrustCnt());
- detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice().setScale(4, BigDecimal.ROUND_DOWN));
- detail.setDealPrice(orderCoinsEntity.getDealPrice().setScale(4, BigDecimal.ROUND_DOWN));
- detail.setDealAmount(orderCoinsEntity.getDealAmount().setScale(4, BigDecimal.ROUND_DOWN));
- detail.setFeeAmount(orderCoinsEntity.getFeeAmount().setScale(4, BigDecimal.ROUND_DOWN));
+ detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice());
+ detail.setDealPrice(orderCoinsEntity.getDealPrice());
+ detail.setDealAmount(orderCoinsEntity.getDealAmount());
+ detail.setFeeAmount(orderCoinsEntity.getFeeAmount());
orderCoinDealDao.insert(detail);
if(OrderCoinsEntity.ORDERTYPE_BUY.equals(orderCoinsEntity.getOrderType())) {
@@ -353,14 +359,14 @@
//返还金额=开仓价*未成交数量+手续费
BigDecimal returnBalance = orderCoinsEntity.getDealAmount();
- walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));
- walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));
+ walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance));
+ walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance));
memberWalletCoinDao.updateById(walletCoin);
// 流水记录
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
record.setSource(MemberAccountFlowEntity.SOURCE_CANCEL);
record.setRemark(MemberAccountFlowEntity.REMARK_CANCEL+symbol+MemberAccountFlowEntity.REMARK_RETURNBALANCE+returnBalance);
- record.setBalance(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ record.setBalance(walletCoin.getAvailableBalance());
record.setMemberId(memberId);
record.setSymbol(symbol);
record.setPrice(returnBalance);
@@ -371,19 +377,19 @@
//如果是限价卖出，撤单将对应的钱包冻结金额返回
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
if (ObjectUtil.isNotEmpty(walletCoin)) {
- //返还金额=开仓价*未成交数量
- BigDecimal returnBalance = orderCoinsEntity.getDealAmount();
- walletCoin.setAvailableBalance(returnBalance.setScale(4, BigDecimal.ROUND_DOWN));
- walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));
+
+ BigDecimal returnBalance = orderCoinsEntity.getEntrustCnt();
+ walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance));
+ walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance));
memberWalletCoinDao.updateById(walletCoin);
// 流水记录
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
record.setSource(MemberAccountFlowEntity.SOURCE_CANCEL);
record.setRemark(MemberAccountFlowEntity.REMARK_CANCEL+symbol+MemberAccountFlowEntity.REMARK_RETURNBALANCE+returnBalance);
- record.setBalance(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ record.setBalance(walletCoin.getAvailableBalance());
record.setMemberId(memberId);
record.setSymbol(symbol);
- record.setPrice(walletCoin.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ record.setPrice(walletCoin.getFrozenBalance());
memberAccountFlowEntityDao.insert(record);
return Result.ok(MessageSourceUtils.getString("order_service_0013"));
}
@@ -476,4 +482,33 @@
return Result.ok(findCollectListVo);
}
+ @Override
+ public Result searchSymbolResultList() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ FindCollectListVo findCollectListVo = new FindCollectListVo();
+ List<MemberSelectSymbolsVo> list = new ArrayList<>();
+
+ Map<String, Object> columnMap = new HashMap<>();
+ List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(columnMap);
+
+ List<MemberSelectSymbolsEntity> selectSymbolByMemIdAndSymbol = memberSelectSymbolsDao.selectSymbolByMemId(memberId);
+ for(PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
+ MemberSelectSymbolsVo memberSelectSymbolsVo = new MemberSelectSymbolsVo();
+ memberSelectSymbolsVo.setSymbol(platformSymbolsCoinEntity.getName());
+ if(CollUtil.isNotEmpty(selectSymbolByMemIdAndSymbol)) {
+ for(MemberSelectSymbolsEntity memberSelectSymbolsEntity : selectSymbolByMemIdAndSymbol) {
+ if(platformSymbolsCoinEntity.getName().equals(memberSelectSymbolsEntity.getSymbol())) {
+ memberSelectSymbolsVo.setIsCollect(MemberSelectSymbolsVo.ISCOLLECT_YES);
+ }
+ }
+ }else {
+ memberSelectSymbolsVo.setIsCollect(MemberSelectSymbolsVo.ISCOLLECT_NO);
+ }
+ list.add(memberSelectSymbolsVo);
+ }
+ findCollectListVo.setMemberSelectSymbolsVo(list);
+ return Result.ok(findCollectListVo);
+ }
+
}
--
Gitblit v1.9.1