From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java | 8 ++
src/main/java/com/xcong/excoin/utils/dingtalk/DingTalkUtils.java | 4
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 3
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java | 2
src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java | 1
src/main/java/com/xcong/excoin/common/enumerates/SymbolsPlacesEnum.java | 38 ++++++++++++
src/main/resources/application-app.yml | 6 +-
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 4 +
src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java | 3 +
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 8 ++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 4
src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java | 3
src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java | 4
src/main/resources/application-newprice.yml | 6 +-
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 5 +
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 6 ++
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 4
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 5 +
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 3
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java | 4
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java | 2
src/main/resources/application-loop.yml | 6 +-
src/main/resources/application-dayline.yml | 6 +-
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 5 +
src/test/java/com/xcong/excoin/WholeTest.java | 2
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java | 3 +
src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java | 1
src/main/resources/application.yml | 12 ++--
28 files changed, 115 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
index e4d58dc..58a7210 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
@@ -14,9 +14,9 @@
CONTENTFROMWALLETCOIN("0002","由币币账户转入"),
CONTENTTOWALLETCOIN("0003","转出至币币账户"),
- CONTENTFROMCONTRACT("0004","由合约账户转入"),
+ CONTENTFROMCONTRACT("0004","合约账户转入"),
- CONTENTFROMAGENT("0005","由代理账户转入"),
+ CONTENTFROMAGENT("0005","代理账户转入"),
WALLETCOINCODE("USDT", "USDT"),
diff --git a/src/main/java/com/xcong/excoin/common/enumerates/SymbolsPlacesEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/SymbolsPlacesEnum.java
new file mode 100644
index 0000000..01d0e90
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/common/enumerates/SymbolsPlacesEnum.java
@@ -0,0 +1,38 @@
+package com.xcong.excoin.common.enumerates;
+
+import lombok.Getter;
+
+/**
+ * 币种小数点
+ */
+@Getter
+public enum SymbolsPlacesEnum {
+
+ BTC("BTC/USDT", 2)
+ ,ETH("ETH/USDT", 2)
+ ,LTC("LTC/USDT", 2)
+ ,BCH("BCH/USDT", 2)
+ ,EOS("EOS/USDT", 4)
+ ,XRP("XRP/USDT", 5)
+ ,ETC("ETC/USDT", 4);
+
+ private String symbol;
+
+ private Integer places;
+
+ private SymbolsPlacesEnum(String symbol, Integer places) {
+ this.symbol = symbol;
+ this.places = places;
+ }
+
+ public static Integer getValueByName(String symbol) {
+ Integer places = 0;
+ for (SymbolsPlacesEnum symbolsPlacesEnum : values()) {
+ if (symbol.equals(symbolsPlacesEnum.getSymbol())){
+ places = symbolsPlacesEnum.getPlaces();
+ break;
+ }
+ }
+ return places;
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
index 362eb8b..938b6cd 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
@@ -116,7 +116,7 @@
boolean isDebug = applicationProperties.isDebug();
if (!isDebug) {
long currentTime = System.currentTimeMillis();
- return currentTime - time <= 10000;
+ return currentTime - time <= 30000;
}
return true;
}
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
index 87d9239..acef51c 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
@@ -100,12 +100,12 @@
}
break;
case "EOS":
- address = "biyicteos123";
+ address = "hibitdeposit";
map.put("address", address);
map.put("lable", uuid);
break;
case "XRP":
- address = "biyicteos123";
+ address = "rKMGEyjXErL2dx9ck5QXFJVH8onSfHF5gn";
map.put("address", address);
map.put("lable", uuid);
break;
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
index 69306a0..4255a54 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
@@ -40,7 +40,7 @@
private int status;
@ApiModelProperty(value = "时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "HH:mm MM/dd", timezone = "GMT+8")
private Date updateTime;
}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 89de828..13f7a05 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -494,7 +494,7 @@
memberAccountMoneyChangeDao.insert(memberAccountRecord);
//添加资金划转历史记录
- memberAccountRecord.setContent("由合约"+symbol+"账户转入");
+ memberAccountRecord.setContent("合约"+symbol+"账户转入");
memberAccountRecord.setSymbol(walletCode);
memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
memberAccountRecord.setAmount(balance);
@@ -965,7 +965,7 @@
memberAccountMoneyChangeDao.insert(memberAccountRecord);
//添加合约资金划转历史记录
- memberAccountRecord.setContent("由合约"+symbolOut+"账户转入至合约"+symbolIn+"账户");
+ memberAccountRecord.setContent("合约"+symbolOut+"账户转入至合约"+symbolIn+"账户");
memberAccountRecord.setAmount(balance);
memberAccountMoneyChangeDao.insert(memberAccountRecord);
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 822744f..59eed54 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -126,7 +126,8 @@
@ApiOperation(value = "全仓模式 - 变更仓位类型")
@GetMapping(value = "/changePositionType")
public Result changePositionType() {
- return contractHoldOrderService.changePositionType();
+ return Result.fail("无法切换");
+// return contractHoldOrderService.changePositionType();
}
@GetMapping(value = "/findPositionType")
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java
index ec0d97d..06c142c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "规格")
private BigDecimal symbolSku;
+ @ApiModelProperty(value = "涨跌幅")
+ private BigDecimal upOrDown;
+
public BigDecimal getBeUsedBondAmount() {
return beUsedBondAmount.setScale(4, BigDecimal.ROUND_DOWN);
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
index 66f370b..d1739ee 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.enumerates.SymbolsPlacesEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -63,8 +64,11 @@
@ApiModelProperty("倍率杠杆")
private int leverRatio;
+ @ApiModelProperty("剩余张数")
+ private int symbolCntSale;
+
public String getOpeningPrice() {
- return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingPrice == null ? "" : openingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningFeeAmount() {
@@ -80,7 +84,7 @@
}
public String getForceClosingPrice() {
- return forceClosingPrice == null ? "" : forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return forceClosingPrice == null ? "" : forceClosingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public void setOpeningFeeAmount(BigDecimal openingFeeAmount, BigDecimal feeSpread) {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
index 0e924ca..e5310e6 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.enumerates.SymbolsPlacesEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -73,7 +74,7 @@
private Integer positionType;
public String getOpeningPrice() {
- return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
@@ -81,7 +82,7 @@
}
public String getForceClosingPrice() {
- return forceClosingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return forceClosingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public String getProfitOrLoss() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index 2939331..4ac6b37 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.enumerates.SymbolsPlacesEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -81,8 +82,11 @@
@ApiModelProperty("杠杆")
private int leverRatio;
+ @ApiModelProperty("剩余张数")
+ private int symbolCntSale;
+
public String getClosingPrice() {
- return closingPrice == null ? "" : closingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return closingPrice == null ? "" : closingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public String getClosingFeeAmount() {
@@ -94,7 +98,7 @@
}
public String getOpeningPrice() {
- return openingPrice == null ? "" : openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
+ return openingPrice == null ? "" : openingPrice.setScale(SymbolsPlacesEnum.getValueByName(this.symbol), BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningFeeAmount() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
index 48cc3ba..9839096 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
@@ -4,7 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.web3j.abi.datatypes.Int;
+import org.web3j.abi.datatypes.primitive.Int;
import java.math.BigDecimal;
import java.util.Date;
@@ -70,6 +70,9 @@
@ApiModelProperty(value = "合约类型 1-普通 2-跟单")
private Integer contractType;
+ @ApiModelProperty(value = "杠杆倍率")
+ private Integer leverRatio;
+
public String getOpeningFeeAmount() {
return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 4b263e1..96c64d6 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -264,7 +264,9 @@
} else {
walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
- memberWalletContractDao.increaseWalletContractBalanceById(entrustOrderEntity.getEntrustAmount(), null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
+ if (ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE == entrustOrderEntity.getEntrustType() || ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS == entrustOrderEntity.getEntrustType()) {
+ memberWalletContractDao.increaseWalletContractBalanceById(entrustOrderEntity.getEntrustAmount(), null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
+ }
}
ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index f05568c..2f4daa2 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -34,6 +34,8 @@
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.platform.dao.TradeSettingDao;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
+import com.xcong.excoin.modules.symbols.parameter.vo.HomeSymbolsVo;
+import com.xcong.excoin.modules.symbols.service.SymbolsService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.*;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
@@ -93,6 +95,8 @@
private FollowTraderInfoDao followTraderInfoDao;
@Resource
private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
+ @Resource
+ private SymbolsService symbolsService;
@Transactional(rollbackFor = Exception.class)
@Override
@@ -805,6 +809,7 @@
// contractMoneyInfoVo.setAvailableBalance(available);
// }
+ HomeSymbolsVo symbolReturnData = symbolsService.getSymbolReturnData(symbol);
contractMoneyInfoVo.setBeUsedBondAmount(beUsedBondAmount);
contractMoneyInfoVo.setFrozenBondAmount(frozenBondAmount);
@@ -815,6 +820,7 @@
contractMoneyInfoVo.setNewPrice(newPriceSymbol);
contractMoneyInfoVo.setSymbolSku(cacheSettingUtils.getSymbolSku(symbol));
contractMoneyInfoVo.setLeverRate(rateEntity.getLevelRateUp());
+ contractMoneyInfoVo.setUpOrDown(symbolReturnData.getUpOrDown());
return Result.ok(contractMoneyInfoVo);
}
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 c6d461b..a0ef098 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
@@ -637,6 +637,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -710,7 +711,7 @@
}
holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCnt());
+ holdOrderEntity.setSymbolCntSale(entrustOrder.getSymbolCnt());
holdOrderEntity.setOpeningFeeAmount(openFeePrice);
holdOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
holdOrderEntity.setMarkPrice(entrustOrder.getEntrustPrice());
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index 449dc44..ad1cae7 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -300,6 +300,8 @@
// 保证金
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
+ BigDecimal rewardRatio = profitOrLoss.divide(bondAmount, 8, BigDecimal.ROUND_DOWN);
+
log.info("bondAmount:{}", bondAmount);
// 平仓手续费 TODO 可能需要修复手续费
BigDecimal fee = BigDecimal.ZERO;
@@ -320,6 +322,7 @@
contractOrderEntity.setRewardAmount(profitOrLoss);
contractOrderEntity.setBondAmount(bondAmount);
contractOrderEntity.setClosingFeeAmount(fee);
+ contractOrderEntity.setRewardRatio(rewardRatio);
contractOrderDao.insert(contractOrderEntity);
if (holdOrderEntity.getSymbolCntSale() != 0) {
@@ -376,7 +379,7 @@
log.info("执行平仓委托");
Long memberId = entrustOrder.getMemberId();
- int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractHoldOrderEntity.OPENING_TYPE_MORE : ContractHoldOrderEntity.OPENING_TYPE_LESS;
+ int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractOrderEntity.ORDER_TYPE_CLOSE_MORE : ContractOrderEntity.ORDER_TYPE_CLOSE_LESS;
String symbol = entrustOrder.getSymbol();
MemberEntity memberEntity = memberDao.selectById(memberId);
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 07dea96..c8a29f6 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -162,13 +162,13 @@
member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
member.setIsForce(1);
member.setIsProfit(0);
- member.setContractPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
+ member.setContractPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD);
memberDao.insert(member);
MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
memberSettingEntity.setSpread(BigDecimal.ONE);
memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
- memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
+ memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0075));
memberSettingEntity.setMemberId(member.getId());
memberSettingDao.insert(memberSettingEntity);
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
index be91c71..c7c54b3 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
@@ -3,6 +3,7 @@
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.symbols.parameter.dto.KlineDetailDto;
+import com.xcong.excoin.modules.symbols.parameter.vo.HomeSymbolsVo;
/**
* @author wzy
@@ -18,4 +19,6 @@
public Result findKlineDetails(KlineDetailDto klineDetailDto);
+ public HomeSymbolsVo getSymbolReturnData(String symbol);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
index 95d294a..e714412 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
@@ -124,6 +124,7 @@
return Result.ok(homeSymbolsVo);
}
+ @Override
public HomeSymbolsVo getSymbolReturnData(String symbol) {
PlatformCnyUsdtExchangeEntity cnyUsdtExchange = platformCnyUsdtExchangeDao.getCNYAndUSDTOne();
// 获取当日k线数据
diff --git a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
index af0fd99..e9f4d3b 100644
--- a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
+++ b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
@@ -78,6 +78,7 @@
@Override
public void run() {
try {
+ Thread.sleep(500);
CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
} catch (Exception e) {
log.error("全仓模式预估强平价", e);
diff --git a/src/main/java/com/xcong/excoin/utils/dingtalk/DingTalkUtils.java b/src/main/java/com/xcong/excoin/utils/dingtalk/DingTalkUtils.java
index 70ed481..2ccc1aa 100644
--- a/src/main/java/com/xcong/excoin/utils/dingtalk/DingTalkUtils.java
+++ b/src/main/java/com/xcong/excoin/utils/dingtalk/DingTalkUtils.java
@@ -21,11 +21,11 @@
@Slf4j
public class DingTalkUtils {
- private static final String SECRET = "SECc0b73559742b950f07eabbd050c406a6abb3b67d112d3735289e90f58884c543";
+ private static final String SECRET = "SEC6b1c402a4fa857e7c5e9e6d4d4afd1296a520893af68e063c7a7f005b4ae2a34";
public static void sendActionCard(int type) {
log.info("send dingtalk");
- String url = "https://oapi.dingtalk.com/robot/send?access_token=161d5e5b60ae5d6b4c80f2a9c35f9f212961a7c7154aa7e94b99503eca3886b0";
+ String url = "https://oapi.dingtalk.com/robot/send?access_token=acc3ae94c91b06372b8465ba3fc079fc9bf382fbf8aee10fb4307ab978c1f5f7";
Long timestamp = System.currentTimeMillis();
try {
String sign = generateSign(timestamp);
diff --git a/src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java b/src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java
index 567a027..c89f642 100644
--- a/src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java
+++ b/src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java
@@ -37,8 +37,9 @@
}
public static boolean sendRechargeMsg(String phone, String time, String orderNo) {
- String msg = "尊敬的用户，您的帐号于{}有一笔成功充值订单，如有疑问请联系客服，订单编号为{}";
+ String msg = "尊敬的用户，您的帐号于{}有一笔成功充值订单，订单编号为{}";
String content = StrUtil.format(msg, time, orderNo);
+ log.info("短信发送:{}", content);
return request(phone, content, "充值");
}
diff --git a/src/main/resources/application-app.yml b/src/main/resources/application-app.yml
index d19e4cb..59cef21 100644
--- a/src/main/resources/application-app.yml
+++ b/src/main/resources/application-app.yml
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 2
+ database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 114.55.92.106
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: hibit123
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
diff --git a/src/main/resources/application-dayline.yml b/src/main/resources/application-dayline.yml
index ee8bb43..66e652f 100644
--- a/src/main/resources/application-dayline.yml
+++ b/src/main/resources/application-dayline.yml
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 2
+ database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 114.55.92.106
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: hibit123
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
diff --git a/src/main/resources/application-loop.yml b/src/main/resources/application-loop.yml
index 57d631e..2bb0e1e 100644
--- a/src/main/resources/application-loop.yml
+++ b/src/main/resources/application-loop.yml
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 2
+ database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 114.55.92.106
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: hibit123
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
diff --git a/src/main/resources/application-newprice.yml b/src/main/resources/application-newprice.yml
index 06c4be8..93eddfa 100644
--- a/src/main/resources/application-newprice.yml
+++ b/src/main/resources/application-newprice.yml
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 2
+ database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 114.55.92.106
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: hibit123
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ffca27b..73e32f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,12 +7,12 @@
profiles:
active: dev
datasource:
-# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
-# username: ctcoin_data
-# password: ctcoin_123
- url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
+ url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ctcoin_data
+ password: ctcoin_123
+# url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+# username: ct_test
+# password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 954c68d..8c633c4 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -111,7 +111,7 @@
*/
@Test
public void forceSetPriceTest() {
- MemberEntity memberEntity = memberDao.selectById(5L);
+ MemberEntity memberEntity = memberDao.selectById(66L);
CalculateUtil.getForceSetPriceForWhole("BTC/USDT", memberEntity);
}
--
Gitblit v1.9.1