From afc924b0d88ef320ad09060ae49804556efd8eb6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' into whole_new
---
src/test/java/com/xcong/excoin/WholeTest.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 567ee1c..a58c732 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -1,5 +1,6 @@
package com.xcong.excoin;
+import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
@@ -12,8 +13,10 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
+import com.xcong.excoin.rabbit.pricequeue.WebsocketPriceService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ThreadPoolUtils;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +25,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -92,14 +97,6 @@
@Autowired
private OrderProducer orderProducer;
- @Test
- public void sendMsg() {
- List<OrderModel> list = new ArrayList<>();
- OrderModel orderModel = new OrderModel(1L, RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), "111", "BTC");
- list.add(orderModel);
- orderProducer.sendLimitClose(JSONObject.toJSONString(list));
- }
-
// 面值*(多单张数*多单开仓价-空单张数*空单开仓价)-余额-已实现盈亏 / 面值*(多单张数-空单张数)-(维持保证金率+TAKER手续费)*面值*(开多张数+开空张数)
@@ -115,8 +112,50 @@
*/
@Test
public void forceSetPriceTest() {
- MemberEntity memberEntity = memberDao.selectById(5L);
+ MemberEntity memberEntity = memberDao.selectById(21L);
CalculateUtil.getForceSetPriceForWhole("BTC/USDT", memberEntity);
}
+ @Test
+ public void initOrderTest() {
+ List<HashMap<String, Object>> wholeHoldOrders = contractHoldOrderDao.selectAllWholeOrderMemberIdAndSymbol();
+ if (CollUtil.isNotEmpty(wholeHoldOrders)) {
+ MemberEntity memberEntity = null;
+ for (HashMap<String, Object> wholeHoldOrder : wholeHoldOrders) {
+ Long memberId = (Long) wholeHoldOrder.get("member_id");
+ String symbol = (String) wholeHoldOrder.get("symbol");
+ if (memberEntity == null || !memberId.equals(memberEntity.getId())) {
+ memberEntity = memberDao.selectById(memberId);
+ }
+ System.out.println(memberId + "-----" + symbol);
+ }
+ }
+ }
+
+ @Resource
+ private RedisUtils redisUtils;
+
+ @Test
+ public void redisTest() {
+ for (int i = 827; i < 999; i++) {
+ redisUtils.del(AppContants.CLOSING_ORDER_PREFIX + i);
+ }
+ }
+
+ @Resource
+ private WebsocketPriceService websocketPriceService;
+
+ @Test
+ public void wholeBombTest() {
+ websocketPriceService.wholeBomb("BTC/USDT", "9000");
+ }
+
+ @Test
+ public void forceTest() {
+ MemberEntity memberEntity = memberDao.selectById(5L);
+ CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
+ }
+
+
+
}
--
Gitblit v1.9.1