From 43385a77303aa2295d902b5a2be9e28723d08cef Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 12 Oct 2020 16:00:21 +0800
Subject: [PATCH] Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 43 ++-----------------------------------------
1 files changed, 2 insertions(+), 41 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 eb034ca..35ee332 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
@@ -347,38 +347,6 @@
if(!MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())){
return Result.fail(MessageSourceUtils.getString("member_controller_0001"));
}
- // 需要先
- String phone = memberEntity.getPhone();
- if(!"13632989240".equals(phone) && !"15158130575".equals(phone)){
- if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)){
- // 不能超过800个
-
- if(amount!=null && amount.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- BigDecimal bigDecimal = orderCoinDealDao.sumTodayBuyAmount(memberId, symbol);
- if(bigDecimal==null){
- bigDecimal= BigDecimal.ZERO;
- }
- amount= amount==null?BigDecimal.ZERO:amount;
- bigDecimal = bigDecimal.add(amount);
- if(bigDecimal!=null && bigDecimal.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- // 挂单不能超过800
- BigDecimal bigDecimal1 = orderCoinDealDao.sumTodayEntrustCntBuyAmount(memberId, symbol);
- if(bigDecimal1==null){
- bigDecimal1=BigDecimal.ZERO;
- }
- bigDecimal1 = bigDecimal1.add(amount);
- if(bigDecimal1!=null && bigDecimal1.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- }else{
- return Result.fail("卖出受限");
- }
- }
-
BigDecimal nowPriceinBigDecimal = price;
//查询当前价
//BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol + "/USDT")));
@@ -767,7 +735,7 @@
@Override
public Result findAllWalletCoinOrder() {
- List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.ROC.toString());
+ List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.CPV.toString());
return Result.ok(orderCoinsDealEntities);
}
@@ -886,7 +854,7 @@
@Transactional(rollbackFor = Exception.class)
public void dealEntrustCoinOrder() {
List<String> ignoreTypes = new ArrayList<>();
- ignoreTypes.add(SymbolsConstats.ROC);
+ ignoreTypes.add(SymbolsConstats.CPV);
List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);
if (CollUtil.isNotEmpty(list)) {
for (OrderCoinsEntity orderCoinsEntity : list) {
@@ -1125,12 +1093,5 @@
}
}
}
-
- @Override
- public void initOrders(String symbol, Integer type, Integer tradeType, BigDecimal price,
- BigDecimal amount, BigDecimal entrustAmount) {
-
- }
-
}
--
Gitblit v1.9.1