src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -64,7 +64,7 @@ @PostMapping(value="/submitSalesWalletCoinOrder") @SubmitRepeat public Result submitSalesWalletCoinOrder(@RequestBody @Valid SubmitSalesWalletCoinOrderDto submitSalesWalletCoinOrderDto) { log.info("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto)); log.debug("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto)); String symbol = submitSalesWalletCoinOrderDto.getSymbol(); Integer type = submitSalesWalletCoinOrderDto.getType(); Integer tradeType = submitSalesWalletCoinOrderDto.getTradeType(); src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -1077,14 +1077,13 @@ if (CollectionUtils.isNotEmpty(trades)) { for (OrderCoinsEntity trade : trades) { if (trade != null) { orderCoinsDao.updateStatus(trade.getId(),OrderCoinsEntity.ORDERSTATUS_DONE); //orderCoinsDao.updateStatus(trade.getId(),OrderCoinsEntity.ORDERSTATUS_DONE); ids.add(trade.getId()); // 买单 实际成交金额小于委托的 这一部分从冻结扣除 if(OrderCoinsEntity.ORDERTYPE_BUY==trade.getOrderType()){ if(trade.getEntrustAmount().compareTo(trade.getDealAmount())>0){ // 此时退回这部分的差额 BigDecimal subtract = trade.getEntrustAmount().subtract(trade.getDealAmount()); System.out.println(subtract); MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(trade.getMemberId(), CoinTypeEnum.USDT.name()); if(memberWalletCoinEntity!=null){ memberWalletCoinDao.updateWalletBalance(memberWalletCoinEntity.getId(),subtract,null,subtract.negate()); @@ -1095,7 +1094,7 @@ } } if (CollectionUtils.isNotEmpty(ids)) { // orderCoinsDao.batchUpdateStatus(ids, OrderCoinsEntity.ORDERSTATUS_DONE); orderCoinsDao.batchUpdateStatus(ids, OrderCoinsEntity.ORDERSTATUS_DONE); } } src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java
@@ -124,7 +124,7 @@ */ @RabbitListener(queues = RabbitMqConfig.QUEUE_ROC_ORDER_COMPLETE) public void doComplete(String content) { log.info("#完成的订单---->{}#", content); log.debug("#完成的订单---->{}#", content); List<OrderCoinsEntity> exchangeTrades = JSONObject.parseArray(content, OrderCoinsEntity.class); if(CollectionUtils.isEmpty(exchangeTrades)){ return; src/main/java/com/xcong/excoin/rabbit/consumer/OrderSubmitConsumer.java
@@ -46,7 +46,7 @@ */ @RabbitListener(queues = RabbitMqConfig.QUEUE_ROC_ORDER_CANCEL) public void doCancel(String content) { log.info("#取消的订单---->{}#", content); log.debug("#取消的订单---->{}#", content); orderCoinService.cancelEntrustWalletCoinOrderForMatch(content); } src/main/java/com/xcong/excoin/rabbit/consumer/UsdtUpdateConsumer.java
@@ -37,7 +37,7 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_USDT_ADDRESS) public void addUsdtAddress(String content) { if(!UsdtErc20UpdateService.ALL_ADDRESS_LIST.contains(content)){ log.info("#添加新地址---->{}#", content); log.debug("#添加新地址---->{}#", content); UsdtErc20UpdateService.ALL_ADDRESS_LIST.add(content); } }