From f277f8fbba56fe460a1c954926f4699592ecfbca Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Jun 2020 15:33:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index 367a0bd..96ab15b 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -6,6 +6,7 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
import com.xcong.excoin.modules.contract.mapper.ContractHoldOrderEntityMapper;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
@@ -486,7 +487,6 @@
* @param
*/
public void dealLimitBuyOrder(List<ContractEntrustOrderEntity> orderList) {
-
//List<CoinsCoinsOrder> orderList = orderMapper.selectOrderByBatchNo(batchno);
if (CollectionUtils.isNotEmpty(orderList)) {
ContractHoldOrderEntity contractHoldOrderEntity = null;
@@ -496,23 +496,21 @@
continue;
}
- contractHoldOrderEntity = new ContractHoldOrderEntity();
+ // 委托单bean转换为持仓单bean
+ contractHoldOrderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToHoldOrder(coinsCoinsOrder);
+ contractHoldOrderEntity.setId(null);
Long memId = coinsCoinsOrder.getMemberId();
MemberEntity memberEntity = memberService.getById(memId);
BigDecimal entrustPrice = coinsCoinsOrder.getEntrustPrice();
int symbolCnt = coinsCoinsOrder.getSymbolCnt();
int type = coinsCoinsOrder.getEntrustType();
- //开仓价
- // Double openPrice = coinsCoinsOrder.getOpenPrice().doubleValue();
- //委托价
- // Double markPrice = coinsCoinsOrder.getMarkPrice();
+
if (type == 1) {
// 开多
contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_MORE);
} else {
// 开空
contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_LESS);
-
}
//持仓单赋值
@@ -552,18 +550,11 @@
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 扣除手续费
- //double totalBalance = wallet.getTotalBalance() - coinsCoinsOrder.getClosingPrice();
- BigDecimal totalBalance = openFeePrice.negate();
-
- /** TradeSetting tradeSetting = tradeSettingCache.getTradeSetting();
-
- Double totalPayPrice = new BigDecimal(coinsCoinsOrder.getPrePrice()).add(new BigDecimal(coinsCoinsOrder.getClosingPrice())).add(new BigDecimal(coinsCoinsOrder.getClosingPrice()))
- .setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
- totalBalance = totalBalance+(-totalPayPrice*(Double.valueOf(tradeSetting.getSpread())/10000));*/
+ BigDecimal totalBalance = wallet.getTotalBalance().subtract(openFeePrice);
memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
// TODO 531 待写
- calYj(memId, contractOrderEntity.getClosingFeeAmount(), contractOrderEntity, 1);
+ calYj(memId, openFeePrice, contractOrderEntity, 1);
}
}
}
--
Gitblit v1.9.1