src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -92,23 +92,25 @@ * @param num */ private void httpTransactionInfo(List<String> addressList, Long num) { String transactionInfoByBlockNum = getTransactionInfoByBlockNum(BigInteger.valueOf(num)); // 查询详情，包含了所有交易信息 String transactionInfoByBlockNum = getblockbynum(BigInteger.valueOf(num)); if (StringUtils.isBlank(transactionInfoByBlockNum)) { return; } // 不用等到扫完再累加 只要进来就加 还有一个条件是必须查询出区块再加 否则当区块超过实际区块 redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L)); JSONArray parseArray = JSON.parseArray(transactionInfoByBlockNum); JSONArray parseArray = JSON.parseObject(transactionInfoByBlockNum).getJSONArray("transactions"); if (parseArray.size() > 0) { for (Object e : parseArray) { try { String txId = JSON.parseObject(e.toString()).getString("id"); String contract_address = JSON.parseObject(e.toString()).getString("contract_address"); if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){ continue; } // String txId = JSON.parseObject(e.toString()).getString("id"); // String contract_address = JSON.parseObject(e.toString()).getString("contract_address"); // if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){ // continue; // } //判断 数据库 txId 有 就不用往下继续了 JSONObject parseObject = JSON.parseObject(getTransactionById(txId)); JSONObject parseObject = JSON.parseObject(e.toString()); String txId = parseObject.getString("txID"); String contractRet = parseObject.getJSONArray("ret").getJSONObject(0).getString("contractRet"); //交易成功 if ("SUCCESS".equals(contractRet)) { @@ -119,7 +121,7 @@ } else if ("TransferContract".equals(type)) { //trx 转账 transferContract(parseObject); //transferContract(parseObject); } } } catch (Exception exception) { @@ -164,6 +166,20 @@ return postForEntity(url, param).getBody(); } /** * 获取特定区块的所有交易 Info 信息 * * @param num 区块 * @return */ public static String getblockbynum(BigInteger num) { String url = http + "/wallet/getblockbynum"; Map<String, Object> map = new HashMap<>(); map.put("num", num); String param = JSON.toJSONString(map); return postForEntity(url, param).getBody(); } /** * https://cn.developers.tron.network/docs/%E4%BA%A4%E6%98%9311#%E4%BA%A4%E6%98%93%E7%A1%AE%E8%AE%A4%E6%96%B9%E6%B3%95 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -1135,29 +1135,35 @@ if (CollUtil.isNotEmpty(list)) { for (ContractHoldOrderEntity holdOrderEntity : list) { BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()).multiply(tradeSettingEntity.getDoingRatio()); MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name()); log.info("订单编号:{}, 持仓费:{}", holdOrderEntity.getOrderNo(), thisTimeHold); BigDecimal holdAmount = holdOrderEntity.getHoldAmount(); if (holdAmount == null) { holdAmount = BigDecimal.ZERO; } BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()).multiply(tradeSettingEntity.getDoingRatio()); log.info("订单编号:{}, 持仓费:{}", holdOrderEntity.getOrderNo(), thisTimeHold); holdAmount = holdAmount.add(thisTimeHold); if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == holdOrderEntity.getPositionType()) { MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId()); BigDecimal subBond = holdOrderEntity.getBondAmount().subtract(thisTimeHold); BigDecimal newForcePrice = CalculateUtil.getForceSetPrice(subBond.subtract(holdOrderEntity.getOpeningFeeAmount()), holdOrderEntity.getOpeningPrice(), holdOrderEntity.getSymbolCnt(), holdOrderEntity.getSymbolSku(), holdOrderEntity.getOpeningType(), memberEntity); holdAmount = holdAmount.add(thisTimeHold); holdOrderEntity.setBondAmount(subBond); holdOrderEntity.setHoldAmount(holdAmount); holdOrderEntity.setForceClosingPrice(newForcePrice); holdOrderEntity.setOperateNo(holdOrderEntity.getOperateNo() + 1); contractHoldOrderDao.updateById(holdOrderEntity); memberWalletContractDao.increaseWalletContractBalanceById(null, thisTimeHold.negate(), null, holdOrderEntity.getMemberId()); if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == holdOrderEntity.getPositionType()) { memberWalletContractDao.increaseWalletContractBalanceById(null, thisTimeHold.negate(), null, wallet.getId()); // 发送爆仓消息 sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), newForcePrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo(), holdOrderEntity.getMemberId()); } else { holdOrderEntity.setHoldAmount(holdAmount); contractHoldOrderDao.updateById(holdOrderEntity); memberWalletContractDao.increaseWalletContractBalanceById(thisTimeHold.negate(), thisTimeHold.negate(), null, wallet.getId()); ThreadPoolUtils.sendWholePrice(holdOrderEntity.getMemberId()); } } } src/test/java/com/xcong/excoin/WholeTest.java
@@ -115,8 +115,15 @@ */ @Test public void forceSetPriceTest() { MemberEntity memberEntity = memberDao.selectById(21L); CalculateUtil.getForceSetPriceForWhole("BTC/USDT", memberEntity); MemberEntity memberEntity = memberDao.selectById(15L); System.out.println(CalculateUtil.getForceSetPriceForWhole("BTC/USDT", memberEntity)); } @Test public void profitOrLessTest() { MemberEntity memberEntity = memberDao.selectById(15L); ContractHoldOrderEntity contractHoldOrderEntity = contractHoldOrderDao.selectById(144L); System.out.println(CalculateUtil.calProfitOrLoss(contractHoldOrderEntity, memberEntity)); } @Resource
